3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
29960 commits 307 branches 272 tags 787 MiB
Commit graph

7139 commits

Author SHA1 Message Date
Jelle Spijker
63dc79dca1
Merge pull request #13082 from digitalfrost/200822 
OnExitCallbackManager.py: improve documentation
 2022-08-23 10:27:21 +02:00
Jelle Spijker
cc9a413a49
Merge pull request #12909 from digitalfrost/310722 
Use dataclasses for Peripheral
 2022-08-23 10:23:47 +02:00
Jelle Spijker
67c8585c68
Merge pull request #12929 from digitalfrost/020822 
MachineErrorChecker.py: Move _error_check_timer initialization to a separate function
 2022-08-23 10:19:24 +02:00
Jelle Spijker
896cfb2a7e
Merge pull request #12989 from digitalfrost/090822b 
CuraContainerStack.py: improve TypeIndexMap
 2022-08-23 09:57:05 +02:00
Jelle Spijker
d262d71b5d
Merge pull request #13089 from Ultimaker/CURA-9277_cloud_printer_types 
Cura 9277 cloud printer types
 2022-08-22 17:03:58 +02:00
joeydelarago
c80dd62169 Fix circular import. 
CURA-9277
 2022-08-22 16:34:18 +02:00
joeydelarago
3413caab62 Set latest.json location back to ultimaker website. 
CURA-9272
 2022-08-22 16:29:08 +02:00
c.lamboo
5884aa3311 Add comment about circular import 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-22 15:03:48 +02:00
c.lamboo
f6bf7050fb Revert "Move cura-import to top of the file" 
This reverts commit 5082e64f0c.
 2022-08-22 15:01:51 +02:00
c.lamboo
5082e64f0c Move cura-import to top of the file 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-22 14:58:32 +02:00
Casper Lamboo
35502e45fa
Apply suggestions from code review 
CURA-9277

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-08-22 14:48:04 +02:00
Casper Lamboo
5761b3f27b
Typing 
CUR-9277

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-08-22 14:35:07 +02:00
Casper Lamboo
77a179be76
Code style 
CURA-9277

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-08-22 14:32:59 +02:00
joeydelarago
d83673a972 Use ConnectionType enum 
Move import statement

CURA-9277
 2022-08-22 14:25:17 +02:00
c.lamboo
61ce8dff7d Add the abstract stack to the Resources 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-22 11:58:05 +02:00
c.lamboo
c4be0e298c Add mime type to AbstractMachine 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-22 11:57:18 +02:00
joeydelarago
544ac33537 Add resource type for abstract machine so they can be saved. 
CURA-9277
 2022-08-22 10:33:47 +02:00
digitalfrost
50d81225da Improve documentation string 
onCurrentCallbackFinished documentation string:
- Improve clarity
- Fix grammar
- Improve layout and shorten line length
 2022-08-20 19:40:58 +02:00
digitalfrost
d9fb352ee2 Fix typo 2022-08-20 19:27:32 +02:00
digitalfrost
fe2b8ebaf7 Improve triggerNextCallback documentation 
triggerNextCallback documentation:
- Correct grammar
- Shorten lines and improve layout
 2022-08-20 19:22:28 +02:00
digitalfrost
62d05f2350 OnExitCallbackManager.py: Improve docstring layout 
- Reduce line length.
- More logical line breaks.
 2022-08-20 19:12:44 +02:00
digitalfrost
6298bb50ce OnExitCallbackManager.py: Fix grammar 
Grammatical correction of docstring
 2022-08-20 18:58:03 +02:00
digitalfrost
6df4d7677a Fix typo 2022-08-20 18:51:59 +02:00
c.lamboo
963110a9c6 Remove Fix me 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 16:41:02 +02:00
c.lamboo
f22d446fa4 Implement getMachines function 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 16:35:13 +02:00
c.lamboo
d7f119415f Use pretty-printed string for the AbstractMachine name 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 16:35:00 +02:00
c.lamboo
761bf3b8fa Fix creating abstract machines on account sync 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 14:44:19 +02:00
joeydelarago
b82f1f4a8c Add new Abstract machine stack type. This represents a type of printers (ultimaker_s3 etc). 
These are created whenever a cloud printer of a new printer type is added.

CURA-9277

Co-authored-by: casperlamboo <c.lamboo@ultimaker.com>
 2022-08-19 13:53:43 +02:00
joeydelarago
57d739a848 Move source of truth for latest.json url into ApplicationMetadata.py and out of the Uranium repository. 
CURA-9272
 2022-08-15 15:43:37 +02:00
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