[CURA-9224] Approver settings json #13209
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Change default -> all_settings. This better reflects the purpose of the list. CURA-9224
casperlamboo
reviewed
Sep 6, 2022
It didn't really belong in the stack builder, as it's not a containerstack CURA-9224
…er/Cura into CURA-9224_approver_settings_json
casperlamboo
approved these changes
Sep 13, 2022
|
This breaks profiles having |
|
@Joeydelarago diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py
index 49751e1a2a..aa63eb6d2e 100644
--- a/plugins/UFPWriter/UFPWriter.py
+++ b/plugins/UFPWriter/UFPWriter.py
@@ -230,11 +230,11 @@ class UFPWriter(MeshWriter):
# Add global user or quality changes
global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges)
for setting in global_flattened_changes.getAllKeys():
- settings["global"]["changes"][setting] = global_flattened_changes.getProperty(setting, "value")
+ settings["global"]["changes"][setting] = str(global_flattened_changes.getProperty(setting, "value"))
# Get global all settings values without user or quality changes
for setting in global_stack.getAllKeys():
- settings["global"]["all_settings"][setting] = global_stack.getProperty(setting, "value")
+ settings["global"]["all_settings"][setting] = str(global_stack.getProperty(setting, "value"))
for i, extruder in enumerate(global_stack.extruderList):
# Add extruder fields to settings dictionary
@@ -246,10 +246,10 @@ class UFPWriter(MeshWriter):
# Add extruder user or quality changes
extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges)
for setting in extruder_flattened_changes.getAllKeys():
- settings[f"extruder_{i}"]["changes"][setting] = extruder_flattened_changes.getProperty(setting, "value")
+ settings[f"extruder_{i}"]["changes"][setting] = str(extruder_flattened_changes.getProperty(setting, "value"))
# Get extruder all settings values without user or quality changes
for setting in extruder.getAllKeys():
- settings[f"extruder_{i}"]["all_settings"][setting] = extruder.getProperty(setting, "value")
+ settings[f"extruder_{i}"]["all_settings"][setting] = str(extruder.getProperty(setting, "value"))
return settings |
|
@nallath I see that you're about to ship 5.2. The issue with this PR is still present on the pre-release branch. To trigger it, reset any setting to its computed value, then save as UFP. I could make a PR, but the fix above is probably not what you want, it outputs the formulas rather than the computed values. |
This was referenced Oct 1, 2022
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add settings to ufp files so that changes in settings can be reviewed on Digital Factory.