13310 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Guillem	1bb5b8ff3e	add Copy all values to all extruders ... context menu option	2018-03-13 12:31:03 +01:00
Aleksei S	73517cd176	The infill denstiy was updated twice, first in Custom view and then in Recomended view ... CURA-5071	2018-03-13 11:41:48 +01:00
Ian Paschal	b90a9c490d	Don't loop extruders before checking if there is a global extruder stack	2018-03-13 09:57:07 +01:00
Ghostkeeper	b4a40915bb	Code style: Brackets on new line ... Contributes to issue CURA-4606.	2018-03-13 09:28:01 +01:00
Ian Paschal	69dc4fa5e0	Concerning the unfortunate crash... ... ..of the morning of the 13th day of March, in the 2018th year of our lord.	2018-03-13 09:20:42 +01:00
Ghostkeeper	a87db2d721	Always update root material even if not in QML ... Previously the _current_root_material_id and _current_root_material_name dictionaries were only updated if they are used anywhere in QML. This is unreliable. We're now directly connecting to the signal so that they are always updated, even when not in use by the GUI. This way we can rely on it in other places than the GUI. Contributes to issue CURA-4606.	2018-03-13 09:09:21 +01:00
Ghostkeeper	f40e9bffa9	Use extruder positions directly ... ...instead of the keys in the _current_root_material_id map. Contributes to issue CURA-4606.	2018-03-12 17:27:55 +01:00
Ghostkeeper	1db8c967f2	More specific exception catching ... So that we can still find programming errors in this code. Contributes to issue CURA-4606.	2018-03-12 17:10:17 +01:00
Ghostkeeper	d904f677bc	Store extruder position of quality groups as int ... Instead of as a string with a number in it. For the actual global stack's extruders we still need to convert to string, sadly. I could go refactor that too, but then I won't be going home until 23 o'clock or something. Contributes to issue CURA-4606.	2018-03-12 17:08:13 +01:00
Mark	981c47ed87	Put the support extruder dropdown behind the checkbox to prevent scrolling	2018-03-12 17:03:10 +01:00
Ian Paschal	8db4396ee7	Merge pull request #3436 from Ultimaker/feature_enable_disable_extruder ... CURA-4400 Feature enable disable extruder	2018-03-12 16:42:25 +01:00
Jaime van Kessel	f36e34a7c5	Merge branch 'master' of github.com:Ultimaker/Cura	2018-03-12 16:33:53 +01:00
Jaime van Kessel	522e297711	Add some more states to check if print_job is active	2018-03-12 16:33:32 +01:00
Ghostkeeper	f08407cf97	Document Available role ... Contributes to issue CURA-4606.	2018-03-12 16:32:10 +01:00
Ghostkeeper	5afcf2beac	Don't update brand and generic materials models upon switching active extruder ... Because the list of materials can't change by that action. Contributes to issue CURA-4606.	2018-03-12 16:28:41 +01:00
Ghostkeeper	0078340175	Only update NozzleModel when machine changes ... The available nozzles only change upon changing machines. Contributes to issue CURA-4606.	2018-03-12 16:19:47 +01:00
Lipu Fei	1f08accbec	Fix profile importing for version upgrade ... CURA-4946	2018-03-12 16:15:16 +01:00
Ghostkeeper	05c034558d	Set default layer height via preferred quality type ... So the layer heights are correct for each quality type but the default is still 0.2mm. Contributes to issue CURA-4981.	2018-03-12 16:03:42 +01:00
Ghostkeeper	1512a8096b	Require MaterialGroup to always have a base material ... The material group is loaded lazily whenever the base material is not yet in the dictionary. Contributes to issue CURA-4606.	2018-03-12 15:43:42 +01:00
Lipu Fei	c54679ba2d	Gix buildplate handling in Material profile ... CURA-4606	2018-03-12 15:25:29 +01:00
Lipu Fei	220e4a64c6	Fix VariantManager.getVariant() and simplify NozzleModel ... CURA-4606	2018-03-12 15:25:29 +01:00
Jack Ha	c4fb15a569	CURA-4400 resolve merge conflict	2018-03-12 15:18:35 +01:00
Jack Ha	81d036d5e4	Merge branch 'master' into feature_enable_disable_extruder	2018-03-12 15:15:27 +01:00
Diego Prado Gesto	55c3f06e73	Merge branch 'master' of github.com:Ultimaker/Cura	2018-03-12 15:10:43 +01:00
Diego Prado Gesto	809db6a4d9	CURA-5078 Remove material warning if the mismatch was the buildplate.	2018-03-12 15:09:56 +01:00
Ghostkeeper	bb7fccbd48	Add logging for every setting model update ... You can clearly see that some models are updated 4 times or so now. Contributes to issue CURA-4606.	2018-03-12 14:48:56 +01:00
Jack Ha	d889795721	CURA-4400 correctly cope with quality changes that conflict with the current enabled extruders	2018-03-12 14:15:49 +01:00
Jack Ha	e0e2d3362b	CURA-4400 fix for change in fdmprinter: move -1 from default_value to value	2018-03-12 13:30:31 +01:00
Jack Ha	aa3cd8ba9d	Solved merge conflict	2018-03-12 11:39:39 +01:00
Jack Ha	a3d6127dcb	CURA-4400 removed unnecessary correctExtruderSettings	2018-03-12 11:33:54 +01:00
Jack Ha	1f8be6ad3c	CURA-4400 moved default extruder value to value instead of default_value because of engine	2018-03-12 11:05:55 +01:00
Jack Ha	3edc96ec8f	CURA-4400 fixed wrongly converted expression	2018-03-12 10:47:23 +01:00
Lipu Fei	2c5cc17b49	Fix build plate compatibility check ... CURA-5078	2018-03-12 10:34:18 +01:00
Jack Ha	552618fcd4	CURA-4400 added function to find model index by extruder position in SettingExtruder	2018-03-12 09:56:08 +01:00
Ghostkeeper	d98cab48ac	Get scripts from either Resources or Preferences ... We must retain the old directory for legacy. People might still have scripts there.	2018-03-12 09:48:03 +01:00
Ghostkeeper	a3efbc70fb	Merge branch 'fix_postprocessing_script_path' of https://github.com/fieldOfView/Cura into fieldOfView-fix_postprocessing_script_path	2018-03-12 09:42:21 +01:00
Ghostkeeper	15212d4426	Align for readability	2018-03-12 09:38:20 +01:00
Ghostkeeper	aae8a31f00	Don't display extruder count if you can't use it ... If your printer can only handle one extruder, don't display this drop-down. Don't let users get confused.	2018-03-12 09:23:25 +01:00
Jack Ha	d70cc072e9	Merge branch 'master' into feature_enable_disable_extruder	2018-03-12 09:06:24 +01:00
Lipu Fei	7312ed8e3c	Fix project loading for version upgrade ... CURA-5054	2018-03-09 19:35:23 +01:00
Lipu Fei	e09325bf82	Fix project loading for version upgrade ... CURA-5054	2018-03-09 17:16:27 +01:00
Lipu Fei	a81981a27a	Better info on no profiles to import for gcode ... CIRA-4946 If a gcode is sliced with default profiles, there won't be any custom profiles to import from that gcode. In that case, we show a info message telling the user about this instead of showing an error message.	2018-03-09 16:40:57 +01:00
Lipu Fei	c41af83b41	Fix create quality changes for extruders ... CURA-5054	2018-03-09 16:29:49 +01:00
Ghostkeeper	2f1657f848	Update version numbers in variants ... These didn't match on my initial search-and-replace so I missed them. Contributes to issue CURA-5054.	2018-03-09 16:23:38 +01:00
Ghostkeeper	cf21e7c74b	Also upgrade definition_changes and user ... Because these files share their version numbers with quality changes. Contributes to issue CURA-5054.	2018-03-09 16:21:42 +01:00
Ghostkeeper	d8a066c1e7	Increment instance container version number instead of just quality_changes ... Otherwise when we load that quality_changes file we'll deny it because the instance container version number is wrong. Contributes to issue CURA-5054.	2018-03-09 16:14:24 +01:00
Ghostkeeper	3a832d66a9	Safer check for extruder vs. global ... Because it might be an empty string. Contributes to issue CURA-5054.	2018-03-09 16:07:54 +01:00
Ghostkeeper	b797ac1a15	Read only position from metadata ... We now determine whether this is a global or an extruder profile based on whether the position metadata field is present, instead of whether the extruder metadata field is present. Contributes to issue CURA-5054.	2018-03-09 16:07:06 +01:00
Ghostkeeper	5d2e98cdd4	Translate to American English ... The spelling in AmE is with a Z.	2018-03-09 15:55:27 +01:00
Ghostkeeper	e18b1cde55	Store extruder position under 'position' instead of 'extruder' ... Otherwise it thinks it is still an extruder ID. Contributes to issue CURA-5054.	2018-03-09 15:37:30 +01:00