5714 Commits

Author SHA1 Message Date
Jaime van Kessel
053ea6ad52 Bumped the used API version up by one
CURA-1263
2016-11-17 11:44:44 +01:00
Jaime van Kessel
92a4fd7239 Materials are now also handled in conflict resolvement
CURA-1263
2016-11-17 11:16:15 +01:00
Jaime van Kessel
9539774c0b Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-17 10:27:28 +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
Jaime van Kessel
a39d682476 Renamed Load workspace to open Workspace
CURA-1263
2016-11-16 16:07:18 +01:00
Jaime van Kessel
9f27e7861f Workspace reader now does a pre-check to see if it's a workspace in the first place
CURA-1263
2016-11-16 16:04:03 +01:00
Jaime van Kessel
42be3c7472 Conflict checker for machine now also checks if there is an actual difference
CURA-1263
2016-11-16 15:41:42 +01:00
Jaime van Kessel
053f0ca031 Replaced hack for setting extruders with more robust setter
CURA-1263
2016-11-16 14:54:48 +01:00
Jaime van Kessel
b175e6876f Added material conflict option
This is still desabled by default due to some architecture issues (so this is temporarily left as it is)

CURA-1263
2016-11-16 14:45:34 +01:00
Jaime van Kessel
b59be4c88b Moved result checking to the Dialog
CURA-1263
2016-11-16 13:15:15 +01:00
Jaime van Kessel
100e1f4f40 Conflict in quality changes is now handled less naive
Instead of only checking ID, we also check values of the QC

CURA-1263
2016-11-16 13:10:42 +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
Jaime van Kessel
fcd4fb86f5 removed debug prints
CURA-1263
2016-11-15 15:12:04 +01:00
Jaime van Kessel
bbf5c73dae Quality_changes user option is now set correctly
CURA-1263
2016-11-15 15:11:32 +01:00
Jaime van Kessel
f0eb5e0da3 User can now select what strategy to use per conflict
CURA-1263
2016-11-15 15:10:10 +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
Jaime van Kessel
47d0e95e53 Loading single extrusion machine from file no longer gives exception
CURA-1263
2016-11-14 17:55:30 +01:00
Jaime van Kessel
dffb54d901 Removed abundant whitespace 2016-11-14 17:54:38 +01:00
Jaime van Kessel
bade9e1bff Resolve strategy is now always set
CURA-1263
2016-11-14 17:50:54 +01:00
Jaime van Kessel
8640b2b787 Saving an empty buildplate as a workspace is now possible
CURA-1263
2016-11-14 17:45:30 +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
Jaime van Kessel
1db2d06e06 Fixed "new" resolve if only the machine was double.
CURA-1263
2016-11-14 17:15:29 +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
Jaime van Kessel
3245c2fe32 Extruder stacks are no longer renamed when loading from workspace
CURA-1263
2016-11-14 17:08:43 +01:00
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
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
Jaime van Kessel
d5229992df Override resolve strategy is now handled
CURA-1263
2016-11-14 12:37:26 +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