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

27073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
3ffffad1ed
Send progress update when failed 
And update all of the printer statuses to make them appear failed, if we have a general failure in an earlier stage.

Contributes to issue CURA-8609.
 2021-10-12 16:15:58 +02:00
Konstantinos Karmas
f68d915235
Merge pull request #10509 from Ultimaker/PP-1-Improved_print_profiles 
Various print profile improvements for the UM3, S3 and S5
 2021-10-12 16:10:48 +02:00
Ghostkeeper
0fa6f650f6
Expose printer status updates via progress update signal 
This way we can ask the printer status from QML even if it's updated via a job on a different thread and different class and all that.

Contributes to issue CURA-8609.
 2021-10-12 16:06:53 +02:00
Ghostkeeper
8607eb5cff
Store printer sync status flag per printer 
Because we'll need to display it per printer.

Contributes to issue CURA-8609.
 2021-10-12 15:49:43 +02:00
Ghostkeeper
54d51536b0
Improve error-handling per printer 
We can now know which printers failed to sync and which succeeded.

Contributes to issue CURA-8609.
 2021-10-12 13:55:03 +02:00
Ghostkeeper
d4d17095bb
Implement confirming for all printers to send material sync 
We need to make this request for every printer.

Contributes to issue CURA-8609.
 2021-10-12 13:39:04 +02:00
Ghostkeeper
f677b338fd
Always provide error message if upload failed 
Contributes to issue CURA-8609.
 2021-10-12 13:19:09 +02:00
Ghostkeeper
a6b6b075ea
Always provide error message if upload failed 
Contributes to issue CURA-8609.
 2021-10-12 13:16:28 +02:00
Ghostkeeper
4ccd4caaad
Store material profile ID received from the upload request 
We'll need this later to be able to tell the server which material archive it should send to certain printers.

Contributes to issue CURA-8609.
 2021-10-12 13:04:22 +02:00
Ghostkeeper
bdc269f8ab
Provide file size and an arbitrary name to the upload request 
Apparently the Cloud will need to know the file size before it gets uploaded. It is used as a redundancy code to verify that it's not corrupt there.
Perhaps they should ask for a CRC instead, being more reliable against an upload containing only null bytes or whatever, but that is not up to me to decide.

Contributes to issue CURA-8609.
 2021-10-12 13:00:08 +02:00
Ghostkeeper
f0d69cbef2
Add file data to PUT request 
The main point of the whole request, really.

Contributes to issue CURA-8609.
 2021-10-12 12:56:19 +02:00
p.kuiper
7deb31db98 Bug fixes. 
- Removed default value when value is already set.
 - Make sure UM3 and UM3 extended variants are the same
 2021-10-12 12:54:26 +02:00
Ghostkeeper
d5e3ed4c0e
New material API endpoint URL 
This is the new URL they have settled on.

Contributes to issue CURA-8609.
 2021-10-12 11:39:26 +02:00
Ghostkeeper
125c80430b
Show more information about errors we're getting 
Show the error code we received in the GUI, and allow expansion for different types of errors.

Contributes to issue CURA-8609.
 2021-10-12 11:30:12 +02:00
Ghostkeeper
025ef743ee
Track progress from export job 
This way we can show a progress bar.

Contributes to issue CURA-8609.
 2021-10-12 10:24:07 +02:00
Ghostkeeper
052e33e66b
Don't anchor status label to button any more 
It's now in a completely different place.

Contributes to issue CURA-8609.
 2021-10-12 10:17:03 +02:00
Ghostkeeper
4661b02e4c
Move code and status related to uploading materials to separate class 
There's quite a lot of status to track, errors and progress. It's better kept separate.

Contributes to issue CURA-8609.
 2021-10-12 09:43:21 +02:00
p.kuiper
17ea8d0de7 Merge remote-tracking branch 'origin/PP-1-Improved_print_profiles' into PP-1-Improved_print_profiles 
# Conflicts:
#	resources/definitions/ultimaker3.def.json
#	resources/definitions/ultimaker_s3.def.json
#	resources/definitions/ultimaker_s5.def.json
 2021-10-12 09:31:20 +02:00
Remco Burema
e29edb0cc9
Added lightning infill description and sub-settings level. 
part of CURA-8550
 2021-10-12 09:17:58 +02:00
Konstantinos Karmas
9bb31dd468
Merge pull request #10589 from Ultimaker/remove_unneeded_catalog 
Remove unneeded catalog
 2021-10-12 09:10:05 +02:00
p.kuiper
fb645a2454 Merge remote-tracking branch 'origin/PP-1-Improved_print_profiles' into PP-1-Improved_print_profiles 
# Conflicts:
#	resources/definitions/ultimaker3.def.json
#	resources/definitions/ultimaker_s3.def.json
#	resources/definitions/ultimaker_s5.def.json
 2021-10-12 09:09:05 +02:00
Ghostkeeper
c3d392c5cf
Show upload error or success in header once completed 
According to the brand new design.

Contributes to issue CURA-8609.
 2021-10-11 15:27:54 +02:00
Ghostkeeper
8ae93c6bc1
Resolve binding loops in sync spinner 
Contributes to issue CURA-8609.
 2021-10-11 15:19:06 +02:00
Ghostkeeper
ffd3277854
Show error if the upload failed 
Contributes to issue CURA-8609.
 2021-10-11 14:57:21 +02:00
Ghostkeeper
ffee4a2443
Show syncing spinner while syncing 
Rather than disabling the sync button, hide it completely and show this spinner instead.

Contributes to issue CURA-8609.
 2021-10-11 14:30:10 +02:00
Ghostkeeper
56eb694745
Hide refresh button if there are no offline printers 
It's not considered a big use case when the user has already added some printers but would want to add more while syncing materials to those printers.

Contributes to issue CURA-8609.
 2021-10-11 14:11:28 +02:00
Ghostkeeper
9ffbaa772f
Add back button to return from USB workflow to welcome screen 
This allows the user to see the welcome screen instructions again. Or to switch back to internet-syncing if they accidentally pressed the USB button (or were just curious).

Contributes to issue CURA-8609.
 2021-10-11 13:58:05 +02:00
p.kuiper
0239ce8a78 - Bug fix error due to string overrides. 
- "Minimum_value" changed to "minimum_warning_value"
- PVA (BB0.4 and BB0.8) require low support jerk settings for good adhesion
- Support roof does follow print_jer and no warning levels set
 2021-10-11 13:53:21 +02:00
Ghostkeeper
43bcd2b56a
Implement info icon with UM.StatusIcon 
This way the sizes are consistent with the other similar icons in the UI.

Contributes to issue CURA-8609.
 2021-10-11 13:49:45 +02:00
Ghostkeeper
da76280359
Make USB image a bit larger 
This is more in line with the design.

Contributes to issue CURA-8609.
 2021-10-11 13:38:41 +02:00
Ghostkeeper
e7b49ee551
Disable sync button while in progress 
Need to show a bit more feedback I think. Let's see what the design said...

Contributes to issue CURA-8609.
 2021-10-11 13:11:54 +02:00
p.kuiper
6c67b03a55 - Reverted the print profiles to changes agreed by the Print Profile CCB from 06-10-2021 14:00-15:00 2021-10-11 11:35:38 +02:00
legend069
3b639d2119 Update ChangeAtZ.py 
updated, as suggested by
https://github.com/Ultimaker/Cura/pull/10554#issuecomment-939812755
 2021-10-11 19:57:42 +11:00
Ghostkeeper
4aa10ba42f
Use initial layer line width factor from adhesion extruder 
This is a per-extruder setting. So get it from the proper extruder.
 2021-10-11 10:08:11 +02:00
Konstantinos Karmas
4759007ed8
Merge pull request #10580 from Ultimaker/CURA-8443_Add_sign_in_status_datapoint 
CURA-8443: Add is_logged_in status datapoint
 2021-10-11 10:01:52 +02:00
p.kuiper
730fb72f78 Merge branch 'master' into PP-1-Improved_print_profiles 2021-10-11 08:09:05 +02:00
Jaime van Kessel
9ca5a52659 Also speed up the expression for the value of a setting item 2021-10-08 18:35:02 +02:00
Jaime van Kessel
512b0a1dbe Remove unneeded catalog 
The catalog was created over and over again even though it wasn't needed.
On my machine this took 0.25 seconds, so it does add up
 2021-10-08 18:17:18 +02:00
Jaime van Kessel
285a4584e7 Improve speed of the inherit button 
A few unneeded conversions were done. Also moved one check to python from JS
 2021-10-08 18:12:35 +02:00
Ghostkeeper
9729f4f3d2
Set properties immediately upon constructing 
Instead of afterwards. A bit more efficient.

Contributes to issue CURA-8609.
 2021-10-08 17:46:10 +02:00
Ghostkeeper
fb7e67b8ad
Change 'hit' to 'click' 
This is more consistent with other texts.

Contributes to issue CURA-8609.
 2021-10-08 16:51:04 +02:00
Ghostkeeper
2b785343b5
Implement basic uploading of material 
Steps involved are:
- Create an archive of all materials.
- Request the cloud API to provide a URL to upload the archive to.
- Upload the archive to that API.

Currently the two internet requests are asynchronous, meaning that the job will 'end' before the upload is complete. Most likely the job instance will even be deleted before we get a response from the server. So this won't work, really. Need to structure that a bit differently. But I want to save this progress because it embodies the happy path well.

Contributes to issue CURA-8609.
 2021-10-08 16:02:31 +02:00
Ghostkeeper
042bd46fba
Don't import CuraApplication if not type checking 
Otherwise we'll get unnecessary import loops here.

Contributes to issue CURA-8609.
 2021-10-08 15:59:42 +02:00
Ghostkeeper
599c59bd3a
Add a background job to upload material archives 
It creates the archive now. It doesn't yet upload it.

Contributes to issue CURA-8609.
 2021-10-08 15:15:57 +02:00
Ghostkeeper
a7f172d836
Only show online printers in list of printers to sync to 
We can only sync with printers that are currently online.
We'll just send it to the account to sync with everything. But these are the ones it should arrive with.

Contributes to issue CURA-8609.
 2021-10-08 14:22:46 +02:00
Ghostkeeper
07b2c1b777
Add option to only show printers that are online 
I have a feeling this will be abused later. But fine. We currently need it for the list of printers that we can sync materials to via the cloud.

Contributes to issue CURA-8609.
 2021-10-08 14:21:03 +02:00
Ghostkeeper
8234276204
Add log entry when syncing with cloud printers 
Not only do I now have an interface where the user doesn't get any feedback when syncing happens, but even in the log there was nothing shown when it happens.

Contributes to issue CURA-8609.
 2021-10-08 14:13:54 +02:00
Ghostkeeper
32c63c2757
Add isOnline role to GlobalStacksModel 
This way we can filter for only online printers or display whether printers are online or not in the future.

Contributes to issue CURA-8609.
 2021-10-08 14:09:12 +02:00
Ghostkeeper
93953630ec
Update online status when updating account printer status 
This updates the metadata entries. Naturally this updates every 60 seconds in Cura, but it could also manually be triggered by the refresh button.

Contributes to issue CURA-8609.
 2021-10-08 14:08:02 +02:00
Remco Burema
2ed837ba71
Merge pull request #10486 from Ultimaker/use_empty_qurl_if_path_doesnt_exist 
Only return the path if the folder actually exist
 2021-10-08 14:01:01 +02:00