From bea67f0536b066494e15cae0b29aaf177f044654 Mon Sep 17 00:00:00 2001 From: Thomas-Karl Pietrowski Date: Fri, 8 Jul 2016 13:07:24 +0200 Subject: [PATCH 1/4] CURA-1445: Using getDurationInISOFormat in SliceInfo I think this is the way YouMagine expects the data to be sent. --- plugins/SliceInfoPlugin/SliceInfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index d3b93aacac..85d26a0b93 100644 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -90,7 +90,7 @@ class SliceInfo(Extension): "settings": global_container_stack.serialize(), # global_container with references on used containers "version": Application.getInstance().getVersion(), "modelhash": "None", - "printtime": print_information.currentPrintTime.getDisplayString(), + "printtime": print_information.currentPrintTime.getDurationInISOFormat(), "filament": material_used, "language": Preferences.getInstance().getValue("general/language"), "materials_profiles ": {} From 374ec8e577071c7622142d73f430d682cfedd868 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 25 Jul 2016 11:30:30 +0200 Subject: [PATCH 2/4] Don't show user/quality emphasis on Per Object Settings --- plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml | 1 + resources/qml/Settings/SettingItem.qml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index 546b7086e6..7695bea821 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -182,6 +182,7 @@ Item { settingLoader.item.showRevertButton = false settingLoader.item.showInheritButton = false settingLoader.item.doDepthIndentation = false + settingLoader.item.doQualityUserSettingEmphasis = false } sourceComponent: diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index a7bdabb3c5..4911bf37a4 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -22,6 +22,7 @@ Item { property var showRevertButton: true property var showInheritButton: true property var doDepthIndentation: true + property var doQualityUserSettingEmphasis: true // Create properties to put property provider stuff in (bindings break in qt 5.5.1 otherwise) property var state: propertyProvider.properties.state @@ -115,7 +116,7 @@ Item { color: UM.Theme.getColor("setting_control_text"); // emphasize the setting if it has a value in the user or quality profile - font: base.stackLevel != undefined && base.stackLevel <= 1 ? UM.Theme.getFont("default_italic") : UM.Theme.getFont("default") + font: base.doQualityUserSettingEmphasis && base.stackLevel != undefined && base.stackLevel <= 1 ? UM.Theme.getFont("default_italic") : UM.Theme.getFont("default") } Row From 87abed39f02674769753bfeb2dae16383db1f9a9 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 25 Jul 2016 11:41:54 +0200 Subject: [PATCH 3/4] Fix two warnings on startup CURA-1758 --- resources/qml/Settings/SettingView.qml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index 957a68b94c..009dbf09a9 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -33,8 +33,6 @@ ScrollView exclude: ["machine_settings"] expanded: Printer.expandedCategories onExpandedChanged: Printer.setExpandedCategories(expanded) - - filter: {} } delegate: Loader @@ -183,7 +181,7 @@ ScrollView //: Settings context menu action text: catalog.i18nc("@action:menu", "Copy value to all extruders") visible: machineExtruderCount.properties.value > 1 - enabled: contextMenu.provider.properties.settable_per_extruder != "False" + enabled: contextMenu.provider != undefined && contextMenu.provider.properties.settable_per_extruder != "False" onTriggered: Cura.MachineManager.copyValueToExtruders(contextMenu.key) } From d9839ee41de81005636973903c873fa524f6e315 Mon Sep 17 00:00:00 2001 From: Thomas Karl Pietrowski Date: Mon, 25 Jul 2016 13:40:19 +0200 Subject: [PATCH 4/4] SliceInfo: Using getDisplayString(ISO8601) instead --- plugins/SliceInfoPlugin/SliceInfo.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index 85d26a0b93..0337aee02c 100644 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -10,6 +10,7 @@ from UM.Message import Message from UM.i18n import i18nCatalog from UM.Logger import Logger from UM.Platform import Platform +from UM.Qt.Duration import DurationFormat import collections import json @@ -90,7 +91,7 @@ class SliceInfo(Extension): "settings": global_container_stack.serialize(), # global_container with references on used containers "version": Application.getInstance().getVersion(), "modelhash": "None", - "printtime": print_information.currentPrintTime.getDurationInISOFormat(), + "printtime": print_information.currentPrintTime.getDisplayString(DurationFormat.Format.ISO8601), "filament": material_used, "language": Preferences.getInstance().getValue("general/language"), "materials_profiles ": {} @@ -127,4 +128,4 @@ class SliceInfo(Extension): except: # We really can't afford to have a mistake here, as this would break the sending of g-code to a device # (Either saving or directly to a printer). The functionality of the slice data is not *that* important. - pass \ No newline at end of file + pass