GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-19 21:59:10 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,533 Commits 295 Branches 268 Tags
Commit Graph

6404 Commits

Author SHA1 Message Date
Kostas Karmas
8e1ed6cd29 Merge branch 'master' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-09 15:03:23 +02:00
Jaime van Kessel
b6b3646f32
Merge branch 'CURA-7437_no_internet_cloud_bugs' of github.com:Ultimaker/Cura 2020-06-09 13:45:21 +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
Nino van Hooff
32f57b8770 Merge remote-tracking branch 'origin/master' into CURA-7437_no_internet_cloud_bugs 2020-06-09 10:47:53 +02:00
Jaime van Kessel
83fd35424b
Store data for metadata first 
This should help with providing data to sentry to find out what the hell is going wrong
 2020-06-08 10:31:40 +02:00
Jaime van Kessel
773edfd533
Prevent crash when camera tool was not found 2020-06-08 10:24:59 +02:00
Kostas Karmas
7ba400254d Merge branch 'CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-08 09:22:39 +02:00
Ghostkeeper
ac98caee54
Remove debugging code 2020-06-05 19:35:25 +02:00
Ghostkeeper
9fab964afe
Merge branch 'master' of github.com:Ultimaker/Cura 2020-06-05 13:48:52 +02:00
Kostas Karmas
ea6a73e76d Fix mypy complains 2020-06-05 13:18:48 +02:00
Kostas Karmas
22b9bb77ef Fix reporting the [WinError 10038] exception traceback on sign-in 
Surround the serve_forever function of the web server with a try-catch
on Windows, in order to avoid printing the entire (useless) traceback.
Now a warning message is be displayed in the log instead.

The behavior is untouched in other platforms
 2020-06-05 12:59:31 +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
9e891c201b Merge branch 'master' into CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account 2020-06-04 15:25:43 +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
Jaime van Kessel
fd2a7689cc
Remove overly spammy logging 2020-06-04 14:32:37 +02:00
fieldOfView
c34162a2ba Merge branch 'master' into feature_support_meshes_present 
# Conflicts:
#	cura/Scene/CuraSceneController.py
#	cura/Scene/CuraSceneNode.py
 2020-06-04 10:27:11 +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
Jaime van Kessel
73026a0744
Merge branch 'master' of github.com:Ultimaker/Cura 2020-06-02 14:20:35 +02:00
Jaime van Kessel
0885d1a8e2
Merge branch 'feature_single_instance_preference' of https://github.com/fieldOfView/Cura 2020-06-02 14:16:18 +02:00
Ghostkeeper
19f500834b
Remove use of deprecated extruders property 
Still had this one uncommitted from last Friday. I tested it and it works the same way.
 2020-06-02 11:54:10 +02:00
Ghostkeeper
e68ebb198e
Don't use deprecated extruders property 
Done during Turbo Testing and Tooling.
 2020-05-29 18:14:21 +02:00
Ghostkeeper
0e4830e6ef
Don't use deprecated extruders property 
Done during Turbo Testing and Tooling.
 2020-05-29 18:10:59 +02:00
Ghostkeeper
e98c26a33c
Don't use deprecated extruders property 
Done during Turbo Testing and Tooling.
 2020-05-29 18:07:08 +02:00
Ghostkeeper
b68c3b7301
Remove usage of deprecated extruders property 
Initially PyCharm didn't find this because it's not typed.

Done during Turbo Testing and Tooling.
 2020-05-29 18:06:02 +02:00
Nino van Hooff
98587a9008
Merge pull request #7551 from Ultimaker/doxygen_to_restructuredtext_comments 
Converted doxygen style comments to reStructuredText style
 2020-05-29 16:46:25 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Remco Burema
8bbb69300c
Fix anonymizing home directory if path contains double-backslash. 2020-05-29 12:38:42 +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
Konstantinos Karmas
56e8827d00
Merge pull request #7831 from Ultimaker/CURA-7437_no_internet_cloud_status 
CURA-7437_no_internet_cloud_status
 2020-05-28 10:02:15 +02:00
Nino van Hooff
fbddf88462 Change connection status checking interval to 10s 
CURA-7437
 2020-05-28 09:56:41 +02:00
Jaime van Kessel
280d3f07a6
Merge branch 'CURA-7290_manual_account_sync' of github.com:Ultimaker/Cura 2020-05-26 11:52:14 +02:00
Kostas Karmas
fad02193ab Fix sync button not appearing when opening popup after clicking away 
This was achieved by adding an IDLE state, which is the default state
when opening the account management popup. The state is now reseted
when the popup opens instead of when it closes. In addition, now either
the "You are in sync with your account" label or the "Check account for
updates" button will appear in the popup based on the state, not both.

Finally, with theses changes, if the popup is open and an autosync
occurs, the user will be informed that the account is synced and he/she
will have to close and reopen the popup in order to trigger a manual
update.

CURA-7290
 2020-05-26 09:49:58 +02:00
Ghostkeeper
edf7fdad75
Check first if we have valid vertex data 
The convex hull calculation may fail. If it does, we want to just tomit the convex hull shadow, rather than crash.

Fixes Sentry issue CURA-ST.
 2020-05-25 17:20:39 +02:00
Jaime van Kessel
dff4771fae
Merge branch 'master' of https://github.com/loociano/Cura 2020-05-25 11:29:37 +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
Nino van Hooff
b135da866a Add Cura.API.connectionStatus 
CURA-7437
 2020-05-20 16:06:10 +02:00
Kostas Karmas
f677be14c2 Fix spacing 
CURA-7436
 2020-05-20 15:10:04 +02:00
Kostas Karmas
4e930b4d52 Remove unused "has_cloud_connection" variable 
CURA-7436
 2020-05-20 15:08:05 +02:00
Nino van Hooff
7388829fc1 Change account sync date format back to dd/mm/YYYY 
For consistency with the rest of the application
 2020-05-19 14:32:02 +02:00
Nino van Hooff
23c039a873
Add type hint in cura/API/Account.py 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2020-05-19 14:14:39 +02:00
Nino van Hooff
050878bbfe
Update cura/API/Account.py 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2020-05-19 14:14:10 +02:00
Nino van Hooff
252b993169 Refactor removal warning message to CloudOutputDeviceManager 
CURA-7436
 2020-05-18 16:22:55 +02:00
Nino van Hooff
c61f5a162e Update remote and local printer labels in Machines page 
CURA-7436
 2020-05-18 14:49:05 +02:00
Nino van Hooff
3d19e75c82 Notify user of proper way to remove cloud printer 
CURA-7436
 2020-05-18 14:48:19 +02:00
Luc Rubio
6fe66bf525 Add support for more than one network plugin when adding a network printer by IP address. 2020-05-18 00:16:09 +01: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