1234 Commits

Author SHA1 Message Date
Jack Ha
83caa334a2 Also wait for lock file in saveSettings. CURA-2449 2016-10-10 09:09:31 +02:00
Jack Ha
8b0d6e974a Added lock file writing and checking. CURA-2449 2016-10-09 11:54:34 +02:00
Simon Edwards
963fac7806 Filter the list of quality changes taking into account the quality(-type) profile they depend on.
Contributes to CURA-2248 Duplicated profile not shown in the profile manager list
2016-10-05 09:32:18 +02:00
Simon Edwards
5d1b77c551 Rename ProfilesPageModel.py to QualityAndUserProfilesModel.py. Step 2 of 2.
Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-10-03 15:19:32 +02:00
Simon Edwards
2742a4ef65 Show the correct list of qualities and quality change profiles.
Contributes to CURA-2248 Duplicated profile not shown in the profile manager list
2016-09-29 12:34:46 +02:00
Simon Edwards
a7c58c33f7 Fixed up the profiles menu to handle multiple extruders better.
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
2016-09-28 15:15:18 +02:00
Jack Ha
4547cfe504 Introduced resolveOrValue which fixes resolvement with dependencies for the most part. CURA-2232 2016-09-26 10:37:44 +02:00
fieldOfView
10af3ee5ab More defensive coding to prevent division by zero
CURA-2443
2016-09-22 15:16:39 +02:00
Jaime van Kessel
4e3384e640 Merging with groups no longer causes devision by zero
CURA-2443
2016-09-22 14:33:01 +02:00
Jaime van Kessel
7a85430f70 Merging no longer crashes if node has no meshdata
CURA-2443
2016-09-22 14:25:00 +02:00
Tim Kuipers
d8b1486637 doc: better documentation of limit_to_extruder and resolve properties in the JSON (CURA-2308) 2016-09-21 17:54:47 +02:00
Ghostkeeper
c1a593c3d8
Create new user profile upon upgrading machine instance
This defines a new configuration type: 'user', for the user profile.

Contributes to issue CURA-844.
2016-09-21 17:34:22 +02:00
Ghostkeeper
9501f9b17c
Make VersionUpgradeManager a singleton
This way we can access the manager from anywhere, without adding a getter to CuraApplication or something.

Contributes to issue CURA-844.
2016-09-21 17:34:22 +02:00
Jaime van Kessel
50f7c41ae4 Added SettingsInheritanceManager
CURA-2361
2016-09-16 09:38:52 +02:00
Tim Kuipers
479f9ea6d2 refactor: global_inherits_stack ==> limit_to_extruder (CURA-2308) 2016-09-14 10:46:57 +02:00
Jaime van Kessel
03c28537f2 Added function to save a single stack to file.
CURA-2279
2016-09-12 11:58:51 +02:00
Jaime van Kessel
8a8b55800b Duplicating materialContainers should now duplicate all related material containers
CURA-2242
2016-09-08 14:15:00 +02:00
fieldOfView
cab5f4d823 Fix "Reset all model transformations" for groups
CURA-2291
2016-09-07 16:06:42 +02:00
Jaime van Kessel
9a28b0d433 Previously active tool is now set correctly once something is selected again
CURA-1481
2016-09-05 16:20:12 +02:00
Jaime van Kessel
1b1be13818 Added normal quality_type to empty container so switching quality_changes works again
CURA-2236
2016-09-05 13:47:19 +02:00
Jaime van Kessel
3227507297 An empty quality container will now give a "not supported" warning
CURA-2236
2016-09-05 13:31:36 +02:00
Jaime van Kessel
dd1effdb81 Reset all transformations now also resets object above buildplate
CURA-2233
2016-09-02 14:27:18 +02:00
Jaime van Kessel
bbcd43ef01 Reset all translations now ensures that model is right on top of buildplate
CURA-2233
2016-09-02 14:23:05 +02:00
Jaime van Kessel
aa83b6834b Removed unused decorator 2016-09-02 13:43:28 +02:00
Simon Edwards
d0cc37658a Move the combined object to the center of the group after a merge.
Contributes to CURA-2160 "Merging objects results in group jumping off the buildplate"
2016-08-24 15:47:44 +02:00
Jack Ha
9521a85318 Fix resolve in profile bug. Removed unnecessary imports. Removed unnecessary watch. Contributes to CURA-2007 2016-08-24 11:36:10 +02:00
Jack Ha
090b8d4f50 Solved merge conflict. 2016-08-23 10:35:20 +02:00
Ghostkeeper
bb90c593b9 Merge branch 'feature_quality_changes' 2016-08-22 15:13:27 +02:00
fieldOfView
55942af9f7 Remove non-existing blackmagic/dual setting from defaults 2016-08-18 13:09:15 +02:00
Jack Ha
8c0837d75d Merge master. CURA-2006 2016-08-16 15:08:25 +02:00
fieldOfView
48cfea01d0 Set sensible defaults for which "Dual Extrusion" settings are visible
CURA-916
2016-08-15 15:34:54 +02:00
Jack Ha
4ea9276682 Merge branch 'master' into cura-2007 2016-08-15 09:16:04 +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
Thomas Karl Pietrowski
35c520a787 Merge pull request #836 from Ultimaker/master-updates-for-Linux
Updating NVidia workaround
2016-08-07 07:59:34 +02:00
Jack Ha
bfabf8d11a Merge, fix qml files. Contributes to CURA-2007.
Merge branch 'feature_quality_changes' into cura-2007

Conflicts:
	resources/qml/Settings/SettingItem.qml
	resources/qml/Settings/SettingView.qml
2016-08-04 18:22:36 +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
Jack Ha
2402ba3d0e Bed temperature is now either a resolved value or a global value.
Contributes to CURA-2007
2016-08-04 14:30:48 +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
eeec460635 Merge branch 'feature_support_bottoms' 2016-08-03 17:40:28 +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
Tim Kuipers
401e302ad5 Merge branch 'master' into feature_support_bottoms 2016-08-02 12:46:44 +02:00
fieldOfView
e01c8a4f10 Add Select All functionality 2016-07-29 19:25:40 +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
Tim Kuipers
1f903b9fcc JSON renames: support_roof_... ==> support_interface... (CURA-1013) 2016-07-28 14:06:00 +02:00