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
Ghostkeeper
cb7c25f92f
Merge branch 'master' into feature_support_top_bottom_speed
2017-04-10 10:52:31 +02:00
fieldOfView
064f744bc0
Make sure we're not trying to get/set extruder values on machine stacks
2017-04-09 20:09:05 +02:00
Tim Kuipers
30ede0736a
JSON: move infill_mesh_order to right under infill_mesh (CURA-966)
2017-04-08 12:49:32 +02:00
Tim Kuipers
4c6f9486be
feat: cutting mesh (CURA-966)
2017-04-08 12:49:00 +02:00
Ghostkeeper
d74aa4d24e
Don't get with default from dictionary using named parameters
...
That doesn't work for some reason.
Contributes to issue CURA-3497.
2017-04-07 17:02:00 +02:00
Ghostkeeper
16b3c78667
Guard against type checking of DefinitionContainer
...
Otherwise it finds that we're trying to set a MagicMock into the definition slot.
Contributes to issue CURA-3497.
2017-04-07 16:58:47 +02:00
Ghostkeeper
7158ebdaea
Guard against type checking when replacing definition container
...
Otherwise it finds that this is not a definition container we're replacing the definition with.
Contributes to issue CURA-3497.
2017-04-07 16:54:21 +02:00
Jaime van Kessel
c94b05e0f4
Minor refactor
2017-04-07 16:52:19 +02:00
Jaime van Kessel
670de52ec9
Minor refactor; renamed start_priority to last_priority
2017-04-07 16:45:59 +02:00
Ghostkeeper
d5df226024
Cache the indexes class
...
This improves readability a bit.
Contributes to issue CURA-3497.
2017-04-07 16:45:10 +02:00
Ghostkeeper
f4fcb50a4f
Fix container types of mock containers in fallthrough
...
It needs to create a container of each type or else setting the container will raise alarm.
Contributes to issue CURA-3497.
2017-04-07 16:41:02 +02:00
Jaime van Kessel
e26ade0e6f
Multiplying now also gives a message if it could not find a suitable spot for some objects
2017-04-07 16:40:39 +02:00
Jaime van Kessel
f9fbd8c02e
Only push free nodes inside buildplate
2017-04-07 16:22:44 +02:00
Jaime van Kessel
f42efcb7e0
Removed count from findNodePlacement
...
CURA-3239
2017-04-07 16:16:38 +02:00
Jaime van Kessel
04eca9073a
Moved multiply objects to job
...
CURA=3239
2017-04-07 16:11:23 +02:00
Jaime van Kessel
b2183352b8
Added message if arrange all could not find location for all objects
...
CURA-3239
2017-04-07 15:19:30 +02:00
Jaime van Kessel
2008383118
Added disallowed areas to arranger
...
CURA-3239
2017-04-07 15:14:27 +02:00
Ghostkeeper
4dfc86d5bb
Remove unused import
...
Contributes to issue CURA-3497.
2017-04-07 14:59:04 +02:00
Ghostkeeper
e71af663c3
Make getEmptyInstanceContainer return a container with ID 'empty'
...
This is checked in the test. Otherwise it would return magic mocks.
Contributes to issue CURA-3497.
2017-04-07 14:41:29 +02:00
Ghostkeeper
7ce89f5d80
Simplify defaults for container IDs in fixtures
...
Contributes to issue CURA-3497.
2017-04-07 14:02:39 +02:00
Ghostkeeper
46f3b5bd97
Use yield_fixture for fixtures with teardown
...
Otherwise it'll complain that it can't use yield.
Contributes to issue CURA-3497.
2017-04-07 13:13:12 +02:00
MaukCC
39befe1c22
Update cartesio.def.json
2017-04-07 13:06:14 +02:00
MaukCC
eb72d15eb6
Update cartesio_extruder_3.def.json
2017-04-07 13:03:32 +02:00
MaukCC
892f0b4bfe
Update cartesio_extruder_2.def.json
2017-04-07 13:03:24 +02:00
MaukCC
9097dd6955
Update cartesio_extruder_1.def.json
2017-04-07 13:03:15 +02:00
MaukCC
05808fb0db
Update cartesio_extruder_0.def.json
2017-04-07 13:03:05 +02:00
MaukCC
e1fd7a5918
Update cartesio_extruder_0.def.json
2017-04-07 13:00:21 +02:00
MaukCC
074bae1ed8
Update cartesio_extruder_3.def.json
2017-04-07 13:00:11 +02:00
MaukCC
4b1fbebfd1
Update cartesio_extruder_2.def.json
2017-04-07 12:59:58 +02:00
MaukCC
2d72d52ee3
Update cartesio_extruder_1.def.json
2017-04-07 12:59:43 +02:00
fieldOfView
5b37353b08
Fix stuck extruder tabs when switching number of extruders
2017-04-07 11:55:07 +02:00
Jaime van Kessel
552b1ed4e8
Merge branch 'master' of github.com:Ultimaker/Cura
2017-04-07 11:03:19 +02:00
Jaime van Kessel
ffa0e3e5e2
CuraApplication now also registers object defined by QTApplication
...
CURA-3633
2017-04-07 11:02:53 +02:00
Ghostkeeper
5a39ed6793
Merge branch 'maukcc-master'
2017-04-07 10:09:53 +02:00
Ghostkeeper
0fe1b54588
Merge branch 'cura_containerstack' of github.com:Ultimaker/Cura into cura_containerstack
2017-04-07 09:31:17 +02:00
fieldOfView
7bc28a7e48
Make sure a valid stack is activated after changing the number of extruders
2017-04-06 21:02:33 +02:00
Tim Kuipers
7eba776067
Merge pull request #1661 from Ultimaker/revert-1660-make-spiralize-setting-global
...
Revert "The magic_spiralize setting is no longer settable per mesh (or extruder)."
2017-04-06 17:55:18 +02:00
Tim Kuipers
3b9e14eeec
Revert "The magic_spiralize setting is no longer settable per mesh (or extruder)."
2017-04-06 17:54:19 +02:00
