9992 Commits

Author SHA1 Message Date
Casper Lamboo
4c9b74edff
Remove unintuitive comment 2024-03-29 10:38:27 +01:00
Remco Burema
0d585f367f Reset entire scene around center for UCP.
Since we can't rely on the build-volume --because we can't know on which printer we open-- the safest bet (and the thing alowed by 3mf if I recall) is to just center the entire scene on the buildplate for Universal Cura Project files.

CURA-11703
2024-03-28 23:51:35 +01:00
Saumya Jain
cf61a78fbf Added enumname while reading ucp
Added a connection in WorkspaceDialog.qml to call function whenever the 'exportedSettingModel' changes. This ensures that any changes in the model will now be reflected in the UI table. Furthermore, an added adjustment in SpecificSettingsModel.py now correctly handles the enum type settings, retrieving the correct value from the options list.

CURA-11783
2024-03-28 17:16:42 +01:00
Remco Burema
93861073d3 Fix another open-file resulting in a crash.
If the materials doesn't have the right key in it, just continue. It should be somewhere after all.

part of CURA-11772
2024-03-28 17:00:57 +01:00
Remco Burema
e85e50cce4 Merge remote-tracking branch 'origin/5.7' into CURA-11772_fix_crash_on_open 2024-03-28 14:58:13 +01:00
Saumya Jain
b34865e9c8 Changed setting value to enum value while saving ucp
CURA-11783
2024-03-28 11:54:54 +01:00
HellAholic
2435a5665f
Merge pull request #18734 from Ultimaker/CURA-11781-align-learn-more-button-in-ucp
learn more button alligned in UCP
2024-03-28 10:36:35 +01:00
HellAholic
2ce731fb83
Merge pull request #18737 from Ultimaker/CURA-11723-dont-show-anti-mesh-settings
Add visibility control for settings in 3MFWriter plugin
2024-03-28 10:18:43 +01:00
Saumya Jain
55d4cd44c4 Aligning the title horizontally
CURA-11781
2024-03-28 09:51:06 +01:00
Frederic Meeuwissen
f665281a6a Only load machine_id_to_name.json when it's needed for the first time 2024-03-27 11:19:59 +01:00
Frederic Meeuwissen
484cc6d42f Clean up CloudApiClient.py 2024-03-27 11:19:48 +01:00
Frederic Meeuwissen
8012df6518 Convert str.format to f-string 2024-03-27 11:19:36 +01:00
Frederic Meeuwissen
1bc8b90b56 Move definition ID to cloud name map to json file 2024-03-27 11:19:22 +01:00
Saumya Jain
f4c15c47ce
Update plugins/3MFWriter/SettingsExportGroup.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2024-03-27 11:18:02 +01:00
Saumya Jain
646d4e5f85
Update plugins/3MFWriter/SettingsExportModel.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2024-03-27 11:17:46 +01:00
Saumya Jain
6ddd96f914 Add visibility control for settings in 3MFWriter plugin
Introduced a new property 'show_in_menu' to control the visibility of individual settings in 3MFWriter plugin. Modified 'SettingExport' class constructor to store this visibility status. Also, updated the 'SettingsExportGroup' model to filter the settings based on visibility before presenting them in the GUI.

CURA-11723
2024-03-26 20:37:43 +01:00
Saumya Jain
dc34fbc047 learn more button alligned in UCP
CURA-11781
2024-03-26 16:35:59 +01:00
Remco Burema
bc5532dab3 Prevent crash if the variants only have an 'empty' entry.
Just get the one you'd get if no variant was asked (like in the other branch of the if) then.

CURA-11772
2024-03-26 14:01:35 +01:00
Saumya Jain
d3b1294e8b Added UCP as prefix in name while saving a UCP
CURA-11762
2024-03-22 10:18:50 +01:00
HellAholic
460dbb5816
Merge pull request #18669 from Ultimaker/CURA-11758-Crash-on-front-end-on-playing-the-preview-simulation
Fix crash in similation view
Validated on the build from the branch.
Issue is resolved.
2024-03-20 15:06:14 +01:00
c.lamboo
35d3ff2b5c Only emit model once when all items have been added
CURA-11720
2024-03-20 13:35:24 +01:00
c.lamboo
9662aefa37 Revert "Update model data handling in 3MFReader plugin"
This reverts commit 4da17d643d91cb10b0185770c550dfc0f147e38f.
2024-03-20 13:34:41 +01:00
c.lamboo
1046b24ee5 Fix crash in similation view
CURA-11758
2024-03-20 11:14:16 +01:00
Remco Burema
d441130e3b Defensive programming: Fix current path can be None.
should fix CURA-11741 (sentry cura '708')
2024-03-19 10:43:11 +01:00
Saumya Jain
6a7fe9a423
Merge branch '5.7' into CUR-11720-ucp-correct-ovverrides-ii 2024-03-18 15:45:11 +01:00
Saumya Jain
eac2d3b173 removes the unnecessary 'z' attribute
CURA-11700
2024-03-18 14:51:55 +01:00
Saumya Jain
37dc9e5dcb Update UI layering and MachineSelector properties in 3MFReader
The z-index property of combobox and Loader elements in WorkspaceSection.qml was adjusted to ensure proper layering.

CURA-11700
2024-03-18 14:47:24 +01:00
Saumya Jain
4da17d643d Update model data handling in 3MFReader plugin
partially revert 4dd0113a784687c0fd0ed5397acb9a4bf01d428c
CURA-11720
2024-03-18 12:46:10 +01:00
Saumya Jain
5eeee37f0e Update visibility condition in WorkspaceDialog
CURA-11700
2024-03-18 12:32:34 +01:00
Saumya Jain
1ebab878fe
Merge branch '5.7' into CURA-11700-trigger-area-for-selecting-machine 2024-03-18 12:31:41 +01:00
Saumya Jain
522310b48a
Merge branch '5.7' into CUR-11720-ucp-correct-ovverrides-ii 2024-03-18 12:17:16 +01:00
c.lamboo
4dd0113a78 Add dedicate functions for exportedSettingModelItems and exportedSettingModelRowCount 2024-03-18 12:14:58 +01:00
c.lamboo
a58cd69b39 use notify to update exportedSettingModel 2024-03-18 11:55:50 +01:00
Erwan MATHIEU
1344ee4bd4
Merge branch '5.7' into CURA-11734-add-a-learn-more-buttn-for-ucp 2024-03-15 13:10:16 +01:00
Erwan MATHIEU
80a28021e9 Add blank line to split elements visually
CURA-11734
2024-03-15 13:09:54 +01:00
Saumya Jain
59d395a121 Added learn more button while saving and opening UCP
CURA-11734
2024-03-15 12:20:56 +01:00
Casper Lamboo
1c6a018c8b
Merge branch '5.7' into CURA-11526-upgrade-script 2024-03-15 11:44:57 +01:00
c.lamboo
c821fd6b39 Fix parser value parsing
CURA-11526
2024-03-15 10:19:44 +01:00
c.lamboo
2948af3f96 Add upgrade script for changed brim_location setting
CURA-11526
2024-03-14 22:29:28 +01:00
Remco Burema
1eb69535bc
Merge pull request #18605 from Ultimaker/CURA-11715-save_as_type-for-3mf
Cura 11715 save as type for 3mf
2024-03-14 19:02:12 +01:00
Saumya Jain
0698455394
Merge branch '5.7' into CURA-11697 2024-03-14 17:18:43 +01:00
Saumya Jain
40bc08f482 Apparantly the first time override is written it is not overriden by next upload.
Now, it does

CURA-11720
2024-03-14 17:09:11 +01:00
Saumya Jain
b5940a54f4 fixing size of drop down
CURA-11700
2024-03-14 16:17:34 +01:00
Saumya Jain
b245cce4e6
Merge branch '5.7' into CURA-11700-trigger-area-for-selecting-machine 2024-03-14 13:40:07 +01:00
Saumya Jain
42261b67d7
Merge branch '5.7' into CURA-11715-save_as_type-for-3mf 2024-03-14 13:02:08 +01:00
Saumya Jain
73e4d78735 added limit mimetype for 3mf project and removed saving ucp as mesh writer
CURA-11715
2024-03-14 13:01:01 +01:00
Remco Burema
7013afae16
Merge pull request #18591 from Ultimaker/CURA-11701-profile-changes-to-unsupported
not clearing the current machinein case of UCP
2024-03-14 13:00:13 +01:00
Saumya Jain
9604674c8b Added Cura.MachineSelector in place of combobox
combobox seemed to be tampering with the mouse area of machineselector

CURA-11700
2024-03-14 11:45:15 +01:00
Casper Lamboo
9f952b91c3
Merge pull request #18588 from Ultimaker/CURA-11721-load-ucp-improovement
placing Setting loaded from ucp on top before Suggested Profile setting
2024-03-14 09:43:38 +01:00
Saumya Jain
e90cbcfa01 not clearing the current machinein case of UCP
because we don't want to write again the same thing.
CURA-11701
2024-03-13 13:38:46 +01:00