Tim Kuipers
0d9514a5d0
Merge pull request #1821 from smartavionics/mb-smooth-spiralized-contours-not-per-model-or-extruder
...
Just like magic_spiralize, smooth_spiralized_contours should not be settable per model/extruder. (CURA-3771)
2017-05-12 14:53:18 +02:00
Ghostkeeper
9820dac4a6
Actually use setting_version to get the setting version number
...
This was sort of hidden because we've always incremented the normal version number up until now.
Contributes to issue CURA-3427.
2017-05-12 14:51:44 +02:00
Ghostkeeper
20e9d19587
Update tests to account for new way of getting version numbers
...
The normal version number is multiplied by a million. Currently these tests fail, so nice to have them.
Contributes to issue CURA-3427.
2017-05-12 14:50:43 +02:00
Ghostkeeper
5bc613c3e0
Don't use string for default version
...
No need to go via string and cast that to int, just return int directly.
Contributes to issue CURA-3427.
2017-05-12 14:44:46 +02:00
Ghostkeeper
ebd730a68d
Also add setting_version to fdmextruder
...
Since it obviously doesn't inherit from fdmprinter.
Contributes to issue CURA-3427.
2017-05-12 14:43:05 +02:00
Jaime van Kessel
c1903dcccb
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-12 14:35:07 +02:00
Jaime van Kessel
167f616a7c
Decreased interval of extruder timer
2017-05-12 14:34:45 +02:00
Lipu Fei
fe11819ce9
Handle "new" resolve strategy for definition&quality changes
...
CURA-3756
2017-05-12 14:34:41 +02:00
Lipu Fei
9ea0f48341
Check definition changes conflicts in preRead()
...
CURA-3756
2017-05-12 14:34:41 +02:00
Ghostkeeper
a472fd8163
Remove debug print
...
Oops again.
Contributes to issue CURA-3427.
2017-05-12 14:33:44 +02:00
Ghostkeeper
1e4c394b71
Remove getting superfluous material density
...
The density is already put in the 'properties' metadata entry. Don't need to put it in there doubly. Turns out that this density line was originally just superfluous.
Contributes to issue CURA-3427 or something.
2017-05-12 14:12:36 +02:00
Ghostkeeper
98662bc6f6
Also update import to renamed package
...
Oops.
Contributes to issue CURA-3427.
2017-05-12 14:07:21 +02:00
Ghostkeeper
c8295434f3
Load setting_version from XML material profile
...
The setting_version is translated from the version number. The setting_version number currently happens to be the same as the version number of XML but that won't always be the case so we introduce a translation-step as well.
Contributes to issue CURA-3427.
2017-05-12 14:04:56 +02:00
Ghostkeeper
38f081539a
Fix deserialising density
...
That density variable was never used. Hope this fixes some unaccounted-for bug.
Doesn't contribute to CURA-3427 but I'm listing it as if it does anyway.
2017-05-12 14:01:06 +02:00
Jaime van Kessel
ef2aa3b2b2
Empty InstanceContainers are now correctly handled by setActiveMaterial again
...
CURA-3789
2017-05-12 13:59:31 +02:00
Ghostkeeper
f0f8871496
Add setting_version to all profiles
...
This represents the data version number (as opposed to the format version).
Contributes to issue CURA-3427.
2017-05-12 13:40:54 +02:00
Mark
f60765c56c
Fix workspace dialog layout so checkbox and buttons dont get hidden
2017-05-12 13:24:58 +02:00
Mark
67aa6767c5
Add .DS_Store and *.qmlc
2017-05-12 13:23:29 +02:00
Ghostkeeper
0f5814e52f
Add setting_version and check against it
...
This breaks all profiles since they have the wrong setting version, of course. Have to change that in every instance container now...
Contributes to issue CURA-3427.
2017-05-12 12:58:15 +02:00
Ghostkeeper
6fd3bc4ba4
Merge branch 'smartavionics-mb-smooth-spiralized-contours-not-per-model-or-extruder'
2017-05-12 11:57:19 +02:00
Ghostkeeper
dab50f04b8
Merge branch 'mb-smooth-spiralized-contours-not-per-model-or-extruder' of https://github.com/smartavionics/Cura into smartavionics-mb-smooth-spiralized-contours-not-per-model-or-extruder
2017-05-12 11:56:52 +02:00
Jaime van Kessel
502e977c24
UM2E now has olson block upgrade selection as machine action
...
CURA-3742
2017-05-12 10:27:13 +02:00
Jaime van Kessel
9e56301048
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-12 10:24:58 +02:00
Jaime van Kessel
7508a0a981
Changed infill buttons so they work with all languages
...
CURA-3634
2017-05-12 10:24:15 +02:00
Mark Burton
bf80e6efd5
Just like magic_spiralize, smooth_spiralized_contours should not be settable per model/extruder.
2017-05-12 09:10:21 +01:00
Ghostkeeper
31684da9a6
Add Gradual Infill Steps to default advanced settings
...
It's visible by default now.
Contributes to issue CURA-3732.
2017-05-12 10:01:29 +02:00
Ghostkeeper
396f4381dd
Resolve bed adhesion type via limit-to-extruder
...
The cause for this change is that TPU says we want to print with brim but CPE wants to print with raft. In those cases the resolve function would choose the raft because that's safer. However if the default extruder happens to be the TPU one you then get a raft made of TPU which is flexible. That defeats the purpose of the raft, and causes the raft to warp, clog on the nozzle, destroy the world, etc. So there, I saved the world once more.
2017-05-12 10:00:24 +02:00
Ghostkeeper
9de041ade5
Remove theme font from system-themed dialogue
...
See commit 36dedabd11a36bd40669fbcf3b0e1f820c47acf1.
2017-05-12 09:45:53 +02:00
Tim Kuipers
dadb592328
JSON feat: mold roof height (CURA-3797)
2017-05-11 21:26:15 +02:00
fieldOfView
a727e4ffd0
Make sure all materials are shown
...
Without this workaround, some materials that are listed above the generic materials do not show up untill the user scrolls the scrollview.
2017-05-11 18:17:11 +02:00
Arjen Hiemstra
434aaed767
Remove extruderValue call from raft setting
...
Contiributes to CURA-3738
2017-05-11 17:56:31 +02:00
Arjen Hiemstra
94881f59f5
Remove most of the "extruderValue" calls from fdmprinter support settings
...
Since limit_to_extruder is now handled by the stacks themselves, we no
longer need to account for it in the definition.
Contributes to CURA-3738
2017-05-11 17:51:10 +02:00
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
