Lipu Fei
a0f841e8eb
Prevent MachineSettings dialog go beyond the top of screen
2017-03-23 13:46:01 +01:00
Lipu Fei
96e9780273
Fix typo in changelog 2.5.0
2017-03-23 08:53:57 +01:00
Lipu Fei
08f6ee319e
Use default font for open file dialog text
...
CURA-3495
2017-03-23 08:46:48 +01:00
Lipu Fei
ef0a502dcf
Add { } around statements in "if"
...
Make nitpicking people happy :P
2017-03-22 21:05:45 +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
Lipu Fei
fa7dc3a708
Use onActivated for profile override combobox
2017-03-22 16:01:50 +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
Lipu Fei
e35d276e25
Complete Changelog for 2.5.0
...
CURA-3467
2017-03-22 15:20:57 +01:00
Ghostkeeper
c5768d89dc
Remove debug print
...
Contributes to issue CURA-3497.
2017-03-22 15:12:46 +01:00
Jack Ha
33d16f8601
Added Not Supported profiles when second extruder is a 0.8 nozzle. CURA-3555
2017-03-22 14:51:53 +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
Jack Ha
bd10e50249
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-22 13:24:37 +01:00
Jack Ha
4eff58995d
Merge branch '2.5'
2017-03-22 13:24:32 +01:00
Jack Ha
79ea09d616
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-22 13:24:21 +01:00
Jack Ha
6dcd4d13e4
Removed quality profile aa0.8 PLA Not Supported. CURA-3555
2017-03-22 13:24:13 +01:00
Lipu Fei
f9e377ec43
Enable/disable Keep/Discard buttons according to selection
2017-03-22 13:07:58 +01:00
Lipu Fei
12918b02b5
CTRL-P only works when the button is enabled
...
CURA-3496
2017-03-22 12:01:41 +01:00
Jaime van Kessel
94c6b23418
Codestyle & removal unused imports
2017-03-22 11:38:55 +01:00
Jaime van Kessel
808df4c228
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-22 11:03:27 +01:00
Lipu Fei
c6df3adddb
Update 2.5.0 BETA ChangeLog
...
CURA-3467
2017-03-22 10:26:01 +01:00
MaukCC
83f5619be0
Update cartesio.def.json
2017-03-22 09:45:41 +01:00
MaukCC
4e698cb685
Update cartesio.def.json
2017-03-22 09:45:23 +01:00
Jack Ha
72db7772f5
Merge branch '2.5'
2017-03-22 09:44:47 +01:00
Jack Ha
3d6e378289
Revert accidently added test-code.
2017-03-22 09:44:21 +01:00
Jack Ha
8275c419c1
Merge branch '2.5'
2017-03-22 09:34:06 +01:00
Jack Ha
40a7d2fecc
Added not supported quality profiles. CURA-3555
2017-03-22 09:33:17 +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
Jaime van Kessel
f379791d70
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-21 14:43:58 +01:00
Jaime van Kessel
0752c4440c
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-21 14:43:30 +01:00
Jaime van Kessel
5489fc8caf
Added number of missing quality profiles
...
CURA-3555
2017-03-21 14:43:01 +01:00
Jack Ha
f2eebc165f
Merge branch '2.5'
2017-03-21 14:37:42 +01:00
jack
af43b2e8c4
Merge pull request #1554 from LipuFei/feature_CURA-3495_open_in_one
...
CURA-3495 Open project/models menu
2017-03-21 14:32:53 +01:00
jack
6d1a99ff33
Merge pull request #1556 from Ultimaker/feature_more_spacing_override_profile_combobox
...
Add more spacing between the label and combobox for override profile option
2017-03-21 14:12:40 +01:00
