32 Commits

Author SHA1 Message Date
Simon Edwards
fb70eb6813 Merge branch 'master' into python_type_hinting 2017-01-17 08:42:55 +01:00
Arjen Hiemstra
f04dc88d2c Do not use resolve for profile display when source is quality changes
Fixes CURA-3115
2016-12-15 15:36:38 +01:00
Simon Edwards
d4619da358 Merge branch 'master' into python_type_hinting 2016-12-13 14:39:35 +01:00
Simon Edwards
74e5798509 Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py.
CURA-2917
2016-12-12 16:05:35 +01:00
Arjen Hiemstra
94a50362e1 Fix translation of category headers on profiles page
Contributes to CURA-3123 (No, not really, but I do not want to make a
new issue)
2016-12-12 16:02:51 +01:00
Jaime van Kessel
998b14086e Profile tab is now also translated
CURA-2744
2016-12-09 17:00:18 +01:00
Jaime van Kessel
361aee3e3c Resolve value is now correctly displayed in profilesPage
CURA-2844
2016-11-25 13:29:46 +01:00
Simon Edwards
98a6568313 Merge branch 'master' into python_type_hinting 2016-11-22 11:15:04 +01:00
Simon Edwards
14afd9eab7 Heaps to changes to get the Cura code through the type checker (with minimal checking).
CURA-2917
2016-11-21 21:36:08 +01:00
Jaime van Kessel
a3df53c1e1 Quality_changes are now taken into account for UM3Extended
CURA-2690
2016-10-15 18:36:05 +02:00
Jaime van Kessel
939ed60808 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-12 17:50:12 +02:00
Jaime van Kessel
4a31f9c5b6 Removed wrong check for material for quality_changes
CURA-2635
2016-10-12 17:49:20 +02:00
Simon Edwards
c3cf762451 Show the warning color for unsupported materials/qualities by using the new 'supported' metadata flag.
CURA-2271
2016-10-12 15:57:50 +02:00
fieldOfView
e312530840 Fix errors on profiles page for unsupported material combinations
CURA-2271
2016-10-11 15:07:27 +02:00
fieldOfView
593687afee Fix display of custom profiles for printers that have no materials (UM2)
CURA-2565
2016-10-06 15:20:16 +02:00
fieldOfView
6d0da0d754 Revert "global_profile" reference changes while refixing import
CURA-2518 and CURA-2478
2016-10-04 17:21:33 +02:00
fieldOfView
10dc8f98b8 Highlight quality_changes values in manage profiles tabs...
and strike out values that are overridden by a user value

CURA-2514
2016-10-04 13:14:04 +02:00
fieldOfView
e7da471199 Fix showing profile values for extruders
The profiles page would show the setting values in the quality profile, ignoring the quality_changes profile, because it could not find the appropriate quality_changes profile for the extruders

CURA-2478
2016-10-03 17:04:46 +02:00
Jaime van Kessel
c93f5dc8ac QualitySettingsModel now uses right metadata entry for filtering
CURA-2452
2016-09-27 15:24:27 +02:00
Jaime van Kessel
8f65ed4c4e 0 is now seen as a correct value by QualitySettingsModel
CURA-2293
2016-09-12 15:36:57 +02:00
Jaime van Kessel
6ff258d7e0 Single extrusion machines now show correct values for profiles in tab
CURA-2214
2016-08-31 14:52:41 +02:00
fieldOfView
82f6f20bc1 Restore profiles overview for single extrusion printers
CURA-2214
2016-08-30 16:42:41 +02:00
fieldOfView
e79694178c Update for readability
CURA-2214
2016-08-30 15:11:50 +02:00
Jaime van Kessel
91c11ee0fc Merge branch 'feature_listmodel_setitems' of github.com:Ultimaker/Cura 2016-08-30 11:08:57 +02:00
Jaime van Kessel
f85f7cb62c Filter certain settings based on stack type in profile tab
CURA-2214
2016-08-30 10:47:32 +02:00
Jaime van Kessel
9a753680e7 Setting pane now uses correct profiles to display setting values
CURA-2185
2016-08-29 16:18:15 +02:00
fieldOfView
b343649131 Use ListModel.setItems() instead of appending one item at a time
setItems sets the items to a (presorted) list of items instead of adding items one by one and then sorting the list. This way if an update to the model causes a signal storm at least it happens only once for an update.

Specifically this reduces switching to a dual extrusion printer by half.

Contributes to CURA-2193
2016-08-29 13:43:02 +02:00
fieldOfView
344be2687e Display the appropriate profile settings on Profiles page
CURA-2006
2016-08-22 22:38:13 +02:00
fieldOfView
cfb062718f Fix creating a clone of criteria
CURA-2006
2016-08-22 21:43:32 +02:00
fieldOfView
08091209f1 Fix profile display for printers without machine-specific material profiles
CURA-2006, CURA-1774
2016-08-22 19:21:44 +02:00
Jack Ha
80214d07bc Prettier number display in Profiles page. CURA-2006 2016-08-16 15:03:01 +02:00
Arjen Hiemstra
1a6b16932a Add a QualitySettingsModel that lists all quality related settings and values
Contributes to CURA-2006
2016-08-10 11:00:36 +02:00