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

23538 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
9e30efb615 Merge branch 'CURA-7290_manual_account_sync' of https://github.com/Ultimaker/Cura into CURA-7290_manual_account_sync 2020-05-19 13:10:56 +02:00
Jaime van Kessel
8f22e62675
Fix typing issues 
CURA-7290
 2020-05-18 13:47:03 +02:00
Nino van Hooff
94f094380b Log sync state transitions 
CURA-7290
 2020-05-15 11:59:22 +02:00
Nino van Hooff
9acf8b6122 Revert "Add a sync timeout to CloudOutputDeviceManager" 
Stopgap solution is not necessary anymore after CloudOutputDeviceManager
after implementing timeouts on the http-level.

This reverts commit 15f813a4
 2020-05-15 11:32:49 +02:00
Nino van Hooff
f3c66c3189 Refactor CloudApiClient (and ToolpathUploader) to use HttpRequestManager 
Has the benefit of a more unified Http request management + timeouts

CURA-7290
 2020-05-15 11:28:17 +02:00
Nino van Hooff
15f813a4ff Add a sync timeout to CloudOutputDeviceManager 
Fixes an issue where printer syncing breaks when switching networks etc.

CURA-7290
 2020-05-14 15:47:45 +02:00
Nino van Hooff
a9692e3d27 Refactor setManualSyncEnabled 
CURA-7290
 2020-05-14 15:15:16 +02:00
Nino van Hooff
a3f968188f Add timeout to CloudPackageChecker request 
Prevents it from getting stuck in the SYNCING state

CURA-7290
 2020-05-14 15:14:51 +02:00
Nino van Hooff
b6b6a39989 Fix QML typo 
CURA-7290
 2020-05-14 15:13:57 +02:00
Nino van Hooff
e6639eb8eb Do not reserve height for manual sync button 
CURA-7290
 2020-05-13 17:36:24 +02:00
Nino van Hooff
59b40c72f0 Additional scenarios for enabling/disabling the manual sync button 
CURA-7290
 2020-05-13 17:32:57 +02:00
Nino van Hooff
f78fa884c1 Only show the manual sync button after the account popup was closed 
CURA-7290
 2020-05-13 17:19:20 +02:00
Nino van Hooff
72657f15be Add padding to checked icon 
CURA-7290
 2020-05-13 16:38:42 +02:00
Nino van Hooff
6caa0360b9 Change SyncRow copy 
CURA-7290
 2020-05-13 16:35:39 +02:00
Nino van Hooff
de0ef8ae62 Change account sync date format to mm/dd/YYYY 
CURA-7290
 2020-05-13 16:15:29 +02:00
Nino van Hooff
97d1c3200b Remove unused aliases from SyncState.qml 
CURA-7290
 2020-05-13 16:14:21 +02:00
Nino van Hooff
37992e25de Merge remote-tracking branch 'origin/CURA-7290_manual_account_sync' into CURA-7290_manual_account_sync 
# Conflicts:
#	plugins/Toolbox/src/CloudSync/CloudPackageChecker.py
 2020-05-12 15:44:36 +02:00
Nino van Hooff
fbc0be30ec Fix typing issue in CloudPackageChecker 
CURA-7290
 2020-05-12 15:40:53 +02:00
Jaime van Kessel
2cc6b7c54d
Appease mypy 2020-05-12 15:12:28 +02:00
Jaime van Kessel
de957ae5ec
Merge branch 'CURA-7290_manual_account_sync' of github.com:Ultimaker/Cura into CURA-7290_manual_account_sync 2020-05-12 15:09:57 +02:00
Nino van Hooff
b40b8e8489 Merge remote-tracking branch 'origin/master' into CURA-7290_manual_account_sync 
# Conflicts:
#	cura/API/Account.py
 2020-05-12 14:59:01 +02:00
Nino van Hooff
3ca703f00c Merge remote-tracking branch 'origin/CURA-7290_manual_account_sync' into CURA-7290_manual_account_sync 2020-05-12 14:19:51 +02:00
Nino van Hooff
903c251f34 Additional account sync documentation 
CURA-7290
 2020-05-12 14:19:36 +02:00
Jaime van Kessel
6af502088e
Fix typing issue 
CURA-7290
 2020-05-12 13:25:36 +02:00
Ghostkeeper
a2f509c255
Merge branch 'Add_test_for_maximum_platform_mesh_size' 2020-05-12 13:20:55 +02:00
Nino van Hooff
3e1b695c43 Add some missing account sync timer logic 
CURA-7290
 2020-05-12 11:55:50 +02:00
Nino van Hooff
8e75da552d Do not inherit SyncState from QObject 
not necessary and fixes mypy warning

CURA-7290
 2020-05-12 11:23:14 +02:00
Psych0meter
9976889e5e
Leapfrog Creatr HS / XL Integration (#7723) 
Add the leapfrog creatr HS and leapfrog creatr XL
 2020-05-12 11:13:51 +02:00
Jaime van Kessel
d5194cbec6
Merge branch 'mb-fix-es-overhang-shader' of https://github.com/smartavionics/Cura 2020-05-12 11:02:21 +02:00
Jaime van Kessel
897ed099f4
Merge branch 'master' of github.com:Ultimaker/Cura 2020-05-12 11:00:24 +02:00
Ghostkeeper
89fc4c94bf
Add version upgrade for changed Redo Layer parameter of Pause script 
This was changed from a number of layers to just a boolean for 1 or 0 layers.

Contributes to issue CURA-7413.
 2020-05-11 18:50:49 +02:00
Ghostkeeper
aff28d821f
Also reset extrusion for Griffin printers 
The rest may not be necessary but the G92 is crucial if redo layer is activated.

Contributes to issue CURA-7413.
 2020-05-11 18:35:27 +02:00
Ghostkeeper
05b0bf5988
Turn 'Redo Layers' into a boolean for at most 1 layer 
We've deemed it irresponsible to redo multiple layers. This will dig the nozzle back down into the layers that were printed before the pause.

This doesn't include a version upgrade yet.

Contributes to issue CURA-7413.
 2020-05-11 18:34:41 +02:00
Ghostkeeper
1946615fff
Fix asynchronous bug if job gets cancelled 
If the print job happens to get cancelled right after checking if the index is correct, but before actually reading the line, it would get an IndexError when trying to read the line since cancelling the job clears the _gcode list.
This prevents that asynchronous issue by using the internal check in the list access to check that, and just uses an exception to check whether it's reached the end.

Fixes Sentry issue CURA-QC.
 2020-05-11 17:36:24 +02:00
Ghostkeeper
5ccf8e412d
Merge branch 'maukcc-master' 2020-05-11 14:10:19 +02:00
Ghostkeeper
bf8b01efe3
Fix preferred quality type 
This quality type is the only one available.
 2020-05-11 14:10:08 +02:00
Ghostkeeper
98a5321b2b
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 
Conflicts:
	resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg -> Setting version was updated at the same time.
	resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg -> Deleted while we updated setting version.
	resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg -> Deleted while we updated setting version.
	resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg -> Deleted while we updated setting version.
 2020-05-11 14:03:54 +02:00
Konstantinos Karmas
ff8e037f4c
Merge pull request #7704 from Ultimaker/CURA-7429_fix_image_reader_peak_height 
CURA-7429_fix_image_reader_peak_height
 2020-05-11 13:58:11 +02:00
Ghostkeeper
40056c9a04
Update to setting_version 15 
Due to a merge conflict that Git couldn't detect, these are immediately outdated. Let's update them to 15.

Since I knew this would be coming, I didn't change the maximum deviation last time, so now I also don't need to change it back.

Contributes to issue CURA-7384.
 2020-05-11 11:43:37 +02:00
Ghostkeeper
a2946b057a
Merge branch 'master' of github.com:Ultimaker/Cura 2020-05-11 11:41:30 +02:00
Ghostkeeper
f6ad144add
Merge branch '64bittuning-master' 
Fixes CURA-7384.
 2020-05-11 11:40:47 +02:00
Ghostkeeper
0bb65c86ec
Fix default quality level 
Standard doesn't exist for this printer. It's 'normal'. I'm guessing this was a leftover from when this was copied from the Creality printers.
 2020-05-11 11:40:14 +02:00
Ghostkeeper
7210dd308c
Rename Tronxy quality profiles to something more specific to Tronxy 
To Cura the folder doesn't matter. It only reads the filenames and uses those as unique IDs. So for these filenames we'd like to have an ID that is more speciic to this printer to prevent people from crashing.
I'm guessing that the author here already encountered that problem. He copied the files from Creality which has the same problem. However Creality profiles are already published and will be much harder to change the names since they would need to be changed in a version upgrade.

Contributes to issue CURA-7384.
 2020-05-11 11:39:26 +02:00
Konstantinos Karmas
6ea37603f2
Merge pull request #7715 from Ultimaker/CURA-7420_fix_version_upgrader 
New version upgrade for 4.7
 2020-05-11 11:07:44 +02:00
Ghostkeeper
a0f4305420
Remove warnings that will never be visible 
This was copied from the error state, where it does matter, but the warning state is not shown if the setting is not enabled.

Contributes to issue CURA-7384.
 2020-05-11 11:02:37 +02:00
Ghostkeeper
156925d48e
Update to setting_version 14 
This is necessary before merging since these profiles would otherwise still need to be updated during runtime.

Contributes to issue CURA-7384.
 2020-05-11 10:51:44 +02:00
Ghostkeeper
454bff174c
Add correct name of settings guide to ignore list 2020-05-11 09:58:19 +02:00
Ghostkeeper
c79123e6fa
Use spaces to indent 2020-05-11 09:51:20 +02:00
Konstantinos Karmas
0bcb3348da
Merge pull request #7707 from Ultimaker/CURA-7245_fix_bundled_package_sync 
CURA-7245_fix_bundled_package_sync
 2020-05-11 09:49:19 +02:00