7450 Commits

Author SHA1 Message Date
Ghostkeeper
15de1f235a
Add test for seeing whether definition changes are properly found
Whether the deserialize function finds the definition changes properly.

Contributes to issue CURA-3497.
2017-03-23 15:30:54 +01:00
Ghostkeeper
79f6e49280
Add test for seeing whether variants are properly found
Whether the deserialize function finds the variants properly.

Contributes to issue CURA-3497.
2017-03-23 15:21:57 +01:00
Ghostkeeper
95a377d54e
Add test for deserialising materials in stacks
Similar to the other tests, but this one is a bit special since the original test stacks had a material defined. Therefore it also defines a separate stack that only has a definition so that we can see if it's fine with the material being empty.

Contributes to issue CURA-3497.
2017-03-22 17:32:37 +01:00
Ghostkeeper
80329ad6e8
Fix test name
Oops. Copy-paste mistake.

Contributes to issue CURA-3497.
2017-03-22 17:26:37 +01:00
Ghostkeeper
66b5fe6702
Align test parameters for readability
Contributes to issue CURA-3497.
2017-03-22 17:25:22 +01:00
Ghostkeeper
eae6ad0e05
Add test to see whether quality profiles deserialise well
Works just the same as the quality-changes stuff.

Contributes to issue CURA-3497.
2017-03-22 17:24:21 +01:00
Ghostkeeper
ba43b835f4
Move reading the stack file to a separate function
That whole os.path stuff is a bit opaque. Now it's separated from the actual test.

Contributes to issue CURA-3497.
2017-03-22 17:10:04 +01:00
Ghostkeeper
09a3b90dcc
Add test for detecting quality changes
I should try to re-use a bit of code here because there's going to be a lot of these.

Contributes to issue CURA-3497.
2017-03-22 16:58:06 +01:00
Ghostkeeper
2eed596280
Align parameters better for overview
Contributes to issue CURA-3497.
2017-03-22 16:49:59 +01:00
Ghostkeeper
9d9832f8e2
Move findSomeContainers out to global function
This way we can re-use it for other tests.

Contributes to issue CURA-3497.
2017-03-22 16:48:58 +01:00
Ghostkeeper
c14b3e4f2b
Add test with complete stack
In this stack, all profiles are filled in properly with an instance container. This required some magic to make the container registry always return the desired profiles.

Contributes to issue CURA-3497.
2017-03-22 16:45:38 +01:00
Ghostkeeper
a2fe051c09
Allow all profiles as some_* to be instances
This allows us to differentiate between one container in the stack and the other.

Contributes to issue CURA-3497.
2017-03-22 15:58:28 +01:00
Ghostkeeper
ebd08ac994
Add test case where there is only a user changes profile
Specifically what this test requires.

Contributes to issue CURA-3497.
2017-03-22 15:54:32 +01:00
Ghostkeeper
60b6b72912
Rename some_material to some_instance
This way we can semantically use it in place of other instances on the stack as well without changing our test.

Contributes to issue CURA-3497.
2017-03-22 15:51:45 +01:00
Ghostkeeper
007f764471
Don't let a test remove files from hard disk
This test does not test the removing of these files. In general, to make a test run fast, it should not perform any disk operations.

Contributes to issue CURA-3497.
2017-03-22 15:47:15 +01:00
Ghostkeeper
49fad35d28
Add test for global stack getting user changes
Tests fail right now because running the test actually deletes files. Got to fix that.

Contributes to issue CURA-3497.
2017-03-22 15:40:13 +01:00
Ghostkeeper
c5768d89dc
Remove debug print
Contributes to issue CURA-3497.
2017-03-22 15:12:46 +01:00
Ghostkeeper
c91765c1ae
Add test for type of loaded container stacks
This tests if container stacks, when loading, get implemented with the correct class: Either an extruder stack or a global stack.

Contributes to issue CURA-3497.
2017-03-22 13:46:14 +01:00
Arjen Hiemstra
411e3a3976 Fix up a bunch of things with type hints and imports 2017-03-21 17:45:07 +01:00
Arjen Hiemstra
88e8138004 Override ContainerStack::deserialize
This ensures we have the right set of containers in the stack
2017-03-21 17:44:36 +01:00
Arjen Hiemstra
95a6bef50f Add properties for the individual containers in the global stack 2017-03-21 17:43:42 +01:00
Arjen Hiemstra
37b4326e99 Mark addContainer as override 2017-03-21 17:43:14 +01:00
Arjen Hiemstra
f32f8b60df Explictly import Extruder/Global stack
For some reason, things were not being imported properly. This fixes
that.
2017-03-21 17:42:57 +01:00
Arjen Hiemstra
3ee3e0aee3 Add a private class to GlobalStack that defines the expected indices of each container type 2017-03-21 17:39:06 +01:00
Arjen Hiemstra
4904e449a0 Start overriding getProperty in GlobalStack
Since we have the "resolve" property, we should transparently handle it
so lookup can just use "value".

Contributes to CURA-3497
2017-03-20 17:30:00 +01:00
Arjen Hiemstra
0656dd53c3 Override setNextStack in GlobalStack and raise an error if called
Since the global stack should never have a next stack

Contributes to CURA-3497
2017-03-20 17:28:42 +01:00
Arjen Hiemstra
b9f01b30c8 Convert generic "ContainerStack" to an Extruder or Global stack
Dependendant on the "type" metadata key, we create either an
ExtruderStack or a GlobalStack instance to replace the ContainerStack
instance. This should allow for transparent upgrades to the new classes.

Contributes to CURA-3497
2017-03-20 17:28:01 +01:00
Arjen Hiemstra
12c50dbac8 Introduce a GlobalStack class
This will allow us to codify some of the assumptions made about the
global stack

Contributes to CURA-3497
2017-03-20 17:26:12 +01:00
Arjen Hiemstra
3b0fdecb60 Introduce an ExtruderStack class
This will allow us to codify some of the assumptions made about
extruders.

Contributes to CURA-3497
2017-03-20 17:22:11 +01:00
Lipu Fei
892225d398 Move some code to OpenFilesIncludingProjectsDialog.qml
CURA-3495
2017-03-20 14:59:23 +01:00
Jack Ha
a56b7cd98d Merge branch '2.5' 2017-03-20 13:42:11 +01:00
Jack Ha
b21a87b25b Fix not slicing refreshing after deleting last object from loaded project file. CURA-3559 2017-03-20 13:41:47 +01:00
Jack Ha
ebf8782722 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-20 13:01:15 +01:00
Jack Ha
c1ca2ac09a Merge branch '2.5' 2017-03-20 12:56:35 +01:00
Lipu Fei
f259038954 Adjust open project/models dialog size for high DPI
CURA-3495
2017-03-20 11:37:04 +01:00
Lipu Fei
8d6ea7bb97 Adjust Discard/Keep Profile Dialog size for high DPI 2017-03-20 11:30:05 +01:00
jack
42e7a0defa Merge pull request #1535 from LipuFei/feature_CURA-3495_open_in_one
CURA-3495 Open project/models menu item
2017-03-20 10:59:40 +01:00
Thomas Karl Pietrowski
c75261a023 Removing multiple import
We only need to import UM.Platform once.
2017-03-18 09:57:09 +01:00
Tim Kuipers
35516ccc45 JSON fix: tetrehedral infill line distance was wrong (CURA-3474)
the infill line distance in the frontend is the average line distance, not the line distance between two lines which are equidistant
2017-03-17 15:05:01 +01:00
Lipu Fei
8e77d212f7 Remove "Save All" and add "Save As" MenuItem
CURA-3496
2017-03-17 14:31:22 +01:00
Jaime van Kessel
e620d8fd9a Added extra logging to authentication loading to indicate difference between no auth at all or (some) loaded auth 2017-03-17 10:30:04 +01:00
Jaime van Kessel
fe826d16b8 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-17 10:23:10 +01:00
Jaime van Kessel
296152ed33 Added extra logging when authentication gets removed for network printer 2017-03-17 10:22:41 +01:00
Jaime van Kessel
d52515d57d Added invert zoom preference option 2017-03-16 19:06:57 +01:00
Jack Ha
7604ae62f3 Merge branch '2.5' 2017-03-16 16:04:59 +01:00
Jack Ha
7d62a699fb Capitalize Not Supported. CURA-3390 2017-03-16 16:04:47 +01:00
Jack Ha
ff77571300 Merge branch '2.5' 2017-03-16 16:01:33 +01:00
Jack Ha
aa691033e0 Added Not Supported profiles for incompatible materials. CURA-3510 2017-03-16 16:01:18 +01:00
Jack Ha
6194ffa27b Removed comment. CURA-3390 2017-03-16 15:28:57 +01:00
Jack Ha
60c5112824 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-16 15:27:55 +01:00