Lipu Fei
c20274e356
Move constant instance containers to a separate file
...
This way we separate the class/type definitions and the actual
constants.
2018-08-15 11:04:09 +02:00
Diego Prado Gesto
e1fd9b03a4
Remove all dependencies of the CuraContainerStack with the
...
ContainerRegistry.
That will be very helpful for creating unit tests. Also this is not
needed because the next stack is always set in the machine or extruder
manager when switching printers.
Contributes to CURA-5628.
2018-08-14 15:35:00 +02:00
Diego Prado Gesto
c8af4f45ce
Decouple the creation of the stack containers from the process that add
...
them to the container registry, that is done in CuraApplication.
That allow us to have access to the empty containers and so we can unit
test easily without mocking up stuff.
Contributes to CURA-5628.
2018-08-14 13:25:56 +02:00
Lipu Fei
e0ad7a9fb4
Add answer commments to some puzzling code
2018-08-13 14:24:25 +02:00
Lipu Fei
8e891b69b0
Move type hinting imports into TYPE_CHECKING block
2018-08-13 13:48:00 +02:00
Lipu Fei
25e6fd8bec
Fix incorrect type hinting
2018-08-13 13:47:26 +02:00
Lipu Fei
42b509cd4a
Fix a wrong type hinting
2018-08-13 13:44:07 +02:00
Ian Paschal
5ede82eddc
Merge pull request #4233 from Ultimaker/CURA-5538-fix-on-at-a-time
...
CURA-5538 Fix one at a time
2018-08-13 13:14:30 +02:00
Diego Prado Gesto
152005ab14
Merge pull request #4184 from Ultimaker/CURA-5570_beyond_comprehension
...
CURA-5570 More decision points in material and quality lookup!
2018-08-13 12:06:29 +02:00
Lipu Fei
bd47dfef75
Revert "Revert "Merge pull request #4203 from Ultimaker/CURA-5538-fix-one-at-a-time-order-2""
...
This reverts commit 89ed2bcff8
.
2018-08-13 11:23:10 +02:00
Ian Paschal
3fad11e07f
Code style fixes
...
Contributes to CURA-5595
2018-08-13 10:45:03 +02:00
Diego Prado Gesto
de1b8edb72
Merge branch 'master' into CURA-5570_beyond_comprehension
2018-08-13 09:57:36 +02:00
Diego Prado Gesto
825a3cd08f
CURA-5570 Fix the configuration sync feature.
...
It crashed Cura because it was using an outdated signature of the method
getMaterialNodeByType.
2018-08-13 09:55:57 +02:00
Aleksei S
a1bc2f3ebf
Merge branch 'master' into CURA-5595_add_custom_button_to_menu
2018-08-10 15:51:38 +02:00
Ian Paschal
89ed2bcff8
Revert "Merge pull request #4203 from Ultimaker/CURA-5538-fix-one-at-a-time-order-2"
...
This reverts commit 82e1a7c5fc
, reversing
changes made to 1915659393
.
2018-08-10 11:45:25 +02:00
Ian Paschal
82e1a7c5fc
Merge pull request #4203 from Ultimaker/CURA-5538-fix-one-at-a-time-order-2
...
CURA-5538 Fix print order for one-at-a-time mode
2018-08-09 16:16:27 +02:00
Lipu Fei
9239e82b1f
Make mypy happy
...
CURA-5578
2018-08-08 12:56:49 +02:00
Lipu Fei
910ffe0ad5
Fix quality reset upon material deletion
...
CURA-5621
2018-08-07 16:15:05 +02:00
Lipu Fei
95481b8560
Fix print order for one-at-a-time mode
2018-08-06 17:23:01 +02:00
Lipu Fei
066a00653a
Add one more layer to the decision tree
2018-08-02 17:15:34 +02:00
Lipu Fei
a303f394c8
Move VariantType to VariantType.py
...
Less circular dependencies for imports.
2018-08-02 16:11:55 +02:00
Aleksei S
bf219c3821
Added typing
...
CURA-5595
2018-07-26 13:54:35 +02:00
Aleksei S
40c51249f5
Merge branch 'custom_menuitems_in_sidebar' into CURA-5595_add_custom_button_to_menu
2018-07-26 13:51:07 +02:00
Diego Prado Gesto
51c499b08c
When the extruder is being disabled and it is the currently selected
...
one, then switch to the default extruder. Also do not allow users to
click in a disabled extruder, only if they want to enable it again.
2018-07-16 16:26:55 +02:00
Jack Ha
23d4e835ed
Merge branch 'master' into CURA-5408-material-profiles
2018-07-12 14:44:50 +02:00
Lipu Fei
af02dc2758
Only use setMetaDataEntry()
2018-07-11 11:14:57 +02:00
Lipu Fei
328fd9081e
Merge remote-tracking branch 'origin/master' into remove-package-check
2018-07-10 14:57:46 +02:00
Jack Ha
e7c1d31bee
Fixed change material diameter, changed signature of getContainerMetaDataEntry. CURA-5408
2018-07-10 13:14:11 +02:00
Lipu Fei
e5a11c1f7b
Fix getContainerMetaDataEntry()
...
CURA-5408
2018-07-09 15:12:53 +02:00
Aleksei S
77bd6cf749
Read material weight from container
...
CURA-5408
2018-07-09 14:20:51 +02:00
Jack Ha
111a3556d2
Fixed possible errors and typing error. CURA-5389
2018-07-09 11:42:30 +02:00
Jack Ha
bff9a3afb5
Merge branch 'master' into remove-package-check
2018-07-09 11:25:19 +02:00
Jack Ha
5af5aa9e35
Added reset profiles/materials and uninstall functionality and dialog. CURA-5389
2018-07-09 09:57:31 +02:00
Jack Ha
675c5064ed
Added checkPackageUsageAndUninstall and the package usage check. No confirmation dialog yet
2018-07-05 11:47:06 +02:00
Diego Prado Gesto
f91b6faecc
Fix code-styling
2018-07-03 17:57:30 +02:00
Diego Prado Gesto
ff6bc9de4e
Fix some more code-style
2018-07-03 13:09:05 +02:00
Diego Prado Gesto
762a1b1bfd
Fix code-style
2018-07-03 12:06:06 +02:00
alekseisasin
debe142c18
Merge pull request #3914 from Ultimaker/CURA-5334_extruder_def_for_all
...
CURA-5334 Add extruder definitions for all single-extrusion machines
2018-07-02 15:56:45 +02:00
Jack Ha
3761123513
Merge branch 'master' into CURA-5334_extruder_def_for_all
2018-07-02 14:11:24 +02:00
Ian Paschal
680e98fb28
Removed duplicate '.self'
2018-07-02 13:11:01 +02:00
Diego Prado Gesto
0692192d58
Merge branch '3.4'
2018-07-02 09:10:57 +02:00
Diego Prado Gesto
56c7c6f2b2
CURA-5518 Check whether the the findDefinitionContainers return any
...
element or not.
2018-06-29 10:41:54 +02:00
Aleksei S
c4fa50a8fc
Added icon for custom Menu items
2018-06-25 16:51:40 +02:00
Aleksei S
f577789859
Added extra SettingsModel for a QML
2018-06-23 16:22:33 +02:00
Ghostkeeper
75e5a185d9
Don't unnecessarily cast to a set
...
The InstanceContainer version of getAllKeys was first casting to a list but I removed that, because everywhere where we were using it we were casting it directly to a set.
Contributes to issue CURA-5330.
2018-06-15 13:07:55 +02:00
Ghostkeeper
6e663ac6f5
Don't call getMachineManager on Uranium's application
...
It is a function of CuraApplication.
Contributes to issue CURA-5330.
2018-06-15 11:15:31 +02:00
Ghostkeeper
c3d4d5eba7
Ignore MyPy errors caused by DepthFirstIterator not being detected as iterator
...
MyPy is wrong in this case.
Contributes to issue CURA-5330.
2018-06-15 11:02:15 +02:00
Ghostkeeper
4418cf3aac
Prevent accessing private _instances variable
...
We can get at this via the getProperty function.
Contributes to issue CURA-5330.
2018-06-15 10:59:41 +02:00
Ghostkeeper
b331736cb2
Let _findInstanceContainerDefinitionId work with DefinitionContainerInterface
...
But where it needs the .id field it needs to ignore this type because this works with getattr weirdness.
Contributes to issue CURA-5330.
2018-06-14 09:58:16 +02:00
Ghostkeeper
eac3c759cd
Cast each container in their stack to actual types
...
We know for sure that these containers have those types. We'll accept the risk here that this assumption was wrong.
Contributes to issue CURA-5330.
2018-06-14 09:58:07 +02:00