7424 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Tim Kuipers	7100c84136	JSON feat: cubic subdivision settings (CURA-2602)	2016-11-16 15:27:58 +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
Tim Kuipers	97cbdb0b81	fix: nozzle cooldown speed modifier cannot be larger than the nozzle heatup speed (CURA-1932)	2016-11-15 17:56:34 +01:00
Jack Ha	3acddddc7c	Solve populating Support Extruder Combobox at first time start, adjusted spacings. CURA-2767	2016-11-15 17:09:19 +01:00
Jack Ha	d34c79249b	Changed recommended sidebar options, seems to work. CURA-2767	2016-11-15 16:40:04 +01:00
fieldOfView	1c92b9ee0e	Don't update expandedCategories preference while filtering settings	2016-11-15 16:25:39 +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
fieldOfView	7fafcef40b	Allow making settings visible from the sidebar	2016-11-15 11:09:58 +01:00
Ghostkeeper	d8610d5e4a	Merge branch 'all_legacy_machines'	2016-11-15 10:14:52 +01:00
Victor Larchenko	b63f4e0bee	T562: Text box expanded and all settings visible while filtering ... # Conflicts: # resources/qml/Settings/SettingView.qml	2016-11-15 10:12:40 +01:00
fieldOfView	e450d10ddb	Apply styling to filter field	2016-11-15 10:07:37 +01:00
fieldOfView	479056efef	Always show categories when filtering	2016-11-15 10:07:37 +01:00
fieldOfView	f7854225fa	Restore expanded categories when clearing filter	2016-11-15 10:07:36 +01:00
Victor Larchenko	829f8893e2	T562: Added searching of settings ... # Conflicts: # resources/qml/Settings/SettingView.qml	2016-11-15 10:07:36 +01:00
Filip Goc	006e5bf585	small typographic fix	2016-11-14 12:10:48 -05:00
Filip Goc	8d3c0a7e73	Fixed mistake in end gcode script ... The bed assembly was homing instead of going forward a little bit - which makes the print more accessible when finished. Fixed.	2016-11-14 11:55:58 -05: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
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