Commit graph

8977 commits

Author SHA1 Message Date
CRojasV
bd41655772 Delete makeR_prusa_tairona_i3_platform.stl
Delete file in wrong path
2017-04-11 15:22:52 -05:00
CRojasV
e70409a897 Delete makeR_pegasus_platform.stl
Delete file in wrong path
2017-04-11 15:22:09 -05:00
CRojasV
620b9a2516 Add files via upload
Adding Platforms for our 3d printers
2017-04-11 15:18:29 -05:00
Arjen Hiemstra
b9dc94e1f6 Override getProperty in ExtruderStack with some additional checks 2017-04-11 17:45:23 +02:00
Jaime van Kessel
f56dc3d09e Fixed copying for Linux
CURA-3529
2017-04-11 17:01:16 +02:00
Arjen Hiemstra
93e42164a8 Make value unit tests also provide a "state" property
Since we now use state to determine whether we should perform resolve or
not.
2017-04-11 13:56:40 +02:00
Arjen Hiemstra
323107ef5c Fix GlobalStack::getProperty
It used to only consider user values in the "user" containers, now it
also accounts for values in the other instance containers.
2017-04-11 13:51:01 +02:00
fieldOfView
f15345a0cb Restore material on global stack when switching back to single extrusion
MachineManager._onGlobalContainerChanged removes the global material of multiextruder machines
2017-04-11 12:18:33 +02:00
Ghostkeeper
70dc9fd95b
Document why we skip this test for now
Contributes to issue CURA-3497.
2017-04-11 10:42:17 +02:00
Ghostkeeper
1c2ce5b8b1
Remove old getPropertyWithResolve test
It has been replaced by several separate tests right above it.

Contributes to issue CURA-3497.
2017-04-11 10:42:17 +02:00
Ghostkeeper
86b288cc6e
Add test for when instances have value and definition has resolve
The value of the instances should always get evaluated first.

Contributes to issue CURA-3497.
2017-04-11 10:42:17 +02:00
Ghostkeeper
759da2ab05
Add test for value winning over resolve in instances
In instance containers, if there's both a resolve and a value, it should take the value.

Contributes to issue CURA-3497.
2017-04-11 10:42:17 +02:00
Ghostkeeper
0a7bcc4277
Add test for when there's no resolve in definitions
It must not attempt to execute a resolve function then.

Contributes to issue CURA-3497.
2017-04-11 10:42:17 +02:00
Ghostkeeper
12d1db8f19
Add test for whether resolve wins in definition
I'm splitting the test below up into pieces. It'll be removed eventually, when I've made all of these separate tests.

Contributes to issue CURA-3497.
2017-04-11 10:42:17 +02:00
Jack Ha
2b8e6eb5c8 Merge branch 'feature_peopoly_moai' 2017-04-11 10:35:48 +02:00
Jack Ha
4c1199d75c Revert permissions on file. CURA-3665 2017-04-11 10:35:25 +02:00
Jack Ha
24211624e6 Added inherits fdmprinter for Peopoly Moai. CURA-3665 2017-04-11 10:34:52 +02:00
Lipu Fei
20f28b3fa2 Set dir names in config to allow UM detect old cura dir
CURA-3529
2017-04-11 09:18:19 +02:00
Elijah Snyder
b4f6ae8c5f First refactor for section to increase verbosity and move all translated M105s. 2017-04-10 19:01:59 -05:00
fieldOfView
31ecb30c03 Allow setting the nozzle size through the extruder definition 2017-04-10 22:30:43 +02:00
fieldOfView
6dd642469a Set value before activating another extruder
Because all extruder tabs share the same SettingPropertyProvider, we want the property provider value to update before its container stack is changed, or the value carries over to the other containerstack, leaving the value for the initial containerstack unchanged
2017-04-10 20:37:41 +02:00
fieldOfView
df7f039826 Store extruder settings in definition_changes containers 2017-04-10 18:26:10 +02:00
Arjen Hiemstra
73e1af49ee Track which settings we are trying to "resolve"
This prevents infinite recursions when a resolve function tries to get
its own value.
2017-04-10 18:06:24 +02:00
Arjen Hiemstra
09e5765f22 Do not try to validate against machine_extruder_count when there is no machine_extruder_count 2017-04-10 18:06:24 +02:00
Arjen Hiemstra
73779eef25 Properly set the ContainerRegistry for the missing container test 2017-04-10 18:06:24 +02:00
fieldOfView
499971d55c Fix loading values on 1st extruder tab 2017-04-10 17:24:02 +02:00
Ghostkeeper
dfd8cfb2b8
Skip test_deserializeMoveDefinitionContainer
This test is currently failing because of a weird hack we're doing to get around a Uranium bug: We're searching only through definitions that have a category, any category. This is done because Uranium requires a search to have some metadata entry to search on. We'll have to refactor that eventually but for now that is out of scope.

Contributes to issue CURA-3497.
2017-04-10 17:17:13 +02:00
Ghostkeeper
71aca6aa4b
Remove old deserialize tests
Most of these tests also tested the Uranium code, which it should mock out. The last test, test_deserializeMissingContainer, is caught by the currently existing tests.

Contributes to issue CURA-3497.
2017-04-10 17:14:50 +02:00
Ghostkeeper
f12ffad2c1
Add test for moving definition containers
When a definition container is in the wrong spot in a stack file it needs to be moved to the definition slot.

Contributes to issue CURA-3497.
2017-04-10 17:12:27 +02:00
Ghostkeeper
e807739117
Add test for moving containers through deserialising
When a container in the stack file is located in the wrong spot, it needs to move the container to the correct spot.

Contributes to issue CURA-3497.
2017-04-10 17:08:23 +02:00
Jack Ha
e3f7c4ec8a Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-10 16:58:14 +02:00
Ghostkeeper
f27e7fca88
Document test_deserializeWrongDefinitionClass
Contributes to issue CURA-3497.
2017-04-10 16:46:47 +02:00
Ghostkeeper
5e9695773a
Add test for instance containers on definition spot
When deserialize finds an instance container in the definition spot and no other container to replace it with, it should raise an exception because stacks must have a definition.

Contributes to issue CURA-3497.
2017-04-10 16:45:42 +02:00
Ghostkeeper
00412e905f
Add test for removing definitions from instance locations
When deserialize finds a definition in an instance container spot it should replace it with an empty container.

Contributes to issue CURA-3497.
2017-04-10 16:43:51 +02:00
Ghostkeeper
a955c3dfdd
Add test for removing invalid instance containers from serialisation
If deserialize finds a container that has the wrong type it should replace it with an empty container.

Contributes to issue CURA-3497.
2017-04-10 16:41:05 +02:00
Ghostkeeper
64ce8c0bb1
Add test for whether an empty stack deserialises to proper size
It must be padded with empty containers. The test currently fails, and we concluded that we won't fix it as part of this refactor. We'll refactor this later and put it on skip until then to indicate a todo.

Contributes to issue CURA-3497.
2017-04-10 16:39:46 +02:00
fieldOfView
c89669e73e Layout & code style: move unit into numeric textfield component 2017-04-10 16:22:20 +02:00
Jack Ha
c989496a13 Fix load (3mf) groups. Also add convex hull decorator to children of node. CURA-3671 2017-04-10 16:11:42 +02:00
fieldOfView
f064500ed5 Don't inherit from Ultimaker printers 2017-04-10 14:59:11 +02:00
Jaime van Kessel
bc78bf94ab Fixed buttons not visible on my screen
CURA-3642
2017-04-10 14:06:10 +02:00
Jaime van Kessel
303a320c4e Merge branch 'bugfix_CURA-3642_dpi_ask_project_dialog' of github.com:Ultimaker/Cura 2017-04-10 13:49:09 +02:00
fieldOfView
7bad718823 Don't update the global container stack unnecessarily 2017-04-10 13:36:16 +02:00
Jaime van Kessel
d02aa7f6a3 Fixed order of close & disconnect
This would cause the state change caused by close to not be sent to the printer. Fixes CURA-3668
2017-04-10 13:32:37 +02:00
Ghostkeeper
069235f9e0
Split test_constrainContainerTypes into multiple tests
This way the first assertion won't cause all of these tests to break if multiple are failing. It also removes the need for any state to be saved between these tests which is bad practice, and it adds a few tests for the unhappy path.

Contributes to issue CURA-3497.
2017-04-10 13:23:11 +02:00
Jaime van Kessel
f5785662f2 Fixed another broken logging 2017-04-10 13:19:05 +02:00
Jaime van Kessel
abe70c3a92 Fixed broken logging 2017-04-10 13:12:14 +02:00
Ghostkeeper
2cdb6c5f6f
Split test_constrainContainerTypes into separate tests
Firstly, it'll no longer break on the first assert if multiple things are wrong. Secondly, it can now set different types for each container and put it in the correct slot then.

Contributes to issue CURA-3497.
2017-04-10 12:54:35 +02:00
Ghostkeeper
07d64f2335
Report the type that was found when replacing containers
Makes it easier to debug.

Contributes to issue CURA-3497.
2017-04-10 11:18:02 +02:00
Jack Ha
3263ca4e2d Revert file permissions. CURA-3670 2017-04-10 11:17:44 +02:00
Jack Ha
3d8e94964b Fixed one_at_a_time and arranger. CURA-3670 2017-04-10 11:16:34 +02:00