3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Flatten equation in UFP settings export"

Browse source 
This reverts commit ccf9a47f08.
This commit is contained in:
c.lamboo 2022-10-06 16:05:53 +02:00
parent ccf9a47f08
commit 598e093b5e
1 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
plugins/UFPWriter/UFPWriter.py
View file

@ -12,7 +12,6 @@ from PyQt6.QtCore import QBuffer
from UM.Application import Application from UM.Application import Application
from UM.Logger import Logger from UM.Logger import Logger
from UM.Settings.SettingFunction import SettingFunction
from UM.Mesh.MeshWriter import MeshWriter # The writer we need to implement. from UM.Mesh.MeshWriter import MeshWriter # The writer we need to implement.
from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType
from UM.PluginRegistry import PluginRegistry # To get the g-code writer. from UM.PluginRegistry import PluginRegistry # To get the g-code writer.
@ -234,17 +233,11 @@ class UFPWriter(MeshWriter):
# Add global user or quality changes # Add global user or quality changes
global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges) global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges)
for setting in global_flattened_changes.getAllKeys(): for setting in global_flattened_changes.getAllKeys():
value = global_flattened_changes.getProperty(setting, "value") settings["global"]["changes"][setting] = str(global_flattened_changes.getProperty(setting, "value"))
if isinstance(property_value, SettingFunction):
property_value = property_value(value)
settings["global"]["changes"][setting] = value
# Get global all settings values without user or quality changes # Get global all settings values without user or quality changes
for setting in global_stack.getAllKeys(): for setting in global_stack.getAllKeys():
value = global_stack.getProperty(setting, "value") settings["global"]["all_settings"][setting] = str(global_stack.getProperty(setting, "value"))
if isinstance(property_value, SettingFunction):
property_value = property_value(value)
settings["global"]["all_settings"][setting] = value
for i, extruder in enumerate(global_stack.extruderList): for i, extruder in enumerate(global_stack.extruderList):
# Add extruder fields to settings dictionary # Add extruder fields to settings dictionary
@ -256,16 +249,10 @@ class UFPWriter(MeshWriter):
# Add extruder user or quality changes # Add extruder user or quality changes
extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges) extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges)
for setting in extruder_flattened_changes.getAllKeys(): for setting in extruder_flattened_changes.getAllKeys():
value = extruder_flattened_changes.getProperty(setting, "value") settings[f"extruder_{i}"]["changes"][setting] = str(extruder_flattened_changes.getProperty(setting, "value"))
if isinstance(property_value, SettingFunction):
property_value = property_value(value)
settings[f"extruder_{i}"]["changes"][setting] = value
# Get extruder all settings values without user or quality changes # Get extruder all settings values without user or quality changes
for setting in extruder.getAllKeys(): for setting in extruder.getAllKeys():
value = extruder.getProperty(setting, "value") settings[f"extruder_{i}"]["all_settings"][setting] = str(extruder.getProperty(setting, "value"))
if isinstance(property_value, SettingFunction):
property_value = property_value(value)
settings[f"extruder_{i}"]["all_settings"][setting] = value
return settings return settings