GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-12 23:48:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,644 Commits 290 Branches 260 Tags
Commit Graph

7988 Commits

Author SHA1 Message Date
Nino van Hooff
176919eee0 Merge branch 'master' into doxygen_to_restructuredtext_comments 
# Conflicts:
#	plugins/CuraEngineBackend/CuraEngineBackend.py
#	plugins/CuraEngineBackend/StartSliceJob.py
 2020-05-08 15:31:23 +02:00
Nino van Hooff
797d6ed438 Convert doxygen to rst for CuraEngineBackend 2020-05-08 15:23:51 +02:00
Nino van Hooff
8f3827d5ae Convert doxygen to rst for 3MFReader/Writer and AMFReader 2020-05-08 15:14:39 +02:00
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
Ghostkeeper
c3c144345b
Add version upgrade to halve the maximum deviation once again 
As explained in the comment. We reverted a change in 4.6, so we must unrevert it in master again.

Contributes to issue CURA-7420.
 2020-05-08 09:30:54 +02:00
Ghostkeeper
b02354b209
Merge branch '4.6' 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py -> On master we removed the getCfgVersion function, while we moved the entire plug-in to a different folder in 4.6.
	resources/definitions/skriware_2.def.json -> On master we merged a PR that changes more or less all settings, while on 4.6 we doubled the maximum deviation.
 2020-05-08 09:10:02 +02:00
Remco Burema
23cdf871c1
Add comments: Why a matrix4x4 and not a sampler1d? 
part of CURA-7426
 2020-05-07 18:55:55 +02:00
Nino van Hooff
5a3bcb6161 Fix image reader peak height 
CURA-7429
 2020-05-07 14:29:30 +02:00
Kostas Karmas
6ffd250965 Format spacing 
CURA-7426
 2020-05-07 14:10:45 +02:00
Remco Burema
99e99e4650
Layerview can now deal with visibility extruder nrs. 4+ 
part of CURA-7426
 2020-05-06 18:03:32 +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
3ac0e7bed9 Consider all packages when calculating account discrepancies 
Not just the user-subscribed ones

CURA-7245
 2020-05-06 16:01:36 +02:00
Nino van Hooff
bfae7e9fb1 Replace some hard-coded sync states 
CURA-7290
 2020-05-06 12:54:07 +02:00
Remco Burema
2687578a86
Merge pull request #7624 from Ultimaker/CURA-7022_Add_cloud_printer_within_add_a_connected_printer 
Cura 7022 add cloud printer within add a connected printer
 2020-05-06 11:13:27 +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
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
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
Kostas Karmas
69f23eca94 Double the maximum deviation again in the versionUpgrade460to462 
CURA-7421
 2020-05-04 13:22:22 +02:00
Nino van Hooff
81d02d5d58 Implement printer cloud sync error state 
CURA-7290
 2020-05-04 13:19:16 +02:00
Kostas Karmas
96fde43ae8 Up the setting version inside the VersionUpgrade460to462 
CURA-7421
 2020-05-04 13:12:17 +02:00
Kostas Karmas
aab2257574 Up the setting version to 14 in CuraApplication 
CURA-7421
 2020-05-04 13:06:19 +02:00
Kostas Karmas
74bc40eb90 Add version upgrade 460to462 
CURA-7421
 2020-05-04 13:03:21 +02:00
Kostas Karmas
524a072420 Merge version upgrade 45to46 with 46to47 
CURA-7421
 2020-05-04 13:00:17 +02:00
Nino van Hooff
0aed6d3731 Connect the manual sync button 
CURA-7290
 2020-05-01 15:56:09 +02:00
Jaime van Kessel
245a4435e1
Also handle sceneChanged when it's from the root 
The rest of the code also seems to expect that
 2020-05-01 14:39:23 +02:00
Rodrigo Sclosa
d354c9f8ca Included two fields on PauseAtHeight script for user to put custom GCODE before and after the pause, such as a beep code. 2020-04-30 16:37:20 -03:00
Rodrigo Sclosa
f9868a5aa4 Revert "Included two fields on PauseAtHeight script for user to put custom GCODE before and after the pause, such as a beep code." 
This reverts commit 323c374cc4477a3a143b932fefb77929c70da7ec.
 2020-04-30 16:34:20 -03: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
Kostas Karmas
b008f1e823 Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-29 15:37:53 +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
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
Kostas Karmas
eda868f938 Make the discovered cloud printers model generic 
Removed the dependency of the DiscoveredCloudPrintersModel on CloudOutputDevice,
which is Ultimaker specific. This can allow even external plugins to add to this
model in the future.

CURA-7022
 2020-04-29 13:31:45 +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
e4a6fe954d Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-28 17:45:55 +02:00
Kostas Karmas
ea404af973 Transfer cloudPrintersDetectedChanged in DiscoveredUltimakerCloudPrintersModel 
CURA-7022
 2020-04-28 14:19:28 +02:00
Remco Burema
aaee651369
Fix comment. 
a smaller part of CURA-7404
 2020-04-28 13:28:02 +02:00
Remco Burema
242e0d403e
Clean pycache for scripts as well. 2020-04-28 12:11:55 +02:00
Kostas Karmas
6583f5f5ac Reset the model when pressing the Add cloud printer button 
CURA-7022
 2020-04-28 12:08:48 +02:00
Jaime van Kessel
174b58374a
Remove unneeded unit tests 
The code was moved to uranium, so no need to test them in a plugin.

In some cases they were also testing a specific implementation artifact and not
actual expected behavior.

CURA-7388
 2020-04-28 10:23:36 +02:00
Kostas Karmas
49cb1d325e Update the DiscoveredCloudUltimakerPrinters model 
Whenever new cloud devices are detected on the ultimaker account, add
them to the model

CURA-7022
 2020-04-24 19:17:34 +02:00
Rodrigo Sclosa
323c374cc4 Included two fields on PauseAtHeight script for user to put custom GCODE before and after the pause, such as a beep code. 2020-04-23 20:15:10 -03:00
Remco Burema
1475a999b0
Merge pull request #7575 from Ultimaker/CURA-7367_update_image_and_copy_in_enterprise_version 
Cura 7367 update image and copy in enterprise version
 2020-04-23 16:08:06 +02:00