Commit graph

7047 commits

Author SHA1 Message Date
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
fieldOfView
4c66c935af Merge branch 'master' into feature_setting_visibility_profiles 2018-03-09 15:45:24 +01:00
Ghostkeeper
71afbba789
Merge branch '3.2' 2018-03-09 15:36:51 +01:00
Ghostkeeper
5caa92cf7a
Update current version for quality changes
We now need to upgrade up to version 3000004.

Contributes to issue CURA-5054.
2018-03-09 15:21:45 +01:00
Lipu Fei
de72dd3455 Fix material update upon gcode flavour change
CURA-5060
2018-03-09 14:26:53 +01:00
Diego Prado Gesto
ebbb30a5be CURA-4870 Replace network key and connect group name metadata values
when the connection changes.
2018-03-09 13:37:15 +01:00
Diego Prado Gesto
260cad36cb CURA-4870 Add name of the group and hidden property to the network
printers. The printer menu shows the printers grouped by group and the
hidden printers are never listed.
2018-03-09 12:42:49 +01:00
Ghostkeeper
d8853b8a98
Sort profile models case-insensitively
Cast every sorting key to uppercase before doing this. Don't cast to lowercase or there will be problems with characters that don't have lowercase and with Turkish dotted i vs. undotted i.

Fixes #3460.
2018-03-09 11:40:33 +01:00
Lipu Fei
3550ef80e0 Fix quality management page QML
CURA-5063
2018-03-09 11:00:39 +01:00
Diego Prado Gesto
4be4d08d97 CURA-4870 Add the ability in Cura to switch between different types of
printers. Create a new container stack if it doesn't exist with the same
network connection key.
2018-03-09 10:47:08 +01:00
Lipu Fei
ef8cd304dc No keep/discard setting dialog in project loading
CURA-4966
2018-03-08 20:00:21 +01:00
Lipu Fei
6aefb2215d Fix _setQualityChangesGroup()
CURA-4966
2018-03-08 19:50:45 +01:00
Lipu Fei
d1beae4603 Better logging for checkIsValidProjectFile()
CURA-4966
2018-03-08 19:50:22 +01:00
Diego Prado Gesto
b212781a19 Merge branch 'master' into feature_sync_button 2018-03-08 16:57:21 +01:00
Diego Prado Gesto
fa5aa0a53f CURA-4870 React to outputdeviceschanged signal, to update the list of
the configurations.
2018-03-08 16:55:40 +01:00
Jack Ha
0d61b6652c CURA-4400 merge two if statements in 1 2018-03-08 15:38:32 +01:00
Diego Prado Gesto
591d3f29ec CURA-4870 Don't crash when there is not buildplate variant for the
current machine
2018-03-08 15:36:12 +01:00
Jack Ha
138f77179d CURA-4400 fix errors when switch or adding to new machine 2018-03-08 14:31:55 +01:00
Jack Ha
f576b1f117 CURA-4400 fix crash when switching from disabled 1st extruder to single extruder machine 2018-03-08 14:28:57 +01:00
Jack Ha
a9976e93c1 CURA-4400 fix per object setting change reslicing without reevaluate is non printing mesh all the time 2018-03-08 13:57:11 +01:00
Ian Paschal
ffccdd99c0 Added status icon 2018-03-08 10:55:29 +01:00
Jack Ha
3b8d470323 Merge branch 'master' into feature_enable_disable_extruder 2018-03-08 09:35:49 +01:00
Lipu Fei
2a10c9a2d7 Move assertion in _performMerge()
CURA-5070
2018-03-08 09:10:45 +01:00
Diego Prado Gesto
3629c3959e CURA-4870 Match the printer type in the dropdown with one of the
available printer types in the group
2018-03-07 22:33:15 +01:00
ChrisTerBeke
3d42849f90
Merge pull request #3418 from Ultimaker/docker
Docker support
2018-03-07 11:08:42 -08:00
Diego Prado Gesto
be8fc9f3f1 CURA-4870 Manage the case when there is an empty material or variant in the printer and Cura needs to apply this configuration 2018-03-07 19:59:06 +01:00
Diego Prado Gesto
e7294e1299 CURA-4870 Correctly look for the buildplate variants using the
machine_buildplate_type that is also sent in the gcode and is the
information that Cura gets from connect.
Create a new dict in the VariantManager that maps the
machine_buildplate_type with the right container
2018-03-07 18:52:48 +01:00
Jack Ha
16cebe35ef CURA-4400 added docs to new functions 2018-03-07 16:41:03 +01:00
Lipu Fei
77e3be68b3 Add removeMaterialByRootId() in MaterialManager
CURA-5056
2018-03-07 16:38:24 +01:00
Lipu Fei
29792bbdd8 Reschedule update upon incomplete data in MaterialManager
CURA-5056
2018-03-07 16:38:24 +01:00
Diego Prado Gesto
97740123fa CURA-4870 Add information about the buildplate in the printer output
model so it can be used to show the buildplate name in the configuration
list.
2018-03-07 13:57:13 +01:00
Diego Prado Gesto
0beee79c3a CURA-4870 Revert skipping stack checks 2018-03-07 13:17:55 +01:00
Jack Ha
859ac88357 Merge branch 'master' into feature_enable_disable_extruder 2018-03-07 12:59:40 +01:00
Diego Prado Gesto
7b772ffad7 Merge branch 'master' into feature_sync_button 2018-03-07 11:49:25 +01:00
Lipu Fei
27cce56467 Add error message for possible bugs in MaterialManager
CURA-5056
2018-03-07 11:45:49 +01:00
Jack Ha
ff1c378c08 CURA-4400 fix start slicing when disabled extruder is incompatible 2018-03-07 11:38:35 +01:00
Jack Ha
4568fab531 CURA-4400 fix quality profiles model to not use disabled extruder and update Not Supported or select a valid quality when enabling/disabling extruder 2018-03-07 11:27:23 +01:00
Lipu Fei
6cae5c2e35 Remove unnecessary signal connection in MaterialsModel
CURA-5052
2018-03-07 10:39:23 +01:00
Jack Ha
bab46d7048 CURA-4400 only reevaluate non printing mesh if the setting actually matters 2018-03-06 17:19:31 +01:00
Jack Ha
32ce458516 CURA-4400 solved merge conflict 2018-03-06 17:05:39 +01:00
Diego Prado Gesto
5280d21c26 Merge branch 'master' into feature_sync_button 2018-03-06 16:10:44 +01:00
Diego Prado Gesto
f625fa8a90 CURA-4870 Add function to set the configuration from the printer back to
Cura.
Change the hash function to compare by GUID instead of type.
Show the material name instead of type in the list.
2018-03-06 16:08:50 +01:00
Aleksei S
6bb42da056 Removed related commits to Settins per Object validation and
added short validation in StartScliceJob
CURA-4972
2018-03-06 15:40:26 +01:00
Lipu Fei
fb798ab7e5 Small refactor in MachineManager and add more loggings
CURA-4606

 - Added more info loggings
 - Changed some variant names
 - Use some shortcut variables instead of getInstance()s
2018-03-06 15:30:39 +01:00
Lipu Fei
cb7677347d Fix material model update upon variant change
CURA-5052
2018-03-06 15:27:05 +01:00
Jack Ha
8ebd778224 CURA-4400 force update all settings if something changed with the extruder 2018-03-06 11:48:22 +01:00
Lipu Fei
27b3a71a98 Sort branded materials for dropdown menu
CURA-4606
2018-03-06 11:26:16 +01:00