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
Jack Ha
9b06983f3e
GCode reader: Better layerheight guess, refactoring, more robust, take extruder offset into account of multi extrusion. CURA-3390
2017-03-16 15:27:48 +01:00
Jaime van Kessel
f736e74f77
Moved setting of color for convex hull to constructor
...
This should result in less color changes so should make it slightly faster
CURA-3419
2017-03-16 15:08:06 +01:00
Jaime van Kessel
36b5c369cf
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-16 13:44:26 +01:00
Jaime van Kessel
de02d331c7
Selection tool operation stoped no longer triggers platform physics
...
CURA-3465
2017-03-16 13:42:29 +01:00
Lipu Fei
e00c68344a
CURA-3495 open project/models in one dialog
2017-03-16 13:37:06 +01:00
Lipu Fei
b35a97c770
CURA-3495 preRead() takes flexible arguments
2017-03-16 13:37:06 +01:00
Lipu Fei
ea16f967d7
Fix code styling
2017-03-16 13:37:06 +01:00
Jaime van Kessel
a7b5879263
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-16 13:18:41 +01:00
Jaime van Kessel
efce0696bd
Recently activated material can no longer be removed
...
CURA-3147
2017-03-16 13:11:51 +01:00
Jaime van Kessel
134425db90
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-16 11:27:54 +01:00
Jaime van Kessel
36bcd90e08
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-16 11:27:10 +01:00
Jaime van Kessel
a170624ff1
Disabled the 2.5 upgrader
2017-03-16 11:26:50 +01:00
Jaime van Kessel
1f734d5245
Disabled the start_layers_at_same_position setting
2017-03-16 11:21:08 +01:00
Jaime van Kessel
6da6ae1b9e
start_x and start_y are now settable per extruder
2017-03-16 11:19:44 +01:00
Jaime van Kessel
5bcfba0f17
Revert "removal: remove start_layers_at_same_position; it is now mandatory to start each layer near the given position (CURA-3339)"
...
This reverts commit 1482c27b21fb45819d2a400ede937662f34870ed.
2017-03-16 11:16:55 +01:00
Jaime van Kessel
ad7752bb16
Revert "Updated version of superdraft and verydraft. CURA-3479"
...
This reverts commit 62de4f9ec6d65c3224c57a9cfcb6b9ec888d6487.
2017-03-16 11:16:02 +01:00
Jaime van Kessel
0c1829af1e
Revert "Upgrade built-in instance containers"
...
This reverts commit b162be4df8c12c89112ba558136e87b63e67e713.
2017-03-16 11:15:20 +01:00
Jack Ha
260c6e983e
Fix passing PYTHONPATH to pytest on Windows
2017-03-16 10:51:53 +01:00
Arjen Hiemstra
0c215331ee
PYTHONPATH uses a platform dependent path separator after all
2017-03-15 19:02:37 +01:00
Arjen Hiemstra
04548d2862
Add Uranium's cmake dir to CMAKE_MODULE_PATH
...
This makes sure URANIUM_TRANSLATION_TOOLS can be found
2017-03-15 17:34:38 +01:00
Arjen Hiemstra
2620d7748e
Pass the right Uranium directory to CMake when running on CI
2017-03-15 17:24:19 +01:00
Arjen Hiemstra
04e517eddf
Do not hardcode the path to Uranium but use a cache variable
...
This allows us to override the uranium dir and make sure it is still
found even when it is not the same as "../uranium"
2017-03-15 17:23:54 +01:00
Jack Ha
1dbec70738
Merge branch '2.5'
2017-03-15 14:37:29 +01:00
Jack Ha
72f8a349cf
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-15 14:37:13 +01:00
