908 Commits

Author SHA1 Message Date
Ghostkeeper
fe0bae4c25
MORE usage of extruderList, LESS of extruders
Extruders has been deprecated.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
2020-05-15 15:23:29 +02:00
Ghostkeeper
afde5353eb
Use extruderList rather than extruders
Extruders is deprecated. Always use the extruderList.
In fact, the else case beneath was already using extruderList in the same way.
Hopefully we can one day get rid of all the string conversion for the position in this class. I don't dare to refactor that without having a review though.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
2020-05-15 15:20:46 +02:00
Ghostkeeper
88bf80c424
Don't provide setVariant with None as variant
That is not allowed as per the type. This could happen if the preferred variant of a printer also doesn't exist.

Fixes Sentry issue CURA-NP.
2020-05-07 08:53:52 +02:00
Jaime van Kessel
8269ae9501
Use base_file to check if a material is known
Fixes #7490
2020-04-14 09:49:34 +02:00
Jaime van Kessel
cfc2cc3692
Fix crash when printer definition could not be found 2020-04-08 17:14:58 +02:00
Jaime van Kessel
caa348265d
Add check to prevent unknown materials from being active
This should really resolve the key error for anycubics
2020-04-08 17:00:11 +02:00
Ghostkeeper
2ee3e5b386
Don't remove machines that don't exist
Fixes Sentry issue CURA-EM.
2020-03-30 14:10:59 +02:00
Jaime van Kessel
2fc8c0e5b5
Fix variant from extruder not restoring correctly 2020-03-13 10:37:08 +01:00
Ghostkeeper
548c02772d
Gracefully fail if the profile can't be set currently
Discovered during work on CURA-7283.
2020-03-06 13:40:28 +01:00
Jaime van Kessel
670a106957
Be a bit more gracefull when adding a machine failed
This seems to happen for people that manually add machines to cura
but mess something up when copying the files.

CURA-3X
2020-02-28 17:03:38 +01:00
Jaime van Kessel
f4d1d5d936
Add a check that fixes wrong variants upon setting an active machine 2020-02-28 15:06:11 +01:00
Jaime van Kessel
0ccf457314
Split up an overly long call into shorter readable bits 2020-02-28 14:25:50 +01:00
Jaime van Kessel
0520f9a4bc
Ensure that setActiveExtruderCount correctly emits the extruderEnablechanged signal 2020-02-04 16:46:35 +01:00
Kostas Karmas
9266c753c3 Reset print_sequence when reactivating extruder 2
The setting print_sequence was not being resetted to all at once
whenever the 2nd extruder was reactivated.
This commit fixes that by explicitly resetting print_sequence
when reenabling an extruder, if it has been changed by the user.

CURA-6914
2020-01-24 17:12:00 +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
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
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
Lipu Fei
b360e0db39 Fix numberExtrudersEnabled returning None
CURA-6931
2019-10-28 10:44:24 +01: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
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
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
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
Ghostkeeper
b5c6a0a1e3
Merge branch 'master' into CURA-6793_performance 2019-10-14 17:17:10 +02:00
Lipu Fei
2e0fd21c60 Fix setVariantByName() 2019-10-14 14:47:43 +02:00
Jaime van Kessel
bba43fafcc
Remove another unused signal 2019-10-11 14:35:44 +02:00
Jaime van Kessel
be675d9343
Remove unused signal 2019-10-11 14:33:08 +02:00
Jaime van Kessel
05a6c9c3cf
Make code a bit smarter about reusing ExtruderConfigurationModels
This prevents a lot of unneeded signal noise
2019-10-11 11:04:16 +02:00
Ghostkeeper
c698938c60
Remove debug print 2019-10-10 15:22:52 +02:00
Jaime van Kessel
ec4817db87
Fix crash when syncing with configuration that has no printcores active
CURA-6826
2019-10-10 09:55:17 +02:00
Lipu Fei
44cb810c85 If None crash
CURA-6869
2019-10-09 22:28:58 +02:00
Lipu Fei
e5b90ee306 Fix is_experimental flag update
CURA-6869
2019-10-09 12:52:49 +02:00
Ghostkeeper
0238f65e6a
Remove double call of _onGlobalContainerChanged and activeExtruderChanged on switching
When switching printers, it would first emit the global container changed signal which connects to _onGlobalContainerChanged, then update stuff in the extruder manager, then manually call _onGlobalContainerChanged again to update some other stuff with the new data from the extruder manager. This was prohibitively expensive, so this prevents that.
Another double or triple emit of the activeExtruderChanged was removed in the extruder manager when creating the extruders for a printer: It would first set the extruder number to 0, possibly emitting the signal, then emit the signal just to be sure since the extruder itself changed (rather than just the number), and then change the extruder number to the preferred extruder, possibly again emitting a signal. Now it just sets the extruder number to the preferred extruder and always emits the signal once (either through setting the extruder number or manually afterwards).

Contributes to issue CURA-6793.
2019-10-08 16:32:20 +02:00
Jaime van Kessel
987ccd28ba
Merge branch 'feature_intent' of github.com:Ultimaker/Cura 2019-10-08 16:23:03 +02:00
Jaime van Kessel
11f9992ebb
Merge pull request #6473 from Ultimaker/CURA-6632_intent_in_stats
CURA-6632 Add intent into stats
2019-10-08 16:19:19 +02:00