c.lamboo
16ce5c8b6f
Merge remote-tracking branch 'origin/5.7' into 5.7
2024-03-29 16:23:50 +01:00
c.lamboo
600f5cdaf6
Fix opening empty ucp files
...
CURA-11703
2024-03-29 16:23:38 +01:00
HellAholic
6d5966472c
Merge pull request #18754 from Ultimaker/CURA-11783-enum-instead-of-text-value
...
Cura 11783 enum instead of text value
2024-03-29 15:26:51 +01:00
c.lamboo
0d01f7523e
Also translate label
...
CURA-11783
2024-03-29 13:04:56 +01:00
c.lamboo
b2fea2c1b5
Point to correct catalog
...
CURA-11783
2024-03-29 12:52:31 +01:00
c.lamboo
b2c0767165
Add translations to enum values
...
CURA-11783
2024-03-29 11:52:09 +01:00
HellAholic
29c3c2f098
Merge pull request #18756 from Ultimaker/CURA-11703_fix_ucp_jump_coords
...
[CURA-11703] Reset entire scene around center for UCP.
2024-03-29 11:36:45 +01:00
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
55d4cd44c4
Aligning the title horizontally
...
CURA-11781
2024-03-28 09:51:06 +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
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
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
Saumya Jain
59d395a121
Added learn more button while saving and opening UCP
...
CURA-11734
2024-03-15 12:20:56 +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
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
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
Saumya Jain
cf7f807b41
placing Setting loaded from ucp on top before Suggested Profile setting
...
CURA-11721
2024-03-13 09:52:50 +01:00
Erwan MATHIEU
ff4652e16a
Add comments not to translate "Universal Cura Project"
2024-03-11 12:49:11 +01:00
Saumya Jain
831a1d4876
Reset openAsUcp at the start of preread
...
CURA-11403
2024-03-06 12:32:05 +01:00
Saumya Jain
8ef7b65710
removing update existing/ create new in case of UCP
...
also, making sure post processing scripts are not loaded.
CURA-11403
2024-03-05 16:37:17 +01:00
Saumya Jain
3e23ce1c37
code review fixed for PAP
...
CURA-11403
2024-03-05 14:08:39 +01:00
Saumya Jain
68669794de
selected printer is active printer also in case it is a cloud printer
...
CURA-11403
2024-03-04 18:03:11 +01:00
Saumya Jain
c879809836
selected printer is active printer in UCP
...
CURA-11403
2024-03-04 16:47:09 +01:00
Saumya Jain
f19320cad8
update the setting table while loading ucp the seond time
...
CURA-11403
2024-03-04 11:58:21 +01:00
Saumya Jain
72f6540627
material and profile as suggested
...
CURA-11403
2024-03-01 17:18:15 +01:00
Saumya Jain
b1b9660651
removing select same profile checkbox
...
CURA-11403
2024-03-01 15:43:37 +01:00
Saumya Jain
f67d2ed5fe
Remove setting visibility for Ucp
...
show settings expanded by default
CURA-11403
2024-03-01 15:25:24 +01:00
Saumya Jain
f3c49e494e
adding option of opening model as UCP or normal project file
...
CURA-11403
2024-02-29 15:45:13 +01:00
Saumya Jain
1338a562ef
added drop models to buildplate as a right click option
...
Also shortcut: ctrl+B
CURA-10542
2024-02-27 13:45:10 +01:00
Saumya Jain
59d6593c17
fixing reloadvalue manager
...
CURA-10542
2024-02-27 09:57:39 +01:00
Saumya Jain
55e5cd8982
adding dropto buildplate drop per model in 3mf
...
CURA-10542
2024-02-26 14:58:53 +01:00
c.lamboo
62aff0be12
Determine ucp based on included file
...
CURA-11403
2024-02-21 11:40:51 +01:00
c.lamboo
08b70252a4
Remove duplicated mime type
...
CURA-11403
2024-02-21 11:24:09 +01:00
