3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
23396 commits 313 branches 275 tags 719 MiB
Commit graph

23396 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nino van Hooff
1ae050bbc5 Expose Account.SyncState as an Enum to QML 
Provides a single source of truth

CURA-7290
 2020-05-08 11:09:48 +02:00
Nino van Hooff
8937c63219 Finish merge of auto sync packages 
CURA-7290
 2020-05-06 16:08:47 +02:00
Nino van Hooff
9b79b70f2b Merge branch 'CURA-7290_auto_sync_packages' into CURA-7290_manual_account_sync 
# Conflicts:
#	cura/API/Account.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
 2020-05-06 16:03:37 +02:00
Nino van Hooff
bfae7e9fb1 Replace some hard-coded sync states 
CURA-7290
 2020-05-06 12:54:07 +02:00
Nino van Hooff
ef6cf8d5cc Remove unused pyqtProperty 
CURA-7290
 2020-05-06 12:08:55 +02:00
Nino van Hooff
50ae2064b5 Refactor SyncState logic to SyncState.qml 
CURA-7290
 2020-05-06 11:47:38 +02:00
Nino van Hooff
5b245434d0 Add _last_check_packages type hint 
CURA-7290
 2020-05-04 17:32:54 +02:00
Nino van Hooff
7322526791 Fix typing warning 
CURA-7290
 2020-05-04 17:30:32 +02:00
Nino van Hooff
eac884fcd2 Convert SYNC_STATES to Enum 
CURA-7290
 2020-05-04 17:26:38 +02:00
Nino van Hooff
88ff68e40c Also check for package updates automatically 
Moves the 30-second sync timer from CloudOutputDeviceManager to
Account and subscribes CloudPackageChecker to the timer.

CURA-7290
 2020-05-04 16:56:09 +02:00
Nino van Hooff
637a241d99 Use single qml file for sync states 
CURA-7290
 2020-05-04 15:13:38 +02:00
Nino van Hooff
eeea1692fd Register CloudPackageChecker as Account sync service 
CURA-7290
 2020-05-04 14:08:36 +02:00
Nino van Hooff
049c1946d4 Create Account sync state interface to allow for multiple sync services 
Needed to add the package sync

CURA-7290
 2020-05-04 13:52:40 +02:00
Nino van Hooff
81d02d5d58 Implement printer cloud sync error state 
CURA-7290
 2020-05-04 13:19:16 +02:00
Nino van Hooff
4e7f446fe1 Account sync: create additional sync states 
CURA-7290
 2020-05-04 11:26:20 +02:00
Nino van Hooff
4b88247af8 Account sync: remove debug info 
CURA-7290
 2020-05-01 17:49:40 +02:00
Nino van Hooff
acf36d1e42 Add Account sync last update datetime 
CURA-7290
 2020-05-01 17:44:58 +02:00
Nino van Hooff
0aed6d3731 Connect the manual sync button 
CURA-7290
 2020-05-01 15:56:09 +02:00
Nino van Hooff
a6c0ee6c82 Connect rotation animation to isSyncingChanged 
Code would be much cleaner if alwaysRunToEnd could be combined with
Animation.Infinite loops to complete the current loop

CURA-7290
 2020-05-01 14:50:18 +02:00
Nino van Hooff
42f5456ed4 Animate the sync icon 
CURA-7290
 2020-04-30 17:26:12 +02:00
Nino van Hooff
828e931f52 Add manual sync button (non-functional) 
CURA-7290
 2020-04-30 17:19:14 +02:00
Nino van Hooff
4fd5c6e337 Add account sync assets 
CURA-7290
 2020-04-30 17:18:20 +02:00
Jaime van Kessel
d2be622d48
Merge branch '3mf_platform_meshes' of github.com:Ultimaker/Cura 2020-04-30 14:18:28 +02:00
Kostas Karmas
80a4cfbd75 Remove duplicated line 
This line is called both outside and inside of _setOutputDeviceMetadata(...)

CURA-7055
 2020-04-30 14:03:34 +02:00
Jaime van Kessel
db7429488d
Merge branch 'del_scripts_pycache' of github.com:Ultimaker/Cura 2020-04-30 13:50:57 +02:00
Jaime van Kessel
b7081f9c68
Merge branch 'master' of github.com:Ultimaker/Cura into 3mf_platform_meshes 2020-04-30 13:47:28 +02:00
Jaime van Kessel
2147b2064c
Merge branch '4.6' of github.com:Ultimaker/Cura 2020-04-30 10:37:28 +02:00
konskarm
98eda12f60
Merge pull request #7418 from Evg33/UNI_3D_profiles 
Adding profiles for UNI 3D Series printers
 2020-04-29 17:24:24 +02:00
Evg33
436d36ae90 UNI3D: fix startup code and machine_extruder_count=2 2020-04-29 18:10:43 +03:00
Remco Burema
4b4864485c
CURA-7409 Update keep/discard dialog more. 2020-04-29 16:23:06 +02:00
Kostas Karmas
61e2cc1193 Fix missing type for result 2020-04-29 15:33:28 +02:00
Jaime van Kessel
1775903335
Merge branch 'CURA-7404_fix_xray_green' of github.com:Ultimaker/Cura 2020-04-29 14:59:53 +02:00
Ghostkeeper
dfa021ab20
Fix upgrade of preference if visible settings was not modified 
Oops. Small oversight. This could lead to the preferences file being erased completely.

Found during work on Sentry issue CURA-NH.
 2020-04-29 14:10:07 +02:00
Ghostkeeper
abffb6c26c
Don't crash when reading corrupt 3MF files 
Otherwise it would crash with a BadZipFile error. We should be robust against that. This will trigger a generic message that we couldn't read that file to the user, and put more information in the log.

Fixes Sentry issue CURA-NH.
 2020-04-29 14:07:04 +02:00
Ghostkeeper
dcac9b6a87
Prevent a crash when retrying even though it completed in the meanwhile 
Fixes Sentry issue CURA-NA.
 2020-04-29 14:07:03 +02:00
Ghostkeeper
bf3d6c67d9
Check the bounding box before using it 
Some objects don't have a bounding box if they are improperly constructed by a plug-in.

Fixes Sentry issue CURA-N3.
 2020-04-29 14:07:03 +02:00
Jaime van Kessel
481da09975
Merge branch 'master' of github.com:Ultimaker/Cura 2020-04-29 13:51:35 +02:00
Jaime van Kessel
084e80bcda
Only connect a cloud printer if it's the active one 
By splitting up the correctly setting of metadata and actually
connecting, the distinction can be made.

CURA-7055
 2020-04-29 13:48:06 +02:00
Remco Burema
476262acc7
Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-04-29 13:03:25 +02:00
Remco Burema
3604e75cce
CURA-7409 Update keep/discard dialog. 2020-04-29 13:02:48 +02:00
Remco Burema
4c4e611629
Fix x-ray error color. 
X-ray errors showed as green and translucent instead of read and solid. Now fixed.
CURA-7407
 2020-04-29 12:06:20 +02:00
Kostas Karmas
64cfe423fe Fix moving to next page when no printers in account 
Fixed a bug where the welcome wizard was not moving to the next page
if the account had no printers connected to it.

CURA-7019
 2020-04-29 11:49:45 +02:00
maht
c29ebc8a77
Updated change log for 4.6.1 2020-04-29 10:58:11 +02:00
Ghostkeeper
8386d094d3
Improve translation of 'tree support' in German 
As discussed in #7590.
 2020-04-29 02:08:09 +02:00
Jaime van Kessel
9e68bcb7a0
Merge branch 'feature_objectlist_improvements' of https://github.com/fieldOfView/Cura 2020-04-28 15:40:08 +02:00
Evg33
bee9947d84 UNI3D CR at end of files 2020-04-28 16:29:07 +03:00
Evg33
b87444f571 UNI3D setting_version 13 2020-04-28 16:26:25 +03:00
Evg33
6b51f62411 UNI3D platforms 2020-04-28 16:09:10 +03:00
Evg33
80e0078979 UNI3D settings version 13 2020-04-28 15:56:34 +03:00
Evg33
61cfcf6b08 UNI3D extruders 2020-04-28 15:43:54 +03:00