Arjen Hiemstra
fdc6fbbac1
Handle limit_to_extruder in {Extruder,Global}Stack getProperty
...
This way we do not need to special case limit_to_extruder and instead
always use limit_to_extruder if it is set.
Contributest to CURA-3738
2017-05-11 17:50:12 +02:00
Ghostkeeper
6e01c6ba60
Initialise config_name
...
Just a mistake that I saw because my IDE warned me about this. If a variant in Cura 2.3 has no general/name keyword, then it would break here. Now it doesn't break any more and gives a nonsensical name.
Contributes to issue CURA-3427.
2017-05-11 17:33:46 +02:00
Ghostkeeper
0a84a181c4
Track cfg version numbers with major-minor, sorta
...
We now have a (format) version and a setting version. Ideally we'd like major-minor version numbers in our profiles. However, introducing major-minor version numbers requires substantial changes to the version upgrade manager to compare version numbers, find a path towards the current version, or even keeping track of the current version. Therefore we just collapse the two version numbers into one: Multiply the major version number by a million and you'll never exceed it in the minor versioning. The only problem is that we now have to update the versioning for all of our three upgrade plug-ins, because they all need to know locally how to find the version number of their file types (because the upgrade manager has no knowledge of the file types) and they have no access to each other because a plug-in may be disabled.
Contributes to issue CURA-3427.
2017-05-11 17:31:37 +02:00
Ghostkeeper
639e86ca59
Set setting_version in 2.6's profiles
...
Contributes to issue CURA-3427.
2017-05-11 16:53:59 +02:00
fieldOfView
f5347a4593
Add documentation and a spot of logging
2017-05-11 16:37:32 +02:00
Ghostkeeper
30321607d0
Remove Cubic Subdivision Radius from users' configuration
...
The setting no longer exists. This removes it from all instance containers and preference files.
Contributes to issue CURA-3427.
2017-05-11 15:30:24 +02:00
Lipu Fei
8a94f94258
WIP: use .userChanges property to replace user containers in project loading
...
CURA-3756
2017-05-11 14:54:00 +02:00
Lipu Fei
3baec9b742
WIP: set dirty after overriding a user container with deserialize()
...
CURA-3756
2017-05-11 14:53:04 +02:00
Ghostkeeper
22cfaddba5
Fix import
...
Oops.
The test passes again now.
Contributes to issue CURA-3427.
2017-05-11 14:35:54 +02:00
Ghostkeeper
833ad65507
Also rename test
...
Forgot that, sorry.
Contributes to issue CURA-3427.
2017-05-11 14:34:11 +02:00
Ghostkeeper
b57cb16f6d
Rename 24to25 to 25to26
...
The upgrade now upgrades profiles from the 2.5 format to 2.6, since we delayed the update for the 2.5 release.
Contributes to issue CURA-3427.
2017-05-11 14:32:45 +02:00
Ghostkeeper
99cb8bc169
Re-enable Version 2.4 to 2.5 upgrade
...
So that we can remove settings again, among which the Cubic Subdivision Radius setting.
Contributes to issue CURA-3427.
2017-05-11 14:29:25 +02:00
Ghostkeeper
e7fc36587d
Remove Cubic Subdivision Radius setting
...
Just removes the definition. No version upgrade yet. That is next up.
Contributes to issue CURA-3427.
2017-05-11 14:27:56 +02:00
Lipu Fei
bb0e711577
WIP: fix material container renaming in project loading
...
CURA-3756
2017-05-11 14:20:11 +02:00
Lipu Fei
f436da8674
WIP: fix project loading and container renaming
...
CURA-3756
2017-05-11 14:20:11 +02:00
fieldOfView
24159aaf66
Fix activating newly created materials
2017-05-11 14:08:15 +02:00
Jaime van Kessel
c5371842c2
Merge branch 'fix_per_model_settings_single_extrusion' of https://github.com/fieldOfView/Cura
2017-05-11 13:25:22 +02:00
fieldOfView
6fa83a9110
Fix selecting a material when an edit field has the focus
2017-05-11 13:22:14 +02:00
fieldOfView
5339055f9a
Fix unlinking materials
2017-05-11 13:10:32 +02:00
fieldOfView
0d67d42300
Fix created materials being a linked to themselves
2017-05-11 12:53:53 +02:00
fieldOfView
e45f04f391
Merge branch 'master' into fix_material_uniqueness
2017-05-11 12:23:01 +02:00
Ghostkeeper
8ff3079b3e
Let CPE always use prime tower
...
Also 0.8mm.
2017-05-11 12:00:54 +02:00
Ghostkeeper
e3236bec4d
Make wording more consistent
...
Contributes to issue CURA-3732.
2017-05-11 11:22:18 +02:00
Jaime van Kessel
8e7637ae62
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-11 11:08:47 +02:00
Jaime van Kessel
e2b39e7e33
Fixed spacing of infill options
...
CURA-3732
2017-05-11 11:08:23 +02:00
fieldOfView
f23d969c23
Extend the zoomrange to cater for smaller and larger buildvolumes
2017-05-11 10:55:56 +02:00
Ghostkeeper
078fd16109
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-11 10:29:42 +02:00
Ghostkeeper
00aff6d2f2
Make feature labels more accurate for support
...
It's used a bit differently.
Contributes to issue CURA-3773.
2017-05-11 10:29:18 +02:00
Ghostkeeper
32ea311762
Merge branch 'time_estimate_per_feature' of https://github.com/14bitVoid/Cura into 14bitVoid-time_estimate_per_feature
2017-05-11 09:53:50 +02:00
Lipu Fei
9060bbf3b2
Update extruderCount when extrudersModel got changed
...
CURA-3755
The Timer delay is not reliable for updating the extruder Tabs.
So we now rely on the modelChanged signal of the ExtrudersModel
to do the update.
2017-05-11 09:47:37 +02:00
Mark
04611b06af
Fix two spelling errors
...
TRI-1450
2017-05-10 20:14:03 +02:00
fieldOfView
93c5b382ba
Fix selecting settings for Per Model Settings with single extrusion printers
2017-05-10 17:37:35 +02:00
Ghostkeeper
e187b96455
Add period after sentence
...
Contributes to issue CURA-3742.
2017-05-10 17:15:47 +02:00
Tim Kuipers
4abcc8b3f1
JSON fix: magic_spiralize had child setting (CURA-3771)
...
it shouldn't have a child setting because that child is not the underlying setting used by the engine.
Parent settings are frontend-only settings which are merely used to let the user edit multiple leaf settings at once.
2017-05-10 16:31:53 +02:00
Jaime van Kessel
2b1ca54227
Reset all first start actions for UM2go
...
CURA-3742
2017-05-10 16:28:34 +02:00
Jaime van Kessel
9e58829aba
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-10 16:25:45 +02:00
Jaime van Kessel
fd340a1270
Empty containers now also trigger extruder model update
2017-05-10 16:25:23 +02:00
Jack Ha
79561f44b1
Fix project load, new non existing machine. CURA-3756
2017-05-10 16:16:57 +02:00
Jaime van Kessel
27d6bebf32
Adding a new printer now activates it again
...
CURA-3783
2017-05-10 16:12:01 +02:00
Jack Ha
502b6b6f08
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-10 15:37:31 +02:00
Jack Ha
d9f0e1fd4b
WIP project loading - at least it mostly works again. CURA-3756
2017-05-10 15:37:22 +02:00
Ghostkeeper
d18e96972e
Rename TPU Normal Print to TPU Draft Print
...
The profile name is 'Draft' so this makes it easier to find. This also makes it consistent with the rest of the profile file names. It's good to do this before we need to make a version upgrade for it.
2017-05-10 15:28:19 +02:00
Ghostkeeper
69eb981259
Remove nozzle offsets from printer definition
...
This setting is only defined in fdmextruder, so it can't be used here.
2017-05-10 14:02:38 +02:00
Jaime van Kessel
51c08d4f53
Merge branch 'feature_extra_gradual_infill_icon' of github.com:Ultimaker/Cura
2017-05-10 14:00:15 +02:00
Ghostkeeper
9bb6aadc66
Remove non-existing nozzle offset settings
...
They seem to be auto-generated or some sort.
2017-05-10 13:59:02 +02:00
Jaime van Kessel
bfb76540d0
InstanceContainerchanged is now also on a timer.
...
This greatly reduces the signal storm resulting from changing quality / material in multi extrusion machines.
CURA-3780
2017-05-10 13:22:34 +02:00
Jaime van Kessel
7a4ca25193
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-10 13:17:15 +02:00
Jaime van Kessel
e313794b12
Fixed posponing of certain events
...
CURA-3780
2017-05-10 13:16:49 +02:00
Lipu Fei
77864f4237
WIP: Fix definition_changes handling in 3mf reader
...
CURA-3756
2017-05-10 13:07:45 +02:00
Lipu Fei
577fc0f082
Fix WorkspaceDialog to include resolve for definition_changes
...
CURA-3756
2017-05-10 13:07:45 +02:00
