3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 22:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
6533 commits 305 branches 272 tags 787 MiB
Commit graph

6533 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
2e4b430cf8 User changes are now also updated correctly when resolving to new machine in workspace loading 
CURA-1263
 2016-11-14 17:04:58 +01:00
Ghostkeeper
e9ced745fa
Undo compensation for nozzle offset on right clips 
These clips were offset in the measurements because of the problem with the right nozzle not lifting high enough. This undoes that change.

Contributes to issue CURA-2625.
 2016-11-14 17:00:09 +01:00
Ghostkeeper
17ade396d7
Move right two clips to head disallowed areas 
It turns out that the right nozzle, if lifted, can still hit the clips in very rare cases. But the left nozzle, if the right nozzle is down, will not hit the clips. So the right clips are now part of the static areas just like the switching bay and camera, but the left clips are not.

Contributes to issue CURA-2625.
 2016-11-14 16:36:47 +01:00
Jaime van Kessel
b8746aee30 Added hack so the new extruders are added to extruder manager 
CURA-1263
 2016-11-14 15:59:14 +01:00
Tim Kuipers
e78c8c8d8b setting: material_initial_print_temperature, material_final_print_temperature (CURA-1932) 2016-11-14 15:58:17 +01:00
Ghostkeeper
ef60181232
Change dimensions of Ultimaker 3 and reset nozzle origins 
The left nozzle is at the origin again now. And the right nozzle is at an offset of 18mm of that.

Contributes to issue CURA-2625.
 2016-11-14 15:51:40 +01:00
Jaime van Kessel
c919883178 Extruder stacks now properly get global stack set as next 
CURA-1263
 2016-11-14 15:50:07 +01:00
Jaime van Kessel
4dc14a72ab Added conversion table for old to new ID's 
CURA-1263
 2016-11-14 15:32:08 +01:00
Jaime van Kessel
0d4f28b310 MachineStacks & user containers are now also renamed if so required 
CURA-1263
 2016-11-14 15:16:17 +01:00
Jaime van Kessel
990736b5c6 Implemented quality_changes resolve strategy 
This enables the creation of a new quality_changes profile if the user chose to do this

CURA-1263
 2016-11-14 14:51:10 +01:00
Jaime van Kessel
377752397f Made it possible for machine & quality changes to have different resolve strategies 
CURA-1263
 2016-11-14 13:48:49 +01:00
Jaime van Kessel
8ae0cfd848 Loading workspace now activates the machine and notifies everyone that it was changed 
CURA-1263
 2016-11-14 13:30:28 +01:00
Tim Kuipers
16828d98d4 JSON spelling fix: draft ==> draught (CURA-759) 2016-11-14 12:50:49 +01:00
Tim Kuipers
0c550859dd fix: don't register adhesion_extruder_nr as used if adhesion_type == none (CURA-759) 
Also the old line obtained brim_line_count from the global stack, while it is settable_per_extruder!
Also we now assume selecting a brim means you want to print it.
I don't think having a brim line count of zero meant that you wouldnt get a brim; the minimal brim length also plays a role...
 2016-11-14 12:39:41 +01:00
Jaime van Kessel
d5229992df Override resolve strategy is now handled 
CURA-1263
 2016-11-14 12:37:26 +01:00
Tim Kuipers
995705f82b fix: don't expand disallowed areas when using none platform adhesion (CURA-759) 2016-11-14 12:36:21 +01:00
Tim Kuipers
337cd127dc JSOn feat: adhesion_type none (CURA-759) 2016-11-14 12:02:33 +01:00
Ghostkeeper
519f6e58d2
Remove debug print 
This is why it's wise to do a git diff --cached before you commit.

Contributes to issue CURA-2625.
 2016-11-14 11:40:25 +01:00
Ghostkeeper
18b2834091
half_machine_width should be halved 
Shoot me before I do any further damage, please.

Contributes to issue CURA-2625.
 2016-11-14 11:38:47 +01:00
Tim Kuipers
1cc323eddd changed machine name to Robo 3D R1 2016-11-14 11:37:54 +01:00
Tim Kuipers
ed1670caef connected extruder trains to punchtec connect xl 2016-11-14 11:37:01 +01:00
Tim Kuipers
11f6494baf capitalized Punchtech Connect XL 2016-11-14 11:35:37 +01:00
Tim Kuipers
52ab376616 removed duplicate Pruse i3 2016-11-14 11:34:49 +01:00
Ghostkeeper
98089e702c
Also offset inner corners of the Y-borders 
These should coincide with the inner corners of the X-borders.

Contributes to issue CURA-2625.
 2016-11-14 11:28:32 +01:00
Ghostkeeper
0eb1044eaf Merge branch 'add_jellybox_printer' of https://github.com/IMADE3D/Cura into IMADE3D-add_jellybox_printer 2016-11-14 10:48:55 +01:00
Ghostkeeper
5ddc1d9d71
Fix offsetting polygon in single extrusion 
In single extrusion, the machine_nozzle_offset_x and machine_nozzle_offset_y were not defined in the used extruder stacks, because the used extruder stack is the global stack.

Contributes to issue CURA-2625.
 2016-11-14 10:47:38 +01:00
Ghostkeeper
48134619eb
Fix checking if we're single extrusion 
We are single extrusion if the extruder count is less than or equal to 1, like in other places throughout Cura.

Contributes to issue CURA-2625.
 2016-11-14 10:31:11 +01:00
Tim Kuipers
6f3b8a7fa1 renamed ORD to RoVa3D 2016-11-14 10:30:59 +01:00
Ghostkeeper
b8223e3e75
Merge branch 'fieldOfView-fix_blur_settings' 2016-11-14 09:34:15 +01:00
Ghostkeeper
f615d6b0a8 Merge branch 'fix_blur_settings' of https://github.com/fieldOfView/Cura into fieldOfView-fix_blur_settings 2016-11-14 09:32:58 +01:00
Filip Goc
644fb0ca00 add JellyBOX build plate mesh 2016-11-13 11:34:24 -05:00
Filip Goc
b467f0a8d4 add JellyBOX machine definition file 
gantry height left to default to effectively disable one at a time
printing for now
 2016-11-13 11:33:49 -05:00
Ghostkeeper
8d43f1c5f7
Take first layer extruder into account 
Forgot about that one earlier.

Contributes to issue CURA-2625.
 2016-11-11 17:18:15 +01:00
Jaime van Kessel
cbcc48ff33 Pre-read now checks for conflicts and asks the user what strategy for resolvement to use 
CURA-1263
 2016-11-11 17:17:23 +01:00
Ghostkeeper
ee9caa80a8
Remove dual-extrusion disallowed areas 
The idea is that these are now computed through combining the disallowed areas of the two extruders (though that doesn't quite work yet).

Contributes to issue CURA-2625.
 2016-11-11 17:15:09 +01:00
Ghostkeeper
066ccc4e51
Remove superfluous disabling of prime location settings 
These are already disabled in the definitions of fdmprinter and fdmextruder. It doesn't need to be disabled again.

Contributes to issue CURA-2625.
 2016-11-11 17:10:23 +01:00
Ghostkeeper
a72d47c2a4
Fix adding prime tower locations to disallowed areas 
Otherwise just a string gets added, which gives an error when the disallowed areas are being built as meshes. The front-end runs again, though the disallowed areas seem to be wrong now.

Contributes to issue CURA-2625.
 2016-11-11 17:06:47 +01:00
Ghostkeeper
57f88ea048
Mush disallowed areas of all extruders together 
The final result needs to be just a list.

Contributes to issue CURA-2625.
 2016-11-11 17:02:01 +01:00
Ghostkeeper
edcf7320f0
Interpret prime tower areas per extruder 
The function gives results per extruder now, so we should interpret that instead of crashing.

Contributes to issue CURA-2625.
 2016-11-11 17:00:32 +01:00
Ghostkeeper
a8d36c9116
Fix iteration over prime-disallowed areas 
Oops. prime_disallowed_areas is a dictionary per extruder.

Contributes to issue CURA-2625.
 2016-11-11 16:58:25 +01:00
Ghostkeeper
1c445a1512
Move computing disallowed areas to separate function 
The results are checked for intersection in the main update function, and then it crashes because the main function doesn't expect per-extruder disallowed areas yet from the rest.

Contributes to issue CURA-2625.
 2016-11-11 16:55:07 +01:00
Tim Kuipers
fb92e50262 JSON fix: fixed all start/end gcode references to settings and non-existent variables 2016-11-11 16:28:43 +01:00
Ghostkeeper
4b02171db6
Compute disallowed areas per-extruder 
This computes the disallowed areas of the machine, the disallowed border and the prime tower per extruder. The prime locations are not yet calculated per extruder, but I'd like to extract it to a function before I try that.

Warning: Cura will not run at this stage. Please await the next commits.

Contributes to issue CURA-2625.
 2016-11-11 16:26:58 +01:00
Ghostkeeper
3571ed2d7a
Expand disallowed border beyond build volume 
This way we can offset it with the nozzle offset and it would still cover all the way to the edge. The disallowed areas are clipped to the build volume anyway.

Contributes to issue CURA-2625.
 2016-11-11 15:44:53 +01:00
Ghostkeeper
ec057c72a6
Compute disallowed border size only once 
We pass it on through a parameter instead of computing it again in the function.

Contributes to issue CURA-2625.
 2016-11-11 15:16:43 +01:00
Ghostkeeper
bcd4dd3aeb
Fix applying skirt radius to prime locations 
This makes the prime locations equal to what it was before.

Contributes to issue CURA-2625.
 2016-11-11 15:14:15 +01:00
Ghostkeeper
45db315f77
Fix adding prime locations to final disallowed areas 
They were added to several intermediary variables, but not to the final result.

Contributes to issue CURA-2625.
 2016-11-11 15:10:39 +01:00
Ghostkeeper
ccccf62bf7
Repair showing build volume 
We needed to apply the Minkowski hull on the polygon or it would be disjunct and wouldn't show up in the interface.

Contributes to issue CURA-2625.
 2016-11-11 14:18:08 +01:00
Jaime van Kessel
99e753d3be Added loading of preferences form workspace 
CURA-1263
 2016-11-11 13:31:36 +01:00
Ghostkeeper
41c8371b86
Compute _has_errors only from _error_areas 
This way we need fewer intermediary variables. It's also more robust and somewhat more elegant.

Contributes to issue CURA-2625.
 2016-11-11 13:09:17 +01:00