Commit graph

2372 commits

Author SHA1 Message Date
Ghostkeeper
02a3067a0c
Reset infill line distance when changing density via recommended mode
Otherwise the change has no effect.

Contributes to issue CURA-5324.
2018-06-04 16:58:13 +02:00
Diego Prado Gesto
36e72ae744 Merge branch '3.4' into fix_retraction_amount 2018-06-04 14:42:39 +02:00
Lipu Fei
e518d07f5a No need to give parent to ExtruderStack 2018-06-04 13:22:08 +02:00
Ghostkeeper
e5d1a53dd6
Add missing return type
Contributes to issue CURA-5330.
2018-06-04 09:55:17 +02:00
Ghostkeeper
51f24bc8c8
Call getMachineManager on CuraApplication
Because Application doesn't have it. Its child class has.

Contributes to issue CURA-5330.
2018-06-04 09:53:20 +02:00
Ghostkeeper
49c684a741
Add function typing
Contributes to issue CURA-5330.
2018-06-04 09:51:34 +02:00
Ghostkeeper
f544e3d5c0
Fix @override decorator
They need a parameter and they need to be the last decorator.

Contributes to issue CURA-5330.
2018-06-04 09:02:57 +02:00
Ghostkeeper
5a5d07865b
Fix circular imports with CuraApplication
Contributes to issue CURA-5330.
2018-06-04 09:01:30 +02:00
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
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
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
Lipu Fei
80d4989843 Show keep/discard user settings dialog upon variant change
CURA-5417
2018-05-30 09:03:36 +02:00
Lipu Fei
7cf2832183 Fix quality_group is None check in _setQualityGroup()
CURA-5423
2018-05-29 13:43:32 +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
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
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
Diego Prado Gesto
8ad409ff55
Merge branch 'master' into WIP_improve_initialization 2018-05-14 15:15:02 +02:00
Diego Prado Gesto
43657010ba CURA-5164 The Preferences is not a singleton class anymore since in some point
several instances need to be created.

- In the ThreeMFWorkspaceReader we need to create some temporal
instances of Preferences that makes it not singleton anymore.

- The current preferences are kept in the Application class and so all
the calls to the preferences are changed to get the preferences from
Application.

- The method getInstance in Preferences is kept as deprecated since some
external plugins.
2018-05-11 08:50:42 +02:00
Diego Prado Gesto
a6676fb477 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-07 12:57:33 +02:00
Diego Prado Gesto
b576423747 Adapt ovewritten method signature 2018-05-07 11:49:30 +02:00
Jack Ha
467e814f88 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-07 10:30:50 +02:00
Jack Ha
00d8427e42 Add sanity check for GlobalStack CURA-5045 2018-05-07 10:30:45 +02:00
Lipu Fei
051dd7a6e9 WIP: Make application initialization and start up more clear
- Create SingleInstance class to handling single instance stuff.
 - Instead of calling getInstance() everywhere, initialize each object
   explicitly in order when application starts and getInstance()s do not
   create instances any more and they merely return the created
   instances.
 - Only set initial values in construtor functions __init__(). Move the
   initialization of context-aware (i.e. things that depend on other
   things) to separate functions.
 - Split application creation and initialziation into several steps and
   them should be called explicitly in the correct order.
2018-05-04 09:57:02 +02:00
Jaime van Kessel
7c80bc203c Fixed bunch of wrong / missing typing 2018-05-03 21:14:06 +02:00
Lipu Fei
9a5fb47a6e Merge master into material marketplace 2018-05-01 11:56:34 +02:00
Diego Prado Gesto
27b1e2cdd6 Fix format and add error message to log. Contributes to CURA-5301 2018-04-26 15:49:18 +02:00
Jack Ha
efdccb593f Merge branch '3.3' 2018-04-25 16:35:20 +02:00
Lipu Fei
df1e15b1e5 Move the definition_changes fix to CuraContainerStack
CURA-5281
2018-04-25 16:12:47 +02:00
Lipu Fei
ec9be7a103 Merge remote-tracking branch 'origin/3.3' 2018-04-25 12:55:21 +02:00
Lipu Fei
1d8c2bea98 Do not reset quality if the current custom quality is based on not supported
CURA-5285
2018-04-25 12:40:10 +02:00
Lipu Fei
c4994918c8 Make sure all stacks in a loaded machine have non-empty definition_changes container
CURA-5281
2018-04-25 11:16:02 +02:00
Ghostkeeper
4fc29554ef
Don't process inheritance before there is an active global container
This could be called after an extruder was disabled by a broken configuration.

Fixes #3570.
2018-04-25 09:59:25 +02:00
Ghostkeeper
5648bc82e7
Merge branch '3.3' 2018-04-23 14:07:46 +02:00
Diego Prado Gesto
b8a26f3187 CURA-5218 Disable the Activate and Duplicate button in the management
page if the selected profile is not supported
2018-04-20 17:04:51 +02:00
Lipu Fei
53495604f8 Merge remote-tracking branch 'origin/feature_show_config_errors' 2018-04-19 15:38:29 +02:00
Lipu Fei
db5c18295b Merge remote-tracking branch 'origin/3.3' 2018-04-19 09:20:22 +02:00
Lipu Fei
372419c223 Fix fallback quality setting
CURA-5218
2018-04-18 11:24:09 +02:00
Lipu Fei
650638fcdd Fix setting default quality
CURA-5218
2018-04-18 11:20:43 +02:00