3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-30 06:11:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
29989 commits 344 branches 300 tags 757 MiB
Commit graph

7160 commits

Author SHA1 Message Date
digitalfrost
60c8712b10 CuraContainerStack.py: improve TypeIndexMap 
Cleaner and more idiomatic way to reverse a dictionary
 2022-08-09 11:42:18 +02:00
digitalfrost
54b9ed97ae Use is not operator rather than not ... is 
This is advocated by both PEP8 and the Google Python Style Guide
 2022-08-08 10:04:46 +02:00
digitalfrost
ff07129f2c Use is not operator rather than not ... is 
This is advocated by both PEP8 and the Google Python Style Guide
 2022-08-08 10:04:46 +02:00
digitalfrost
06e61a3129 Use is not operator rather than not ... is 
This is advocated by both PEP8 and the Google Python Style Guide
 2022-08-08 10:04:46 +02:00
digitalfrost
cba2e07adc
Remove extra spaces 2022-08-02 09:08:46 +02:00
digitalfrost
b13b7a892d Move _error_check_timer initialization to a separate function 
This simplifies understanding the class __init__ function
 2022-08-02 08:55:17 +02:00
Jelle Spijker
7b768ca810
Merge pull request #12866 from Ultimaker/CURA-9220_hide_if_no_permission 
Hide cloud interaction buttons if the user has no permissions to them
 2022-08-01 12:41:11 +02:00
j.spijker@ultimaker.com
d1e8ae1ca7 Fix curapackage intent and intents mappings 
Contributes to SD-3871 and CURA-7667
 2022-08-01 11:16:48 +02:00
Ghostkeeper
84cf72d58f
Document shortcoming of isMine check 
Contributes to issue CURA-9220.
 2022-08-01 10:49:29 +02:00
Ghostkeeper
da289b51d0
Deprecate additionalRights property 
Consumers should now use the permissions system which gets the permissions from the account via a separate API call.

Contributes to issue CURA-9220.
 2022-08-01 10:49:29 +02:00
digitalfrost
cfeab2e6c0 Use dataclasses for Peripheral 
Since Peripheral is a data class use dataclasses
 2022-07-31 11:46:03 +02:00
j.spijker@ultimaker.com
d9e3e4d395 Made slice_uuid a public field 
Contributes to CURA-9031
 2022-07-29 12:13:12 +02:00
j.spijker@ultimaker.com
a712e7517a Add the received slice_uuid to the print information 
Contributes to CURA-9031
 2022-07-27 18:12:25 +02:00
Ghostkeeper
8871fd6224
Add property of the print job being made by the current user 
According to the Account API, is this print job made by the same user?
This property is a bit inaccurate, in that this matches by the user name. The user name might be duplicate in some systems.

Contributes to issue CURA-9220.
 2022-07-25 17:28:56 +02:00
Ghostkeeper
f3403ff856
Add property to get the list of permissions for the user 
The QML code can read this list and see if certain keys are in the list.

Contributes to issue CURA-9220.
 2022-07-25 15:57:51 +02:00
Ghostkeeper
c529f2b31a
Upon syncing, get account permissions from API 
This incurs another request every minute. But it's not provided by the log-in itself and can change, so that'll be necessary.

Contributes to issue CURA-9220.
 2022-07-25 15:33:46 +02:00
jspijker
a4461a618f Merge branch '5.1' 
# Conflicts:
#	conandata.yml
 2022-07-19 16:52:20 +02:00
c.lamboo
3dad5d564d Only unquote once in getMaterialFilePackageId 2022-07-19 14:12:35 +02:00
c.lamboo
1e9e3a8cfb Fix saving materials with spaces 2022-07-19 13:54:32 +02:00
Jelle Spijker
e62e1e7401
Move one directory up 
Contributes to CURA-9365
 2022-07-15 17:42:26 +02:00
j.spijker@ultimaker.com
1e4fe93d64
Output to log if no conan_install_info.json was found 
Contributes to CURA-9365
 2022-07-15 17:41:59 +02:00
j.spijker@ultimaker.com
7f27058a6b
Output the Conan Info to the logs 
Contributes to CURA-9365
 2022-07-15 17:37:37 +02:00
j.spijker@ultimaker.com
0c658ccbc5
Reads the conan_install_info int ApplicationMetadata 
Contributes to CURA-9365
 2022-07-15 17:04:26 +02:00
j.spijker@ultimaker.com
8500e34f25 Use the app_root to obtain the resources 
Contributes to CURA-9365
 2022-07-08 09:26:27 +02:00
Ghostkeeper
9839393912
Update SDK version to 8.1.0 
There are new functionalities and QML elements for developers to play with.
 2022-07-01 09:04:49 +02:00
Ghostkeeper
83bad98ea3
Merge branch 'CURA-9365_fix_building_cura_main' into 5.1 2022-06-30 17:48:38 +02:00
j.spijker@ultimaker.com
ed3f342e7f Search unsecure when not frozen 
Also added share/<dep>/resources releative to sys.executable

Contributes to CURA-9365
 2022-06-29 15:48:04 +02:00
j.spijker@ultimaker.com
2cee093d0b Map new conan local cache resources 
Contributes to CURA-9365
 2022-06-29 15:42:24 +02:00
Casper Lamboo
a5d70dca16
Merge pull request #12590 from Ultimaker/CURA-7667_intents_in_packages 
Intents in packages
 2022-06-29 13:12:51 +02:00
Ghostkeeper
8724c8cec9
Merge branch '5.1' into CURA-9365_fix_building_cura_main 2022-06-29 12:06:03 +02:00
c.lamboo
8a905fcb7d Merge remote-tracking branch 'origin/CURA-9365_fix_building_cura_main' into CURA-9365_fix_building_cura_main 2022-06-27 15:47:03 +02:00
c.lamboo
a967462038 Add res folder to resource folder 
CURA-9365
 2022-06-27 15:39:48 +02:00
j.spijker@ultimaker.com
62aacc5946 Initial set-up of deploy functionality 
Contributes to CURA-9365
 2022-06-27 13:51:50 +02:00
Casper Lamboo
fd09bcfb9b
Merge pull request #12476 from Ultimaker/CURA-9271 
[CURA-9271] Build plate shrinks when using horizontal scaling shrinkage compensation
 2022-06-27 09:09:37 +02:00
j.delarago
41cc78af1a Add at a minumum a very small border around the edges of the build plate. Otherwise models with shrinkage compensation (or any model with disallowed areas around it) can be placed so that the output model is off the build plate. 
CURA-9271
 2022-06-24 15:00:42 +02:00
Jaime van Kessel
7685540709 Ensure that intents and variants are also copied from packages 
Although we only really need the intents, it doesn't hurt to also include the variants.
No idea if we will ever need or use it, but we might as well add it now.

CURA-7667
 2022-06-23 14:14:22 +02:00
Jelle Spijker
cd12d24584 Merge remote-tracking branch 'origin/5.1' into CURA-9365_fix_building_cura_main 2022-06-21 07:52:58 +02:00
Jaime van Kessel
d05417f7f0 Remove duplicated code 
CURA-9352
 2022-06-17 15:22:33 +02:00
Jelle Spijker
f6aa409701 Merge remote-tracking branch 'origin/5.1' into CURA-9365_fix_building_cura_main 2022-06-17 10:01:04 +02:00
j.delarago
9dff733345 Remove todos that are no longer applicable 
Remove debug print statement

CURA-9321
 2022-06-16 15:32:33 +02:00
j.delarago
1a464051d4 On initial startup, when assigning your first printer the ActiveIntentQualitiesModel.py would not be updated. Causing an error unsupported configuration to show. 
Fixed by updating the model when the globalContainer is changed as well.

CURA-8849
 2022-06-16 14:27:13 +02:00
Jelle Spijker
b8a4243e26 Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-16 10:48:41 +02:00
Jaime van Kessel
ac32f3b625
Merge pull request #12530 from Ultimaker/CURA-8610_save_required_packages_metadata 
[CURA-8610] save required packages metadata
 2022-06-16 10:47:06 +02:00
j.delarago
8c92ebfccd Add missing import 
CURA-8849
 2022-06-16 10:41:06 +02:00
Jelle Spijker
d9b9959346 Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-16 09:54:20 +02:00
Casper Lamboo
dd76369b9a
Merge pull request #12528 from Ultimaker/CURA-8849 
[CURA-8849] Improve intent profile selection
 2022-06-15 18:24:18 +02:00
j.delarago
f9dda40409 Better typing 
CURA-8849
 2022-06-15 17:41:21 +02:00
j.delarago
6f8470167f Suggested changes 
CURA-8849
 2022-06-15 17:40:07 +02:00
Joey de l'Arago
142f1823b3
Apply suggestions from code review 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:31:40 +02:00
Joey de l'Arago
b132b5c08c
Update cura/Machines/Models/IntentSelectionModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:29:59 +02:00