Commit graph

4854 commits

Author SHA1 Message Date
Ghostkeeper
e4a0345fe4
Fix more minor typing mistakes
Contributes to issue CURA-5330.
2018-06-01 16:40:57 +02:00
Ghostkeeper
c3bac474ab
Use CuraContainerRegistry instead of ContainerRegistry
Because we're calling functions of CuraContainerRegistry.

Contributes to issue CURA-5330.
2018-06-01 16:33:32 +02:00
Ghostkeeper
ff4a214c24
Add function typing
This makes MyPy discover a lot of typing errors because it now starts analysing all of these functions.

Contributes to issue CURA-5330.
2018-06-01 14:53:54 +02:00
Ghostkeeper
b920b9de4f
Fix type of setProperty
And properly pass on the extra parameters.

Contributes to issue CURA-5330.
2018-06-01 14:53:54 +02:00
Ghostkeeper
e38228ac24
Remove unused target_container parameter
It's not compatible with ContainerInterface anyway.

Contributes to issue CURA-5330.
2018-06-01 14:53:54 +02:00
Ghostkeeper
a6ffbbde8f
Add missing typing
Contributes to issue CURA-5330.
2018-06-01 14:53:54 +02:00
Ghostkeeper
e77592d718
Add missing typing for CuraContainerStack
This was already largely done, but not 100%.

Contributes to issue CURA-5330.
2018-06-01 14:53:13 +02:00
Ghostkeeper
a98b4fe35c
Fix unknown model
My IDE didn't indicate this because it is imported fine, but only if MYPY.

Contributes to issue CURA-5330.
2018-06-01 14:53:13 +02:00
Ghostkeeper
b3f73594bf
Fix types of on_finished callback
It only has a QNetworkReply argument.

Contributes to issue CURA-5330.
2018-06-01 14:53:13 +02:00
Ghostkeeper
8ed3bd29cb
Don't return any boolean in _update
Nothing listens to that return value, and its parent classes say that this must return None.

Contributes to issue CURA-5330.
2018-06-01 14:53:13 +02:00
Ghostkeeper
a946a8aaed
Add function typing for PrinterOutputDevice
This causes a lot of typing errors to surface. We'll fix this later though, when we get to it.

Contributes to issue CURA-5330.
2018-06-01 14:53:13 +02:00
Ghostkeeper
a55cf0678e
Add missing function types
The class is typed now. There's some bugs though.

Contributes to issue CURA-5330.
2018-06-01 14:53:12 +02:00
Ian Paschal
74ba10444e CURA-5357 Prevent uninstall of plugins that are not-yet-installed 2018-06-01 14:31:52 +02:00
Ghostkeeper
4157636552
Merge branch '3.4' 2018-06-01 14:03:05 +02:00
Ghostkeeper
2fbcc22123
Fix adding printers due to unused 'parent' parameter
The 'parent' parameter was unused, so I removed it. But I didn't remove all things that called it, apparently. I just removed some. I didn't try the stackbuilder.

Contributes to issue CURA-5330.
2018-06-01 14:02:32 +02:00
Lipu Fei
e859861517 No need to set parent for ExtruderStack 2018-06-01 13:55:28 +02:00
Lipu Fei
41e94cd2a1 Fix merge problems from 3.4 2018-06-01 13:51:43 +02:00
Lipu Fei
61a3668a4f Merge remote-tracking branch 'origin/3.4' 2018-06-01 13:51:00 +02:00
Diego Prado Gesto
85560abca3 CURA-5439 Show the keep or discard changes dialog also when the user
applies a configuration using the Sync button.
2018-06-01 13:26:14 +02:00
Diego Prado Gesto
a4b46be2c5 CURA-5427 Force the material models to update when the machine changes and so
when the extruder stack changes.
- What happen was that when the extruder model needed to update, the
material model was not updated correctly and so when changing a material, the
node was incorrect.
2018-06-01 12:58:08 +02:00
Ghostkeeper
abc3cde568
No longer call initialize() since it's included in __init__
We now always run initialize() after __init__ in Uranium.
2018-05-31 21:28:21 +02:00
Lipu Fei
30cbdfed69 Make sure that file extensions are always lowered
CURA-5367
2018-05-31 15:37:48 +02:00
Lipu Fei
eb949472e8 Merge remote-tracking branch 'origin/master' into WIP_improve_initialization 2018-05-31 13:47:27 +02:00
Diego Prado Gesto
931d4716e1 CURA-5404 Retrieve the material settings' values from the variant before
retrieving it from the definition if there are not defined in the material.
2018-05-30 16:58:11 +02:00
Jack Ha
ed0a0dd765 Fix multiply object in a rare case that an object is just too big 2018-05-30 10:58:19 +02:00
Lipu Fei
fae9bc838b Update CURA_* setups in CuraVersion.py.in and CMakeLists.txt
CURA-5357
2018-05-30 09:18:45 +02:00
Lipu Fei
9223122fc8 Add CuraCloudAPIRoot into CuraVersion.py.in and CMakeLists.txt
CURA-5357
2018-05-30 09:13:27 +02:00
Lipu Fei
80d4989843 Show keep/discard user settings dialog upon variant change
CURA-5417
2018-05-30 09:03:36 +02:00
Aleksei S
b46a08f566 Add Reft and Right side aligned action buttons to the message box
CURA-4952
2018-05-29 18:15:16 +02:00
Lipu Fei
fed0a015ee Clear is_user_specified_job_name flag when setting a project file name
CURA-5280
2018-05-29 15:56:01 +02:00
Lipu Fei
7cf2832183 Fix quality_group is None check in _setQualityGroup()
CURA-5423
2018-05-29 13:43:32 +02:00
Ghostkeeper
77feb95191
Don't crash when failing to reload file
Now it shows a message that it failed to load the file.
2018-05-29 11:06:07 +02:00
Lipu Fei
1c3bae3fe4 Show keep/discard dialog upon material change if there are user changes
CURA-5417
2018-05-29 10:52:06 +02:00
Lipu Fei
9627eb0fc1 Only exclude explicitly specified materials in the "exclude_materials" field
CURA-5344
2018-05-29 10:46:42 +02:00
Jack Ha
8a6996e920 If an object does not have a convex hull, it does not crash the ArrangeObjectsJob 2018-05-29 09:32:06 +02:00
Lipu Fei
f395f1eebc
Merge branch 'master' into WIP_improve_initialization 2018-05-28 13:37:26 +02:00
Lipu Fei
43fcb183ae Remove unnecessary code
CURA-5296
2018-05-28 13:10:32 +02:00
Lipu Fei
ad131ab30c Fix downgrade packages to bundled version
CURA-5296
2018-05-28 11:18:24 +02:00
Lipu Fei
689b88a024 Do not change prefix for user-specified job names
CURA-5280
2018-05-28 09:53:49 +02:00
Diego Prado Gesto
74ef906949 CURA-5164 Reuse method savePreferences 2018-05-25 10:15:04 +02:00
Diego Prado Gesto
5704a7b184 Merge branch 'master' into WIP_improve_initialization
Conflicts:
	cura/AutoSave.py
	cura/BuildVolume.py
	cura/CuraApplication.py

Contributes to CURA-5164
2018-05-25 09:40:42 +02:00
Ghostkeeper
945429195e
Move getCuraPackageManager to Uranium and initialize package manager there 2018-05-24 20:47:09 +02:00
Ghostkeeper
0f4f55cf6b
Move CuraPackageManager to Uranium
This is just what's left that was specific to Cura.
2018-05-24 20:18:42 +02:00
Ian Paschal
220c99cf3b
Merge pull request #3613 from maximkulkin/avoid-printed-supports
Add travel_avoid_supports setting support
2018-05-24 15:36:40 +02:00
ChrisTerBeke
2422ee38e8 Fix init py in backups module 2018-05-24 09:46:18 +02:00
ChrisTerBeke
809cab4ea5
Cleanup for cfd1b7b813 2018-05-23 19:18:11 +02:00
Jack Ha
260dee54fb CURA-5370 also take into account the machine size when Arranging in readMeshFinished 2018-05-23 16:57:50 +02:00
Lipu Fei
a0a8af07dc Upon manual job name change, only save the real base name
CURA-5280

Remove the machine prefix in the base name, otherwise when the machine
gets changed, the job name will become
"<new-machine>_<old_machine>_basename".
2018-05-23 16:42:13 +02:00
Ian Paschal
fb307fbbf5
Merge pull request #3846 from Ultimaker/improve-arranger
CURA-5370 Small refactor for Arranger:
2018-05-23 16:40:19 +02:00
Lipu Fei
196bd3a730 Add non-thumbnail-visible flag for creating previews
CURA-5373

Addition to the non-slicable meshes, the support meshes should also not
be included in the previews.
2018-05-23 16:32:38 +02:00