5689 Commits

Author SHA1 Message Date
Tim Kuipers
cc7b2a4901
JSON feat: perimeter_gaps as it was in e57ca0aa53def8342cfc18971cafbe4b39caffec (CURA-2306) 2016-11-18 15:06:44 +01:00
Jaime van Kessel
782a02661c If prime tower or prime position has an invalid position, we now give a specifc error message to indicate this
CURA-2481
2016-11-18 14:24:32 +01:00
Jaime van Kessel
c007c1fc4c Fixed global error keys always overriding the extruder error keys
CURA-2481
2016-11-18 14:17:46 +01:00
Jaime van Kessel
312bd2a963 Resetting now simply resets everything to 0 if there is no bounding box
For the current usage, this won't change anything, but it's more future proof

CURA-2925
2016-11-18 13:28:14 +01:00
Jaime van Kessel
d2a50cada1 Only reset transformation/ position if there is a bounding box.
If a node has no bounding box, it's because it has no data to change.

CURA-2925
2016-11-18 12:56:07 +01:00
Jaime van Kessel
a71bb63318 Resetting transformation now works again for ungrouped nodes
CURA-2925
2016-11-18 12:50:51 +01:00
Jaime van Kessel
2e1f4e3740 Serialize now uses base_file as well instead of only GUID to find containers to use
CURA-2467
2016-11-18 12:39:19 +01:00
Jaime van Kessel
298710532b Merge branch 'feature_fan_speed_0' of github.com:Ultimaker/Cura 2016-11-18 10:44:09 +01:00
Jaime van Kessel
850fcac9c2 Build plate extruder now hides itself if the adhesion type is none
CURA-759
2016-11-18 10:41:07 +01:00
Jaime van Kessel
d0bae5acd7 Merge branch 'feature_bed_adhesion_none' of github.com:Ultimaker/Cura 2016-11-18 10:35:06 +01:00
Jaime van Kessel
b1837896df Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-17 15:04:18 +01:00
Tim Kuipers
891eda203e JSOn fix: start each layer near switching bay (CURA-1112) 2016-11-17 14:57:46 +01:00
Jaime van Kessel
5482515157 Importing profiles from g-code made by Cura 2.3 is now possible again
CURA-2943
2016-11-17 13:15:25 +01:00
Ghostkeeper
4da9b99ff8
Disable print sequence for all multi-extrusion machines
Also for ORD and whatever else we have. It is now more inherent in the setting and it gives a better indication of why the setting is disabled when you hover the 'i' in the setting visibility screen.
2016-11-17 12:43:14 +01:00
Ghostkeeper
41825231ad
Fix check for if nozzle offset exists
Because an offset of 0 results in False as well.

Contributes to issue CURA-2625.
2016-11-17 09:54:00 +01:00
Ghostkeeper
8879021d53
Make left build plate clips static disallowed areas
It turns out that even though it far exceeds the tolerances, the build plate clips have such high variation that the left clips also hit the nozzle sometimes.

Contributes to issue CURA-2625.
2016-11-17 09:48:29 +01:00
Jaime van Kessel
042141413a Fixed mergeSelected
My previous fix was wrong; It only worked on what I wanted to fix (and broke the normal behavior). The current fix should fix both issues (merging works & merging groups works)

CURA-2932
2016-11-16 17:22:06 +01:00
Ghostkeeper
ff14174724 Revert "JSON spelling fix: draft ==> draught (CURA-759)"
This reverts commit 16828d98d482bb92c7b37857da2d36073e1304e5.
2016-11-16 17:15:37 +01:00
Jack Ha
a68d96fb60 Per model settings panel is now closed when the tool gets disabled. CURA-2287 2016-11-16 09:42:04 +01:00
Tim Kuipers
707b38431b JSON fix: double text in combing mode (CURA-2959) 2016-11-15 13:19:34 +01:00
Ghostkeeper
35a01435d5
Also rebuild when mesh extruder changes
I do not want to add the rebuild() call to the update function itself since there may be other changes to the build volume before we should rebuild (such as raft).

Contributes to issue CURA-2625.
2016-11-15 13:10:58 +01:00
Ghostkeeper
2492b03c4f
Update disallowed area when object's extruder is changed
This calls _updateDisallowedAreas() but not rebuild(), so the change is not visible at this moment.

Contributes to issue CURA-2625.
2016-11-15 13:10:58 +01:00
Ghostkeeper
60c8933906
Remove debug print
Oops.

Contributes to issue CURA-2625.
2016-11-15 13:10:58 +01:00
Ghostkeeper
f0766cbaf3
Update build volume when per-object settings change
Requires some multi-levelled trickery to get the event listeners working. This also assumes that the per-object stack decorator is not deleted at any point unless the mesh is deleted (which is currently a correct assumption). If that ever changes though, the harm is just that the update function is still listening on the deleted decorator's stack.

Contributes to issue CURA-2625.
2016-11-15 13:10:57 +01:00
Ghostkeeper
747ade2382
Remove now-useless variable
I just realised that there were two if statements below each other with the same condition.

Contributes to issue CURA-2625.
2016-11-15 13:10:57 +01:00
Ghostkeeper
9be02fb31f
Recalculate disallowed borders when adding or removing objects
Because the new object may use an extruder that wasn't used so far, and if you remove an object it may remove the need for a certain extruder.

Contributes to issue CURA-2625.
2016-11-15 13:10:57 +01:00
Jack Ha
6bb82eeefe Fix problem registering Actions.qml which resulted in empty menu items. 2016-11-15 11:42:08 +01:00
Ghostkeeper
d8610d5e4a
Merge branch 'all_legacy_machines' 2016-11-15 10:14:52 +01:00
Ghostkeeper
47bb8f9601
Compute disallowed borders with all extruders
It's a bit counter-intuitive, so let me explain. The total build volume is defined as the rectangle around the union of the areas that all extruders can reach. The nozzle offset for the left extruder though is 0,0, so what should the border on the right side be? It should be 18 since there is a nozzle to the right of the left nozzle which has a relative x-offset of 18mm. Therefore we need to compute the relative offsets with each of the other nozzles and create sort of a bounding box around it, and the distance to the edge of that bounding box is the unreachable border on each of the sides.

Contributes to issue CURA-2625.
2016-11-14 17:17:55 +01:00
Ghostkeeper
f0d92873a3
Add nozzle disallowed areas
These disallowed areas are only at nozzle-height, not at head-height. They therefore won't move along with the nozzle offset.

Contributes to issue CURA-2625.
2016-11-14 17:13:24 +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
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
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
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
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
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