From a63cf954d420aaaed618a35bfc7863206282d3d6 Mon Sep 17 00:00:00 2001 From: Saumya Jain Date: Wed, 6 Mar 2024 10:28:09 +0100 Subject: [PATCH] =?UTF-8?q?modify-settings-for-overlap=E2=80=99,=20'suppor?= =?UTF-8?q?t-blocker'=20and=20'support-mesh'=20saved=20as=20their=20respec?= =?UTF-8?q?tive=20types=20along=20with=20their=20settings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CURA-11403 --- plugins/3MFWriter/SettingsExportModel.py | 25 ++++++++---------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/plugins/3MFWriter/SettingsExportModel.py b/plugins/3MFWriter/SettingsExportModel.py index 62c445f34e..401bf21e90 100644 --- a/plugins/3MFWriter/SettingsExportModel.py +++ b/plugins/3MFWriter/SettingsExportModel.py @@ -59,17 +59,12 @@ class SettingsExportModel(QObject): 'skin_edge_support_thickness', 'alternate_carve_order', 'top_skin_preshrink', - 'interlocking_enable', - 'infill_mesh', - 'cutting_mesh'} + 'interlocking_enable'} - PER_MODEL_EXPORTABLE_SETTINGS_KEYS = { 'top_bottom_thickness', - 'top_thickness', - 'bottom_thickness', - 'top_layers', - 'bottom_layers', - 'wall_thickness', - 'wall_line_count'} + PER_MODEL_EXPORTABLE_SETTINGS_KEYS = {"anti_overhang_mesh", + "infill_mesh", + "cutting_mesh", + "support_mesh"} def __init__(self, parent = None): super().__init__(parent) @@ -119,20 +114,16 @@ class SettingsExportModel(QObject): user_keys = user_settings_container.getAllKeys() exportable_settings = SettingsExportModel.EXPORTABLE_SETTINGS settings_export = [] + # Check whether any of the user keys exist in PER_MODEL_EXPORTABLE_SETTINGS_KEYS + is_exportable = any(key in SettingsExportModel.PER_MODEL_EXPORTABLE_SETTINGS_KEYS for key in user_keys) - # in case of modify mesh settings we add spme extra settings to the exportable settings - if 'infill_mesh' in user_keys: - exportable_settings = exportable_settings.union(SettingsExportModel.PER_MODEL_EXPORTABLE_SETTINGS_KEYS) for setting_to_export in user_keys: label = settings_stack.getProperty(setting_to_export, "label") value = settings_stack.getProperty(setting_to_export, "value") unit = settings_stack.getProperty(setting_to_export, "unit") setting_type = settings_stack.getProperty(setting_to_export, "type") - - is_exportable = True if setting_to_export in exportable_settings else False if setting_type is not None: - # This is not very good looking, but will do for now value = f"{str(SettingDefinition.settingValueToString(setting_type, value))} {unit}" else: value = str(value) @@ -140,6 +131,6 @@ class SettingsExportModel(QObject): settings_export.append(SettingExport(setting_to_export, label, value, - is_exportable)) + is_exportable or setting_to_export in exportable_settings)) return settings_export