2111 Commits

Author SHA1 Message Date
Jaime van Kessel
e74f049142
Fix bunch of issues found by pylint 2020-01-10 16:37:46 +01:00
Jaime van Kessel
e46febfea4
Switch out number of getActiveExtruderStacks for extruderList
It's essentially the same, but reduces the dependency of MachineManager
on the ExtruderManager
2020-01-06 14:47:46 +01:00
Jaime van Kessel
55dacee45f
Simplify the numUserSettings count 2020-01-06 14:38:39 +01:00
Jaime van Kessel
3e6723f378
Remove unneeded update calls 2020-01-03 14:16:34 +01:00
Jaime van Kessel
8b393317ff
Add "all" as a setting visibility preset
CURA-7082
2020-01-02 10:51:40 +01:00
Ghostkeeper
8a9b791298
Merge branch '4.4'
Conflicts:
	cura/Machines/MaterialNode.py -> Due to some automated formatting tool. Please disable those tools, people.
2019-12-23 16:26:25 +01:00
Ghostkeeper
15ba762847
Fix spelling of error message in the log
Found during investigation of #6828.
2019-12-20 09:54:07 +01:00
Kostas Karmas
50b8ff2352
Fix check that finds the extruder in a position
CURA-7048
2019-12-17 10:55:28 +01:00
Kostas Karmas
a1d7eefc42
Fix PPA crashing on single-extruder printers
The machine manager was leading to a crash when trying to enable
the second extruder in single-extrusion printers, because the check
for the second extruder was not correctly implemented. This commit
fixes that issue by checking if the global stack has the specified
extruder. If it does not, then the function returns while logging the
issue.

CURA-7048
2019-12-17 10:55:28 +01:00
ninovanhooff
f77832315a
Merge branch 'master' into CURA-6127_settings_lost_when_sync_to_diff_printer_type 2019-12-16 09:48:32 +01:00
Kostas Karmas
409dc98299 Keep global settings on sync to diff printer type
In addition to the per-extruder user changes, copy the global user
changes to the new_machine.

CURA-6127
2019-12-13 15:00:22 +01:00
Remco Burema
44e7cb7108
Replace deprecated code. 2019-12-13 13:52:24 +01:00
Kostas Karmas
2b6b7a1f81 Fix lost settings on sync to diff printer type
When syncing to a different printer type only the global user changes
where kept, while the per-extruder user changes were not copied at all,
since the extruder list is empty before the new machine becomes active.

This commit fixes this problem by keeping a copy of the per-extruder
user changes before the new machine (of different type) is activated.
The copied user changes are then transfered to the new global stack
after the new machine is set as active.

CURA-6127
2019-12-13 11:30:34 +01:00
Kostas Karmas
da1a5d1be6 Log error on failed machine creation
An error message will be generated when machine creation fails
while switching printer types in the printer configuration menu.

CURA-6127
2019-12-10 14:44:31 +01:00
Jaime van Kessel
b77de636d4
Prevent crashes when a variant could not be found
This should not happen, but we've seen some cases where it would cause a crash, usually
when a previous upgrade did something a bit weird (in this specific case; a printer
with an empty variant, whereas it should have a variant).

Since any change that the user will make will ensure that the variant is no longer empty (eg;
any selection of a variant will mean it's no longer empty) and that there is no way back,
it should be pretty safe to ignore the situation as it will resolve itself eventually

CURA-6992
2019-12-05 14:19:18 +01:00
Jaime van Kessel
95cffb6710
Fix machine duplication when switching configuration 2019-12-05 14:06:52 +01:00
Jaime van Kessel
45bbb189ce
Fix machine duplication when switching configuration 2019-12-02 13:59:50 +01:00
Jaime van Kessel
fb4ce43f0c
Prevent crashes when a variant could not be found
This should not happen, but we've seen some cases where it would cause a crash, usually
when a previous upgrade did something a bit weird (in this specific case; a printer
with an empty variant, whereas it should have a variant).

Since any change that the user will make will ensure that the variant is no longer empty (eg;
any selection of a variant will mean it's no longer empty) and that there is no way back,
it should be pretty safe to ignore the situation as it will resolve itself eventually

CURA-6992
2019-11-21 12:54:33 +01:00
Lipu Fei
ebea5fbd14 Merge 4.4 2019-11-13 11:22:15 +01:00
Lipu Fei
c08e7df277 Fix typing
CURA-6976
2019-11-13 11:10:12 +01:00
Nino van Hooff
fe27193c98 Add dict key check for a crash found in IntentManager
CURA-6976
2019-11-13 11:01:03 +01:00
Nino van Hooff
eb4eddd49e Add dict key check for a crash found in IntentManager
CURA-6976
2019-11-12 15:39:44 +01:00
Jaime van Kessel
3da53a3a89
Merge branch 'CURA-6856_signed_plugins_and_packages' of github.com:Ultimaker/Cura 2019-11-12 10:48:43 +01:00
Lipu Fei
d13683f4db Merge remote-tracking branch 'origin/4.4' 2019-11-11 08:13:53 +01:00
Jaime van Kessel
00078fd659
Remove a bunch of unused imports 2019-11-08 13:38:42 +01:00
Remco Burema
3636eed964
Instead of selecting first, return only uniques.
part of CURA-6917
2019-11-07 17:19:18 +01:00
Nino van Hooff
0b450ef9f4 Fix linked materials not being found due to key casing
CURA-6917
2019-11-07 15:51:22 +01:00
Remco Burema
3dabd6023b
Merge branch 'master' into CURA-6856_signed_plugins_and_packages 2019-11-01 16:45:42 +01:00
Jaime van Kessel
be0e1f7284
Ensure that all updates from settingInheritance are on a timer 2019-11-01 15:14:33 +01:00
Remco Burema
298eb27c7f
Add possibility to check material-profiles.
Needed to add the filename to deserialize, feels a bit unsafe as an optional parameter, will discuss tomorrow.
part of CURA-6856
2019-10-29 17:45:19 +01:00
Ghostkeeper
2beeca0687
Merge branch 'qml_speed_improvements' 2019-10-28 16:43:14 +01:00
Jaime van Kessel
9906d454ce
Merge branch 'qml_speed_improvements' of github.com:Ultimaker/Cura into qml_speed_improvements 2019-10-28 16:08:04 +01:00
Jaime van Kessel
7204deac0c
Rename function to beter reflect what it does
CURA-6932
2019-10-28 16:07:35 +01:00
Ghostkeeper
95350cda51
Revert "Add a few process events to setActiveMachine to make it react more smooth"
This reverts commit 27701f765310bb58dc76373abe97a02f84ae5a2d. After discussion with Nallath we've decided that it wasn't that noticeable and could temporarily display wrong names in the interface. We've decided to undo it for now.

Contributes to issue CURA-6932.
2019-10-28 16:04:43 +01:00
Lipu Fei
b360e0db39 Fix numberExtrudersEnabled returning None
CURA-6931
2019-10-28 10:44:24 +01:00
Jaime van Kessel
27701f7653
Add a few process events to setActiveMachine to make it react more smooth 2019-10-25 15:28:17 +02:00
Jaime van Kessel
f090b5898e
Small qml speed improvements for setting item 2019-10-25 15:09:31 +02:00
ninovanhooff
b9b086a8c0
Merge pull request #6542 from Ultimaker/CURA-6793_performance
Performance improvements
2019-10-23 16:50:04 +02:00
Ghostkeeper
94eb76a844
Merge branch 'master' into CURA-6793_performance
Conflicts:
	cura/Machines/MaterialManager.py -> File was deleted in Master but I changed things for the lazy loading.
	cura/Machines/Models/BaseMaterialsModel.py -> I clarified documentation on a line above a place where a timer was added in between.

Contributes to issue CURA-6793.
2019-10-23 09:58:08 +02:00
Lipu Fei
b6d591c64c Add typing
CURA-6858
2019-10-22 14:14:14 +02:00
Lipu Fei
1f3a7c976f Remove deprecated MachineManager.activeMachineHasRemoteConnection
CURA-6858
2019-10-22 14:14:14 +02:00
Lipu Fei
38ee4bf208 Remove deprecated functions in MachineManager
CURA-6858
2019-10-22 14:11:40 +02:00
Lipu Fei
7544d049c5 Remove deprecated ExtruderManager.getExtruderName
CURA-6858
2019-10-22 14:11:40 +02:00
Lipu Fei
227b76d6f0 Remove deprecated currentExtruderPositions
CURA-6858
2019-10-22 14:11:31 +02:00
Nino van Hooff
3709cfa4ed Add tooltips for intent profiles to the Recommended Quality panel.
The description is optional.
Tooltip will not show if no description is set

CURA-6853
2019-10-17 15:54:03 +02:00
Ghostkeeper
c12817170c
Merge branch 'master' into CURA-6793_performance 2019-10-16 15:47:41 +02:00
Ghostkeeper
7348c70af6
Don't get whole container to just get metadata
A performance improvement, especially in the material models.

Contributes to issue CURA-6793.
2019-10-16 13:56:23 +02:00
Lipu Fei
59fa73448a Fix material diameter change
CURA-6868
2019-10-15 15:03:35 +02:00
Ghostkeeper
ce4c5a1c93
Remove unnecessary listening to switching extruder tabs
Also fix unnecessary emitting of switching extruder tabs.

This should improve performance a lot. I tested a lot of things and am convinced that it didn't break anything. But the automated GUI tests and QA team should be the final arbiters of that...

Contributes to issue CURA-6793.
2019-10-15 15:01:45 +02:00
Lipu Fei
e5450a449c IntentManager should take into account disabled extruders
CURA-6891
2019-10-15 13:27:58 +02:00