3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
7464 commits 307 branches 272 tags 787 MiB
Commit graph

7464 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arjen Hiemstra
f97a6ebd74 Move exceptions to their own file 
Since that keeps the GlobalStack cleaner

Contributes to CURA-3497
 2017-03-23 17:55:21 +01:00
Ghostkeeper
a95404f72f
Add test for missing containers in container stack 
This seems to give a different exception than intended at the moment.

Contributes to issue CURA-3497.
 2017-03-23 17:31:21 +01:00
Ghostkeeper
f579b5f304
Clean up temporary files after test 
If the test fails to remove the temporary file, this cleans up after it.

Contributes to issue CURA-3497.
 2017-03-23 17:22:10 +01:00
Ghostkeeper
9ce621a02d
Restore the original container registry after each test 
A bit of code duplication, but I don't see how to reduce this at the moment.

Contributes to issue CURA-3497.
 2017-03-23 17:17:43 +01:00
Ghostkeeper
b18c72bbbf
Remove unused import 
This was replaced with mocks, if I recall correctly.

Contributes to issue CURA-3497.
 2017-03-23 16:48:38 +01:00
Ghostkeeper
053974bc96
Add test to see if legacy files are renamed 
The test seems to fail at the moment. No new file is created.

Contributes to issue CURA-3497.
 2017-03-23 16:47:37 +01:00
Ghostkeeper
e521f6b38d
Remove unnecessary findContainer replacement 
By default the patch context returns mock objects anyway, so no need to actually make a function that does that.

Contributes to issue CURA-3497.
 2017-03-23 16:35:11 +01:00
Ghostkeeper
96c7a4ed77
Remove unused variable 
This was changed earlier that it doesn't return the same mock every time but creates a new mock in findContainer. So the single mock that used to be returned every time is no longer needed.

Contributes to issue CURA-3497.
 2017-03-23 16:16:32 +01:00
Ghostkeeper
91192b702e
Use a global stack from a fixture 
Removes a bit of duplicate code.

Contributes to issue CURA-3497.
 2017-03-23 16:12:28 +01:00
Ghostkeeper
bf2050479b
Add tests for hasUserValue 
These fail at the moment because they also depend on being able to change the stack, which isn't implemented yet.

Contributes to issue CURA-3497.
 2017-03-23 16:09:03 +01:00
Ghostkeeper
8a3ab6d289
Fix testing ID of mock-definitions 
This isn't the best solution because all definitions now have to get the ID 'some_definition', but it's the best that I could come up with so far.

Contributes to issue CURA-3497.
 2017-03-23 15:46:11 +01:00
Ghostkeeper
610d2ae1e6
Fix assertion for test_deserializeDefinitionChanges 
Copy-paste error there. Sorry.

Contributes to issue CURA-3497.
 2017-03-23 15:41:25 +01:00
Ghostkeeper
521e85b2a7
Add test for deserializing stacks with definitions in them 
This tests whether the definition is properly found.

Contributes to issue CURA-3497.
 2017-03-23 15:40:44 +01:00
Ghostkeeper
91f51d11cd
Fix ID and name of only-variant stack 
This makes it consistent with the file name and such.

Contributes to issue CURA-3497.
 2017-03-23 15:32:27 +01:00
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