Jack Ha
d70cc072e9
Merge branch 'master' into feature_enable_disable_extruder
2018-03-12 09:06:24 +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
Diego Prado Gesto
472ae8e044
CURA-4870 Create a custom model for the machines in order to show the
...
printers grouped by local or networked.
2018-03-09 16:35:23 +01:00
Lipu Fei
c41af83b41
Fix create quality changes for extruders
...
CURA-5054
2018-03-09 16:29:49 +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
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
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
b212781a19
Merge branch 'master' into feature_sync_button
2018-03-08 16:57:21 +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
3b8d470323
Merge branch 'master' into feature_enable_disable_extruder
2018-03-08 09:35:49 +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
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
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
Lipu Fei
6cae5c2e35
Remove unnecessary signal connection in MaterialsModel
...
CURA-5052
2018-03-07 10:39:23 +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
Lipu Fei
cb7677347d
Fix material model update upon variant change
...
CURA-5052
2018-03-06 15:27:05 +01:00
Lipu Fei
27b3a71a98
Sort branded materials for dropdown menu
...
CURA-4606
2018-03-06 11:26:16 +01:00
Jack Ha
bad637eb14
CURA-4400 fixed merge conflicts
2018-03-05 16:47:40 +01:00
Lipu Fei
3004b146ad
Fix: move createQualityChanges() to QualityManager
...
CURA-4606
2018-03-05 13:36:13 +01:00
Lipu Fei
d79a9f6449
Add logging for quality settings model
2018-03-05 10:35:54 +01:00
Lipu Fei
f86c2a2f8a
Add comments for quality settings model
2018-03-05 10:32:59 +01:00
Lipu Fei
2255dc628b
Remove unnecessary comments
2018-03-05 10:31:04 +01:00
Lipu Fei
b4deb3e828
Better logging in quality profile model
2018-03-05 10:23:36 +01:00
Lipu Fei
6db26eaca5
Add getDefaultMaterial() in MaterialManager
2018-03-03 15:29:49 +01:00
Lipu Fei
86e12fc437
Add getDefaultVariantNode() in VariantManager
2018-03-03 15:21:29 +01:00
Lipu Fei
41b7468460
Add comments for quality search priorities
2018-03-03 15:03:54 +01:00
Lipu Fei
aa49b0131e
Remove outdated doc in QualityManager
2018-03-03 14:54:21 +01:00
Lipu Fei
e3e470cb96
Simplify set update
2018-03-03 14:48:08 +01:00
Lipu Fei
c93643bc2f
Move createMaterial() to MaterialManager
2018-03-02 17:30:19 +01:00
Lipu Fei
cf2252f4f9
Simplify for loop in duplicateMaterial()
2018-03-02 17:22:19 +01:00
Lipu Fei
5f0bb3a283
Move removeMaterial() to MaterialManager
2018-03-02 17:20:26 +01:00
Lipu Fei
7642afb9fe
Move duplicateMaterial() to MaterialManager
2018-03-02 17:16:35 +01:00
Lipu Fei
ca785c9df3
Move duplicateQualityChanges() to QualityManager
2018-03-02 17:08:58 +01:00
Lipu Fei
355b8cbac3
Move renameQualityChangesGroup() into QualityManager
2018-03-02 16:58:50 +01:00
Lipu Fei
8324f4f44e
Move removeQualityChangesGroup() into QualityManager
2018-03-02 16:47:25 +01:00
Lipu Fei
0944653412
Change VariantType to an Enum
2018-03-02 16:41:19 +01:00
Lipu Fei
fc36df2bea
Remove unnecessary comments in getQualityGroupsForMachineDefinition()
2018-03-02 16:37:23 +01:00
Lipu Fei
e340f8e534
Add documentation for getQualityGroups()
2018-03-02 16:34:42 +01:00
Lipu Fei
27f4574223
Remove some superfluous comments in QualityManager
2018-03-02 16:31:57 +01:00
Lipu Fei
29631fa8eb
Fix QualityManager doc
2018-03-02 16:25:16 +01:00
