GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-10-04 10:06:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,729 Commits 295 Branches 268 Tags
Commit Graph

7091 Commits

Author SHA1 Message Date
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
Joey de l'Arago
e47a2d1c99
Update cura/Machines/Models/IntentSelectionModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:29:26 +02:00
Joey de l'Arago
b4152d29d6
Update cura/Machines/Models/ActiveIntentQualitiesModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:29:16 +02:00
Joey de l'Arago
87afb117d0
Update cura/Machines/Models/ActiveIntentQualitiesModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:28:22 +02:00
Joey de l'Arago
760976159c
Update cura/Machines/Models/ActiveIntentQualitiesModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:28:13 +02:00
Joey de l'Arago
caa0c255aa
Update cura/Machines/Models/ActiveIntentQualitiesModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:28:06 +02:00
j.delarago
8c2ac9f21e Remove excessive logs, make path search recursive for materials. 
CURA-8610
 2022-06-15 15:47:17 +02:00
j.delarago
4e80d170d1 Add logs for debugging 
CURA-8610
 2022-06-15 14:09:05 +02:00
j.delarago
5d0e4238d5 Use os.path.join instead of appending a "/" since this is os specific. 
Remove possible bad conversion to str for path.
 2022-06-15 13:26:29 +02:00
j.delarago
f7bc55db15 Revert "temu extra logging for debugging" 
This reverts commit febb7f1205451546ad543505d2104bd5fdb0d92e.
 2022-06-15 12:53:42 +02:00
j.delarago
febb7f1205 temu extra logging for debugging 2022-06-15 11:55:53 +02:00
j.delarago
a548e13db3 add bundled paths log 2022-06-15 11:25:47 +02:00
j.delarago
d19e89325f Stop returning quality types from inactive quality groups. This was causing the resolution drop down to show unavailable resolutions. 
CURA-8849
 2022-06-15 09:06:00 +02:00
Ghostkeeper
bd131257fe
Implement sending a signal when changing intent changes quality level 
For now it does nothing. But I'm adding a function that should cause the combobox to pulse. That'll be a new feature so I'm implementing it in a separate commit.

Contributes to issue CURA-8849.
 2022-06-14 16:00:13 +02:00
Ghostkeeper
074e9a8607
Show profile group name in bold 
That highlights it relative to the layer height.

Contributes to issue CURA-8849.
 2022-06-14 15:36:29 +02:00
j.delarago
5cfb6f94e3 Update the resolution dropdown model whenever a custom profile is enabled. Otherwise it won't reflect the custom profiles parent resolution. 
CURA-8849
 2022-06-14 15:03:47 +02:00
Jelle Spijker
93e58d55fa Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-14 11:44:18 +02:00
j.delarago
a87695cd8d Added new intent selection buttons and resolution drop down to replace the matrix. 
We are now selecting intents first and then quality, however the container hierarchy quality -> intents. This is the reason for the new functions inside machine manager.

CURA-8849
 2022-06-14 11:41:38 +02:00
j.delarago
ed7ec6ab8f Add intent change signal so intent changes can trigger updates in resolution drop down. 
CURA-8849
 2022-06-14 09:59:22 +02:00
j.spijker@ultimaker.com
04f16bfcad Use dev as development version 
Since we're no longer running from `master` branch
It is more fitting to rename it to either dev or
main. This version is only used when running from
source when the CURA_VERSION variable isn't set
while performing the `conan install`

Contributes to CURA-9365
 2022-06-13 15:08:00 +02:00