GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 16:24:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,675 Commits 291 Branches 260 Tags
Commit Graph

979 Commits

Author SHA1 Message Date
Jaime van Kessel
466ec7c42a
Remove duplicated variable 
It was holding the same data as extruders_to_disable
 2020-06-18 11:08:17 +02:00
Jaime van Kessel
930d92869a
Fix syncing empty material with cloud 
For some reason the cloud gives a 0000 guid when the material is empty.
 2020-06-18 11:03:40 +02:00
Kostas Karmas
984426fabb Merge branch 'master' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-10 12:06:41 +02:00
Nino van Hooff
feeeb972f7
Merge pull request #7873 from Ultimaker/CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account 
CURA-7438 Handle the case when a cloud printer is removed from the account
 2020-06-10 11:46:10 +02:00
Jaime van Kessel
ed53557044
Merge branch 'master' of github.com:Ultimaker/Cura 2020-06-09 16:53:33 +02:00
Kostas Karmas
8c6a7d3098 Remove definitionChanges before removing a printer 
When removing a printer, the files in %appdata%/cura/<version>/
/definition_changes/ remained intact. This commit fixes that by
making sure that the definitionChanges are removed before removing
the machine.
 2020-06-09 15:56:13 +02:00
Kostas Karmas
5c898b8c57 Allow the machine manager to set an empty active machine 
Gracefully handle the case where the machine manager is requested to
delete the last machine in Cura. In this case, instead of deleting
everything of this machine and still keep it as an active machine,
the machine manager will set the active machine to None.

The QML files which depend on the active machine were changed to
properly handle themselves when there is no active machine.

CURA-7454
 2020-06-09 15:33:22 +02:00
Nino van Hooff
1024879f9d Process Review feedback for CURA-7438 
Renames UltimakerCloudAuthentication to UltimakerCloudConstants

Cura-7438
 2020-06-09 13:41:30 +02:00
Kostas Karmas
458b439a9a Rename META_REMOVED_FROM_ACCOUNT to META_LINKED_TO_ACCOUNT 
The meta data entry was rename to be more representative of its
function. In addition, the bool metadata entry is now properly
handled using the parseBool function.

CURA-7438
 2020-06-04 16:14:09 +02:00
Kostas Karmas
4bebaaaddb Display an appropriate tooltip when device is removed from the account 
The tooltip is updated to reflect the case where a cloud printer is
removed from the users account.

CURA-7438
 2020-06-04 15:08:27 +02:00
Nino van Hooff
80a5b53aad Store the printer cluster size as a metadata entry on the machine 
This makes the cluster size also available when the machine is offline.
Also fixes an issue where the cluster size is improperly restored
once the internet connection comes back online, resulting in the printer
showing as a single printer until next sync

CURA-7347
 2020-06-03 13:59:51 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 
# Conflicts:
#	cura/API/__init__.py
#	cura/Settings/CuraContainerRegistry.py
#	cura/Settings/ExtruderManager.py
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
#	plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py
#	plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
 2020-05-28 17:31:24 +02:00
Nino van Hooff
c2c96faf5f Convert remaining doxygen to rst 2020-05-28 17:13:44 +02:00
Nino van Hooff
eef347ed6c Add an cloud unavailable icon to the active printer icon 
CURA-7437
 2020-05-20 17:20:40 +02:00
Ghostkeeper
d499c6fdfe
Keep this position a string 
We've set up enough defensive coding that this kept working, but the typing checker fails on it.
 2020-05-15 18:50:20 +02:00
Ghostkeeper
acc8e24cb4
Use extruderList rather than extruders dictionary 
The extruders dictionary has been deprecated.

Done during Turbo Testing and Tooling to reduce the amount of warnings in our log.
 2020-05-15 16:07:19 +02:00
Ghostkeeper
17762cb431
Use extruderList rather than extruders to switch userChanges over 
It's a bit weird that it switches the user changes over though. Won't it be a different printer type then?
 2020-05-15 16:04:42 +02:00
Ghostkeeper
33c1901070
Replace another extruders() call with extruderList 
The extruders function is deprecated.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 15:51:49 +02:00
Ghostkeeper
174a8e5411
Use extruderList rather than deprecated extruders 
Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 15:50:03 +02:00
Ghostkeeper
a6d7b97abc
Use extruderList rather than deprecated extruders 
Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 15:39:28 +02:00
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