fieldOfView
49f2fb2cea
Fix filtering maerials after editing materials
...
NB: previously the "approximate_diameter" metadata was stored as a number. This caused some issues passing arguments from QML to Python. Now "approximate_diameter" is stored as a string.
2017-06-14 10:42:04 +02:00
fieldOfView
a7cdf49018
Fix setting metadata on fdmmaterial containers
2017-06-14 10:41:12 +02:00
fieldOfView
5550fe0da8
Fix confusion around the use of the word "global"
2017-06-14 10:40:52 +02:00
fieldOfView
944318d44a
Fix loading material diameter and GUID from XML file
2017-06-14 10:40:43 +02:00
Mark
8ab5c7e4cd
Merge pull request #1910 from Ultimaker/fix_dialog_sizes
...
Fix dialog sizes.
Tested on different OSes and screens, all looked good.
2017-06-13 13:14:44 +02:00
Jaime van Kessel
b18b1d3cd0
Only disable timer of backend if it's initialised
...
Fixes #1939
2017-06-06 15:42:49 +02:00
Ghostkeeper
654b9cfa1c
Fix global container stack variable
...
The definition changes are only on the global container stack. That's the one that was meant here.
Contributes to issue CURA-3875.
2017-05-31 17:17:11 +02:00
fieldOfView
163707df01
Fix definition changes for UMO upgrade options
2017-05-31 17:03:42 +02:00
Tim Kuipers
3b62c4a59a
fix: changelog attribution to community members (CURA-3879)
2017-05-29 16:31:11 +02:00
Tim Kuipers
b01f1bdbb3
feat: 2.6 beta changelog (CURA-3879)
2017-05-29 16:27:09 +02:00
Lipu Fei
8ede981a2c
Set version in <fdmmaterial> when saving XML material files
...
CURA-3884
2017-05-29 14:19:52 +02:00
Ghostkeeper
ce6814d45d
Add default for colour code of material
...
Otherwise you get an error that the colour code could not be found.
Fixes #1869 .
2017-05-24 15:20:59 +02:00
Jaime van Kessel
e6f61f3bbc
When trying to convert None to RGBA, log it and return a usable default
...
contributes to #1869
2017-05-24 11:38:38 +02:00
Lipu Fei
9a08e0cc27
Only use <fdmmaterial version> for detecting material file version
...
CURA-3540
2017-05-23 11:51:31 +02:00
Jaime van Kessel
cc3402ab81
Added RunTime exception catching for image_reply
...
In some cases the c++ object is already deleted. If we just ignore it, nothing breaks.
CURA-3844
2017-05-22 14:50:03 +02:00
Jaime van Kessel
4b826b747b
Added exception handling to XML parsing
...
CURA-3843
2017-05-19 13:54:31 +02:00
Jaime van Kessel
75b3f08318
Removed unneeded logging
...
THis caused a massive logging spam
2017-05-19 13:09:41 +02:00
Ghostkeeper
bd361e500c
Don't keep a copy of currently connected printer
...
This QML file was holding a copy of the currently connected printer, stored in connectingToPrinter. This copy got out of sync when you load a project file which had a different connected printer. Instead, ask the manager for the currently connected printer key every time you click the button.
Contributes to issue CURA-3839.
2017-05-19 12:30:17 +02:00
Lipu Fei
5a6049ddea
Change XmlMaterialUpgrader to use UNIX EOLs
...
CURA-3756
2017-05-19 11:06:01 +02:00
Lipu Fei
7089460861
Minor refactoring for XMLMaterial upgrade
...
CURA-3756
2017-05-19 11:05:16 +02:00
Jaime van Kessel
c43a71084c
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-19 10:40:09 +02:00
Jaime van Kessel
475455d473
Definition changes are now also upgraded
...
CURA-3837
2017-05-19 10:39:37 +02:00
Lipu Fei
593697e0ed
Fix XML material upgrade
...
CURA-3756
2017-05-19 10:18:13 +02:00
Jaime van Kessel
f2f83750c2
Type is now always added when deserializing profiles to g-code
...
CURA-3829
2017-05-18 16:42:11 +02:00
Lipu Fei
870d6fe76a
Use position number to get extruders for overriding in project loading
...
CURA-3756
2017-05-18 14:34:37 +02:00
Lipu Fei
cbdddd0b16
Ignore "quality" and "variant" containers in project loading
...
CURA-3756
2017-05-18 10:28:02 +02:00
Lipu Fei
18dd8dc6cc
Simplify ExtruderStack override code in project loading
...
CURA-3756
2017-05-17 17:10:55 +02:00
Lipu Fei
e1455a4551
Fix deserializing ExtruderStacks in project loading
...
CURA-3756
2017-05-17 15:57:13 +02:00
Ghostkeeper
937207a0eb
Merge branch 'fix_machinesettings_negative_offsets' of https://github.com/fieldOfView/Cura into fieldOfView-fix_machinesettings_negative_offsets
2017-05-17 15:42:43 +02:00
Lipu Fei
d02d004986
Correct profile_translations in VersionUpgrade21to22
...
CURA-3777
2017-05-17 13:44:34 +02:00
Lipu Fei
e2e208261e
Fix renaming quality_changes and definition containers in project loading
...
CURA-3756
2017-05-17 11:53:13 +02:00
Lipu Fei
a9ec3f2712
Add docs to project loading code
...
CURA-3756
2017-05-17 11:25:48 +02:00
Lipu Fei
8c2fe0951d
Refactor project loading
...
CURA-3756
2017-05-17 11:03:52 +02:00
Lipu Fei
ee831928ba
Fix overriding extruder stacks for project loading
...
CURA-3756
2017-05-17 10:20:14 +02:00
Lipu Fei
191dfdcb33
Save Cura version to project files
...
CURA-3822
2017-05-17 09:23:43 +02:00
Lipu Fei
40d70b5f39
Fix version upgrade for project loading
...
CURA-3756
2017-05-16 14:38:27 +02:00
fieldOfView
910811810b
Allow setting negative values on extruder offset x/y fields
2017-05-16 13:54:45 +02:00
Jaime van Kessel
e40f60a52b
Changed profile names
...
CURA-3777
2017-05-15 16:52:25 +02:00
Ghostkeeper
ccda155882
Add setting_version every time we create InstanceContainer
...
Except when we fill the instancecontainer via deserialising. Because then we want to retain the original version number.
Contributes to issue CURA-3427.
2017-05-15 10:39:53 +02:00
Ghostkeeper
c48017e174
Convert all metadata fields to string
...
The XML builder expects string, strictly. Only None is handled separately.
Contributes to issue CURA-3808.
2017-05-15 09:37:53 +02:00
Ghostkeeper
2365267f35
Be robust against older specification version numbers
...
1.2 and lower didn't specify a version number. Assume that it was 1.2. We feed this through our translation function for form, mostly, because we know that the setting_version should be 0 then.
Contributes to issue CURA-3427.
2017-05-12 17:20:49 +02:00
Ghostkeeper
365f7cad4c
Read setting_version from version attribute on root
...
As per the new specification for v1.3 of the spec.
Contributes to issue CURA-3427.
2017-05-12 17:20:49 +02:00
Lipu Fei
598751817a
Fix resolve strategy "new" for user instance container
...
CURA-3756
2017-05-12 16:52:37 +02:00
Ghostkeeper
0cc4f90920
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-12 16:34:19 +02:00
Lipu Fei
3996230ff9
Load GlobalStack before ExtruderStacks for project loading
...
CURA-3756
2017-05-12 15:52:16 +02:00
Ghostkeeper
adefbaf72e
Add more unhappy-path tests
...
One for the new setting_version. One for the misconception of version numbers being a major-minor version or something, because it's not stored that way.
Contributes to issue CURA-3427.
2017-05-12 15:01:27 +02:00
Ghostkeeper
04ef2bf1f0
Update setting_version tests
...
Included a bit of a more difficult case.
Contributes to issue CURA-3427.
2017-05-12 14:58:11 +02:00
Ghostkeeper
55b2392a1d
Load setting version from metadata
...
I'm not really awake today, am I? The functionality happened to still work because of how our real data is structured right now, but the tests still failed. Those are successful now.
Contributes to issue CURA-3427.
2017-05-12 14:55:19 +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
