926 Commits

Author SHA1 Message Date
Arjen Hiemstra
b894e3888c Introduce a quality_type metadata entry that can be used to distinguish qualities
Since we want the profile to be selected based on material and we have
profiles like "ABS Normal" and "PLA Normal" we need some way to make
sure we select the same.

Contributes to CURA-2006
2016-08-10 10:55:25 +02:00
Arjen Hiemstra
4a02a9d1e3 Fix updating changed state for all stacks
Contributes to CURA-2006
2016-08-04 18:11:36 +02:00
Arjen Hiemstra
bc8c55f8fb Properly return True in updateQualityChanges
Since it is declared as returning bool

Contributes to CURA-2006
2016-08-04 18:05:45 +02:00
Arjen Hiemstra
7b9c982c62 Properly fix machinemanager access
Contributes to CURA-2006
2016-08-04 18:04:32 +02:00
Arjen Hiemstra
324d1415d7 Fix updating active quality
Contributes to CURA-2006
2016-08-04 17:55:16 +02:00
Arjen Hiemstra
354a467d8e Fix circular import bullcrap
Contributes to CURA-2006
2016-08-04 17:51:43 +02:00
Arjen Hiemstra
d150acb79c Change setActiveQuality to set quality of extruders & global and also set change containers
Contributes to CURA-2006
2016-08-04 17:41:01 +02:00
Arjen Hiemstra
e2045cdb7f Remove obsolete container switcheroo
Contributes to CURA-2006
2016-08-04 17:40:16 +02:00
Arjen Hiemstra
5361efcf2c Return the name/id of the quality changes container if it is set for activeQuality
Contributes to CURA-2006
2016-08-04 17:39:52 +02:00
Arjen Hiemstra
10de07c08e Remove some code that was moved to ContainerManager
Contributes to CURA-2006
2016-08-04 17:39:09 +02:00
Arjen Hiemstra
2ee2bc7348 Properly implement ContainerManager::createQualityChanges
Contributes to CURA-2006
2016-08-04 17:37:15 +02:00
Arjen Hiemstra
b76ebbb850 Ensure we have an empty quality changes container in the extruder stack
Contributes to CURA-2006
2016-08-04 17:36:39 +02:00
Arjen Hiemstra
ec383b46b9 Emit blurSettings for ContainerManager::merge/clear user containers
Contributes to CURA-2006
2016-08-04 17:33:35 +02:00
Arjen Hiemstra
b6d0c40852 Store "quality_changes" type containers in the quality directory
Contributes to CURA-2006
2016-08-04 17:32:38 +02:00
Arjen Hiemstra
9ef709962f Start implementing a createQualityChanges method in ContainerManager
It will be used to create the quality change containers from the
existing user containers.

Contributes to CURA-2006
2016-08-04 02:12:32 +02:00
Arjen Hiemstra
0934ae70a8 Introduce clearUserContainers and updateQualityChanges methods in ContainerManager
They are moved from MachineManager which is really getting too large and
complicated.

Contributes to CURA-2006
2016-08-04 02:11:35 +02:00
Arjen Hiemstra
95c3aa8251 Split ContainerManager::mergeContainer into a checking bit and a function that does the actual work
Contributes to CURA-2006
2016-08-04 02:10:28 +02:00
Arjen Hiemstra
aa8561fec7 Remove globalPropertyChanged
There should be no need for this if we properly store settings where
they should be stored.

Contributes to CURA-2006
2016-08-04 02:05:12 +02:00
Arjen Hiemstra
d42f390ed6 Add the new empty quality_changes container to new machines
Contributes to CURA-2006
2016-08-04 02:03:57 +02:00
Arjen Hiemstra
ab99100c56 Introduce an empty quality_changes container
Contributes to CURA-2006
2016-08-04 02:02:47 +02:00
Arjen Hiemstra
81f3422e36 Make settable_per_* properties read-only
Contributes to CURA-2006
2016-08-04 02:02:14 +02:00
Ghostkeeper
557044b11c
Remove print statement
Wasn't meant to be committed, I reckon.

Contributes to issue CURA-2022.
2016-08-03 12:39:01 +02:00
Arjen Hiemstra
791d51df2a Expose an extruderValue() function to value functions
It can be used to get the value of a specific extruder

Contributes to CURA-2009
2016-08-02 19:42:40 +02:00
Arjen Hiemstra
a7187e7fe3 Document getExtruderValues 2016-08-02 19:42:40 +02:00
Arjen Hiemstra
3c35830cb8 Expose an extruderValue() function to value functions
It returns the value of a setting of a specific extruder.

Contributes to CURA-2009
2016-08-02 19:42:40 +02:00
Arjen Hiemstra
b102a6cedd Expose an extruderValues() function to value functions
It returns a list of values for all extruders so that things like max()
work.

Contributes to CURA-2009
2016-08-02 19:42:40 +02:00
fieldOfView
ab843b8187 Reset qml component when resetting a Machine Action
Contributes to CURA-2019 and fixes CURA-1978
2016-08-02 15:57:01 +02:00
Arjen Hiemstra
22b6ab9c42 Set the extruder stack to a proper default when creating SettingOverrideDecorator
Turns out it otherwise fails to send the right data.

Fixes CURA-2032
2016-08-02 13:58:16 +02:00
Arjen Hiemstra
9773a16bc6 Properly set active extruder when deepcopying SettingOverrideDecorator
Fixes CURA-2022
2016-08-02 11:33:23 +02:00
fieldOfView
68fc9af4c2 Fix removing extruder stacks and extruder user profile
CURA-1898 broke fix for CURA-1896
2016-08-01 16:38:31 +02:00
fieldOfView
7b873fc397 Fix renaming profiles
CURA-2017
2016-08-01 16:05:57 +02:00
fieldOfView
e01c8a4f10 Add Select All functionality 2016-07-29 19:25:40 +02:00
fieldOfView
228f5be35a Fix order of machine actions on manage printers page
MachineActionManager now uses lists instead of dicts because dicts don't maintain the order.
2016-07-29 17:14:18 +02:00
Jaime van Kessel
d1a6420e1b Delete all object now clears Selection
CURA-1891
2016-07-29 11:07:16 +02:00
Jaime van Kessel
03aa4f9c6a Undo removing object from group now works correctly
CURA-1891
2016-07-29 11:05:11 +02:00
Jaime van Kessel
21d4e9b894 Delete selection now also removed group nodes when they only have one child left
CURA-1891
2016-07-29 11:00:28 +02:00
Thomas Karl Pietrowski
1b432b7b4f Removing debug print
Contributes to CURA-1987
2016-07-28 18:30:48 +02:00
Arjen Hiemstra
14d4b1f881 Fix setting the default path on OSX
Contributes to CURA-1987
2016-07-28 18:08:30 +02:00
Arjen Hiemstra
570a67556a Fix exporting and importing materials on OSX
OSX's file dialog is stupid and does not understand extensions with
a . in them. So instead just use everything after the last .

Fixes CURA-1987
2016-07-28 18:08:17 +02:00
Jaime van Kessel
4b9a78624d Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-28 15:00:29 +02:00
Jack Ha
3d47e329a7 Fix convex hull being updated after removing CPU eating monster.
CURA-2002.
2016-07-28 14:57:17 +02:00
Jaime van Kessel
fe205b51f9 Per object settings now use correct stack
CURA-1934
2016-07-28 14:45:49 +02:00
Jack Ha
ce462ace17 Layout. CURA-1707 2016-07-28 13:48:43 +02:00
Jaime van Kessel
a1bd8f59ed Slicing no longer occurs when stack is invalid
CURA-1998
2016-07-28 13:14:07 +02:00
Jaime van Kessel
614d4bb21a Merge branch 'feature_additional_components' of github.com:Ultimaker/Cura 2016-07-28 12:42:39 +02:00
Jaime van Kessel
cab1dc7a13 Fix merge mistake 2016-07-28 12:35:36 +02:00
Jaime van Kessel
c6d1caaf0f Convex hull is no longer needlessly re-calculated
CURA-2002
2016-07-28 11:47:56 +02:00
Arjen Hiemstra
823ab61cc5 Tweak convex hull node and transparent object shader
Now we render at least a vague hint at lighting instead of nothing at
all.
2016-07-27 18:03:20 +02:00
Jack Ha
bac3f73e6d Check ConvexHullHead vs ConvexHullHead collision. CURA-1776 2016-07-27 17:42:15 +02:00
Jaime van Kessel
762ea15e78 Global inherited settings now use target (instead of active) stack to copy values
Fixes multiple issues with support settings not being updated properly
2016-07-27 09:54:02 +02:00