13581 Commits

Author SHA1 Message Date
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
Diego Prado Gesto
39a7f5a53d CURA-4870 Update the configuration also when the type or the buildplate
changed signal is emitted.
2018-03-12 16:37:35 +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
Aleksei S
7574ab0883 Connect infill Lines checkbox did not work 2018-03-12 15:52:16 +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
Aleksei S
c3b659c5d4 Fix: reset icon dissapears for default values
CURA-5059
2018-03-12 15:15:19 +01:00
Diego Prado Gesto
da54c93fda CURA-4870 Remove commented code 2018-03-12 15:12:27 +01:00
Diego Prado Gesto
96fcfd9e2f Merge branch 'feature_sync_button' of github.com:Ultimaker/Cura into feature_sync_button 2018-03-12 15:11:11 +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
Ian Paschal
a5ba4799f0 CURA-4870 Final icon changes from Luke 2018-03-12 14:48:39 +01:00
Diego Prado Gesto
cc009a94ee CURA-4870 Remove "check compatibility" message.
Move the buildplate information to the bottom, below the extruders.
2018-03-12 14:19:06 +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
Diego Prado Gesto
ec2201b57c CURA-4870 Move the printer type and the buildplate selector to the top
of the sidebar and set them separate from the extruder related
selectors.
2018-03-12 11:57:53 +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
Diego Prado Gesto
9613103591 CURA-4870 Remove Monitor stage status icons 2018-03-12 10:45:49 +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
Ryan
4d5ace4564 Added default material diameter to SeeMeCNC printer definitions 2018-03-11 10:27:57 -04:00
Timur Tabi
5e4e049c1f Add definition for Printrbot Simple Maker's Kit 1405
The Printrbot Simple Maker's Kit, model 1405, was a low-cost FDM printer
without a heated bed and a 10x10cm print area.

The print area can be extended to 185x100mm with the "Printrbot Simple XL
Upgrade with Spool Rack for Maker's Kit 1405".

More information can be found at http://printrbot.com/project/simple-makers/
2018-03-10 14:57:03 -06: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
Diego Prado Gesto
85d6919ce6 Merge branch 'master' into feature_sync_button 2018-03-09 16:59:18 +01:00
fieldOfView
e62ed62bdd Remove duplicate import 2018-03-09 16:57:09 +01:00