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,253 Commits 295 Branches 268 Tags
Commit Graph

7073 Commits

Author SHA1 Message Date
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
Jaime van Kessel
525f96db98 Merge branch 'CURA-8610_add_package_metadata' of github.com:Ultimaker/Cura 2022-06-13 13:22:03 +02:00
Jelle Spijker
823e8f6347 Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-12 19:10:52 +02:00
j.spijker@ultimaker.com
5d740d7368 Set the CuraVersion with the conan options 
Contributes to CURA-9365
 2022-06-12 19:09:22 +02:00
Ghostkeeper
4a08b88f31
Allow setting metadata subentries that don't exist yet 
Otherwise it crashes here. The ContainerManager should be flexible enough to allow that sort of thing.
It works with plain entries, but crashed with subentries (like 'properties/diameter') if those weren't present yet in the metadata.

Fixes Sentry issue CURA-3FH.
 2022-06-08 11:24:46 +02:00
j.delarago
ddb49ddba4 Add comment 
CURA-8610
 2022-06-08 11:20:51 +02:00
j.delarago
71a817697b Before this change packages were only being checked if they were bundled after loading the package_id. However only installed packages were being loaded so this would always be false. 
The solution here is to check first if a material file is inside "secure_paths" (these are install directory resource paths). If it is, it must be a bundled material.

CURA-8610
 2022-06-08 10:22:24 +02:00
j.delarago
efeb29c734 Fix call to plugin that was causing errors when building 
CURA-8610
 2022-06-07 13:41:54 +02:00
Joey de l'Arago
16804dfeee
Merge pull request #12411 from Ultimaker/CURA-9297_show_custom_intent_names 
Use intent category if no translation is available
 2022-06-02 10:32:08 +02:00
Ghostkeeper
84e3201db4
Merge branch '5.0' 2022-06-01 15:38:37 +02:00
Jaime van Kessel
e6551821aa Use intent category if no translation is available 
Previously we would only accept intents that had a translation. If we
could not find one, we would use "unknown" as the intent category. However,
we didn't really do this consistently. In some places it would show unkown
and in others we'd show the intent type.

This should make the behavior the same across the board. It will try to get a
translation for the intent category and show that. If it's unable to find that
it will use the category instead. Note that it will use the python title function
to ensure it has nice capitalisation

CURA-9297
 2022-06-01 11:07:01 +02:00
Remco Burema
6640c5e5f2
Merge pull request #12402 from Ultimaker/CURA-8610_save_package_metadata 
[CURA-8610] Save package metadata
 2022-05-31 17:21:20 +02:00
j.delarago
29b6450704 Add some more information for the unhappy route and a message to inform the user. 
CURA-6990
 2022-05-31 16:30:11 +02:00
Ghostkeeper
d6bd7cce9e
Oops 2022-05-31 13:39:47 +02:00
Remco Burema
6b04c736e9 Revert "Disable the material sync message again" 
This reverts commit 1f6e1942d775d47dd48be4fd83c5346271827a5e.
 2022-05-31 12:34:55 +02:00
Ghostkeeper
35147d7f5e
Don't crash if machine_extruder_trains metadata is missing 
This old function is only necessary for upgrading from before v3.4. Best not let it crash in any other case, even if that would sometimes make very old machine instances corrupt if I made a mistake in thinking here.

Fixes Sentry issue CURA-3XG.
 2022-05-31 11:24:08 +02:00
j.delarago
cdc08b5d54 Improve GUID check by parsing xml and getting GUID specifically inside the metadata tag. 
Remove exporting materials from disabled extruders

CURA-8610
 2022-05-31 10:00:25 +02:00
j.delarago
3dec025cb8 Update comment to clarify function usage. 
CURA-8610
 2022-05-31 08:54:08 +02:00