GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-07 00:38:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,356 Commits 290 Branches 260 Tags
Commit Graph

7628 Commits

Author SHA1 Message Date
digitalfrost
c3833c2ff8 ArrangeObjectsJob.py: Refactor run method 
arrange from Nest2DArrange will return a boolean so we can simplify
 2022-08-18 12:22:07 +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
1c3479c9fc Refactor check for unknown line types 
Using .where()  clarifies the intent.
 2022-08-05 11:08:20 +02:00
digitalfrost
9ac7eb4da7 Use enumerate to iterate over self._types 
This is more pythonic.
The comparaison in the if block below the for loop now becomes clearer.
 2022-08-05 10:37:02 +02:00
digitalfrost
a39fed1dc3 Use one line conditional assignment 
Use one line conditional assignement instead of if else block.
The intent is now clearer and the code is easier to read.
 2022-08-04 09:45:47 +02:00
digitalfrost
fad47856e4 Rename _start_time to _check_start_time 
This better reflects what _start_time is and makes the code easier
to read. _check_start_time is  self documenting.
The current comment next to _start_time is erroneous
since _start_time is not "measuring the checking time"
 2022-08-03 11:40:15 +02:00
digitalfrost
556b009a9d Fix Bug in timing MachineErrorChecker execution 
We want the Logger in line 215 to give the execution time in seconds
so we don't want the start time to be the epoch.
Currently the logger will output something like
time = 1659518458.5s
not like
time = 3.0s
 2022-08-03 11:26:39 +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
digitalfrost
1bf330df66
Improve layout of comment 
Modify the layout of the comment to improve readability.
Now each sentence starts on a new line.
 2022-07-23 23:19:20 +02:00
digitalfrost
9221c3e21e
Improve layout of comment 
Modify the layout of the comment to improve readability.
Now each sentence starts on a new line.
Add a punctuation mark (comma) to improve clarity.
 2022-07-23 23:11:06 +02:00
digitalfrost
bce60a7d96
Fix typo 
Correct typo (duplicated word)
 2022-07-23 23:02:00 +02:00
digitalfrost
776c71e5c9
Shorten excessively long lines 
- Some lines in the files were excessively long, even in the context of the Cura project which seems to prefer a long line length.
These lines could not be read easily even on github .... 
- Removed some unnecessary whitespaces
- Added some extra spaces so that inline comments are separated by at least two spaces from the statement
 2022-07-23 22:35:18 +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