Commit graph

1761 commits

Author SHA1 Message Date
Lipu Fei
3bb0a481f1 Simplify default quality reset 2018-03-15 17:01:05 +01:00
Jack Ha
8af82cc3f4 CURA-4400 prevent disabling last enabled extruder 2018-03-15 15:54:44 +01:00
Lipu Fei
08f43f6b2e Fix profile ordering in profile importing
CURA-5054
2018-03-15 15:27:47 +01:00
Diego Prado Gesto
b44f32ad1d Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 15:14:40 +01:00
Diego Prado Gesto
dcb68bb33e CURA-4870 Move the checkCorrectGroupName to the machine manager, where
it must belong to.
2018-03-15 15:13:35 +01:00
Jack Ha
1dba5629f7 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 15:00:22 +01:00
Jack Ha
05cd937df3 CURA-4400 optional_extruders cannot be set to disabled extruders anymore 2018-03-15 15:00:13 +01:00
Diego Prado Gesto
1e9a1f2668 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 14:48:43 +01:00
Diego Prado Gesto
cbe929242e CURA-4870 Update the names of the groups in the container stacks when
there is temporary name after upgrading from 3.2
2018-03-15 14:44:01 +01:00
Lipu Fei
1f2602a2f4 Move SettingVisibilityPresetsModel to Machines.Models
CURA-5088
2018-03-15 14:41:34 +01:00
Diego Prado Gesto
15ff4045bf CURA-4870 When removing a network connected printer, also remove all the
other machines that were (possibly) created in the background so that
there is no orphan containers.
2018-03-15 11:02:29 +01:00
Diego Prado Gesto
2fdd51fc23 CURA-4870 Bind the network information with the output devices changed
signal.
2018-03-14 16:47:01 +01:00
Lipu Fei
22573a685d Fix quality definition comparison in quality importing
CURA-4946
2018-03-14 14:31:30 +01:00
Lipu Fei
0655ef0bc5 Fix quality profile import
CURA-4946
2018-03-14 14:22:46 +01:00
Lipu Fei
191faaba19 Fix machine definition in quality importing
CURA-4946
2018-03-14 13:49:16 +01:00
Ian Paschal
05c59ddaa7 CURA-4946 Handle gcode with wrong quality definition
Some gcode has its quality definition set to, say, UM2 extended, which is _actually_ just UM2 gcode. Thus, we check if the definition in the profile matches the current machine or what it in theory should be, either one being valid. See comments in code for details.
2018-03-14 13:29:48 +01:00
Lipu Fei
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles
Setting Visibility Presets sidebar menu
2018-03-14 13:25:59 +01:00
Lipu Fei
53626d3c67 Also force update validationState
CURA-5048
2018-03-14 13:02:52 +01:00
Jack Ha
9f40e3925d CURA-5090 added timer to SettingInheritanceManager._update 2018-03-14 11:07:38 +01:00
Jack Ha
1d4b2eac4b CURA-5048 solved merge conflict 2018-03-14 09:03:17 +01:00
Lipu Fei
b83fd17038 Fix GUI update upon material data change
CURA-5084
2018-03-13 17:43:01 +01:00
Lipu Fei
d2eb01d137 Fix material name update on sidebar
CURA-5084
2018-03-13 17:41:15 +01:00
Jack Ha
406e546195 CURA-5048 fixed nozzle dependent settings to update after setting machine nozzle diameter in a crude way 2018-03-13 17:29:20 +01:00
Ian Paschal
4478989332
Merge pull request #3463 from Ultimaker/feature_sync_button
[Feature] Sync Button
2018-03-13 16:52:39 +01:00
Lipu Fei
e91b955f1e
Merge pull request #3485 from Ultimaker/CURA-5059_reset_icon_visibility
Cura 5059 reset icon visibility
2018-03-13 16:11:58 +01:00
Diego Prado Gesto
180139090a CURA-4870 Reuse the filter in findContainerStacks to find specific
printers.
Allow to show configurations with empty material or variant.
2018-03-13 15:54:00 +01:00
Diego Prado Gesto
2bf6d071d1 Merge branch 'master' into feature_sync_button 2018-03-13 13:54:22 +01:00
Jack Ha
cf3032605c CURA-4400 fix extruderValue / getExtruderValue for extruder_index -1 2018-03-13 13:53:41 +01:00
Lipu Fei
934d297e6c Split error checking into smaller sub-tasks
CURA-5059

Split stack error checking into smaller sub-tasks so running them on the Qt
thread will not block GUI updates from happening for too long.
2018-03-13 13:21:44 +01:00
Jack Ha
0897c740b0 Fix typo in log 2018-03-13 12:57:03 +01:00
Ian Paschal
6d2d9c8fe2 CURA-4946 Fixed typo 2018-03-13 12:39:10 +01:00
Guillem
1bb5b8ff3e add Copy all values to all extruders
context menu option
2018-03-13 12:31:03 +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
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
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
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
Lipu Fei
1f08accbec Fix profile importing for version upgrade
CURA-4946
2018-03-12 16:15:16 +01:00
Jack Ha
c4fb15a569 CURA-4400 resolve merge conflict 2018-03-12 15:18:35 +01:00
Diego Prado Gesto
da54c93fda CURA-4870 Remove commented code 2018-03-12 15:12:27 +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
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
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
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
Jack Ha
d70cc072e9 Merge branch 'master' into feature_enable_disable_extruder 2018-03-12 09:06:24 +01:00
Diego Prado Gesto
85d6919ce6 Merge branch 'master' into feature_sync_button 2018-03-09 16:59:18 +01:00
Diego Prado Gesto
87380e007c CURA-4870 Switch the hidden metadata entry also when switching printes
so the active printer is correctly shown in the machines page.
2018-03-09 16:44:46 +01:00