Jaime van Kessel
c5928d2c4b
Add typing & tests for Layer
2019-08-02 16:49:07 +02:00
ChrisTerBeke
b2719af0e3
Merge branch 'master' into CS-234_network_plugin_code_quality
2019-08-02 15:30:04 +02:00
Jaime van Kessel
5f692f3028
Added missing typing
2019-08-02 15:16:29 +02:00
ChrisTerBeke
1fa5628cb2
Rename output device to prevent inheritance naming confusion
2019-08-02 15:16:08 +02:00
Jaime van Kessel
c35c8e0f50
Move comments to be above the right bit of code
2019-08-02 14:40:59 +02:00
ChrisTerBeke
92d07ddb71
Merge branch 'master' into CS-234_network_plugin_code_quality
2019-08-02 12:44:56 +02:00
Lipu Fei
c841382bbd
Add more info in exceptions
2019-08-02 11:12:16 +02:00
Mark Burton
0aae887166
Add entry for prime tower type to _isInfillOrSkinTypeMap.
2019-08-01 20:34:39 +01:00
Ghostkeeper
b3912fb930
Merge branch '4.2'
2019-07-31 10:43:17 +02:00
Jaime van Kessel
4b956953a6
Fix incorect error checking
...
We don't need to check the global stack for errors, as the correct values are already checked by looking at the extruder stacks
2019-07-31 10:24:31 +02:00
ChrisTerBeke
56f58c741a
Merge branch 'master' into CS-234_network_plugin_code_quality
2019-07-30 13:10:19 +02:00
Jaime van Kessel
67dbb97958
Fix incorrect cast import
2019-07-30 11:45:27 +02:00
ChrisTerBeke
1aa70748af
Consistent naming, some bug fixes
2019-07-29 17:24:10 +02:00
ChrisTerBeke
ddd282eef3
Remove absolute plugin imports, some fixes
2019-07-29 16:11:01 +02:00
Jaime van Kessel
e0c2611a0a
Merge branch '4.2' of github.com:Ultimaker/Cura
2019-07-26 12:47:13 +02:00
Jaime van Kessel
a3dad0fa09
Fix issue with deprecation and pyqtSlot
2019-07-26 10:55:55 +02:00
Lipu Fei
9f18ceda51
Merge remote-tracking branch 'origin/master' into add_42_43_version_upgrader
2019-07-25 14:56:27 +02:00
Ghostkeeper
be4e754984
Remove cache of material manager
...
It doesn't make the code much simpler because the cache is also not a local variable.
Contributes to issue CURA-6679.
2019-07-24 16:04:40 +02:00
Jaime van Kessel
87666eb6a1
Merge branch 'master' of github.com:Ultimaker/Cura
2019-07-23 13:42:29 +02:00
Jaime van Kessel
d8ddcba091
Fix typing ignore for breath frist iterator
2019-07-23 13:40:40 +02:00
Ghostkeeper
f69eb05636
Merge branch '4.2'
2019-07-23 13:33:58 +02:00
Ghostkeeper
5f74ed080f
Increment SDK version to 6.2
2019-07-23 13:32:48 +02:00
Jaime van Kessel
827ccd5a13
Fix mypy issues caused by scenenode iterator being correctly typed
2019-07-23 13:19:42 +02:00
Jaime van Kessel
9ceb9ce18b
Fix typing issues
...
They were caused by upgrading to a higher mypy version, which found more mistakes
2019-07-23 12:58:46 +02:00
Jaime van Kessel
e56e355e79
Added upgrader for 4.3
2019-07-23 11:15:13 +02:00
Jaime van Kessel
822181f214
Merge branch '4.2' of github.com:Ultimaker/Cura
2019-07-22 16:15:01 +02:00
Jaime van Kessel
c3166703b4
Also connect the objectsModel to the selectionChanged signal
2019-07-22 10:27:19 +02:00
Lipu Fei
4b8a216771
Fix typing
2019-07-22 09:34:00 +02:00
Jaime van Kessel
28184ad999
Add some simple tests to CuraSceneNode
2019-07-19 16:53:37 +02:00
Jaime van Kessel
6bb9e6097a
Rename "collideWithArea" to "collideWithAreas"
...
This better reflects what it does (eg; it is checking for multiple colissions, not just one)
2019-07-19 16:23:57 +02:00
Jaime van Kessel
1c93dffc22
Added deprecation warning to getExtruderName
2019-07-19 13:36:53 +02:00
Jaime van Kessel
a436d5e0bf
Added missing cast to getMachine
2019-07-19 12:43:17 +02:00
Jaime van Kessel
272ef40669
Merge branch '4.2' of github.com:Ultimaker/Cura
2019-07-19 09:31:51 +02:00
Jaime van Kessel
a82dcb6f52
Fix crash when attempting to set build plate for selection
2019-07-19 09:23:42 +02:00
Lipu Fei
a6790e7bb2
Merge pull request #6011 from Ultimaker/CURA-6651_add_peripheral_data_slot
...
Add data slot for peripherals
2019-07-18 12:39:56 +02:00
Lipu Fei
6a843866a0
Fix code style
...
CURA-6651
2019-07-18 11:57:07 +02:00
Ghostkeeper
f334fa8578
Spelling of log entries and code style
2019-07-18 11:49:18 +02:00
Jaime van Kessel
f402235406
Fix shadowed use of builtin type
...
CURA-6651
2019-07-16 10:27:50 +02:00
Ghostkeeper
fed275024a
Add slot to store peripherals
...
You can get the list of names of peripherals this way.
Contributes to issue CURA-6651.
2019-07-15 17:29:30 +02:00
Ghostkeeper
7927169da1
Add peripheral class
...
It has a non-human-readable type for the plug-ins to use and a human-readable name which can be requested with the peripherals() property.
Contributes to issue CURA-6651.
2019-07-15 17:27:23 +02:00
Ghostkeeper
037f1967c8
Remove override for version number in CuraContainerStack
...
Otherwise plug-ins can't register ContainerStacks any more.
As discussed in the CCB.
2019-07-10 14:57:26 +02:00
Lipu Fei
4e0b9d7b78
Fix typing
...
CURA-6597
2019-07-09 13:02:01 +02:00
Lipu Fei
8863516aa4
Rename function name and fix tests
...
CURA-6597
2019-07-09 12:53:44 +02:00
Lipu Fei
f086c1eb11
Minor cleanup changes
...
CURA-6597
2019-07-09 11:57:46 +02:00
Lipu Fei
659a276f65
Rename signal
...
CURA-6597
2019-07-09 11:29:27 +02:00
Ghostkeeper
e2fd90506a
Include intent profiles from the default intents
...
If we have the default intent category, list all quality types available.
Contributes to issue CURA-6597.
2019-07-09 10:56:21 +02:00
Ghostkeeper
86750c0446
Don't continue after returning empty list
...
Oops. Shouldn't have pushed...
Contributes to issue CURA-6597.
2019-07-09 10:54:47 +02:00
Ghostkeeper
07c5c4d9f0
Return empty model if there is no printer added yet
...
Contributes to issue CURA-6597.
2019-07-09 10:26:49 +02:00
Ghostkeeper
3729e90b24
Fix getting original intent category
...
It's now a property so it doesn't need the brackets.
Contributes to issue CURA-6597.
2019-07-05 13:06:27 +02:00
Ghostkeeper
8cea9c5b87
Register IntentManager in QML
...
This way we can change the intent from the interface.
Contributes to issue CURA-6597.
2019-07-05 13:03:20 +02:00
