From 5bc8a632af32684e8c01ff444fdee3dba0de1582 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Sun, 20 May 2018 07:19:30 +0100 Subject: [PATCH 1/8] Added experimental settings to print small features slower. --- resources/definitions/fdmprinter.def.json | 33 +++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index fc8395a8dc..e6e3dce0a9 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6670,6 +6670,39 @@ "default_value": false, "type": "bool", "settable_per_mesh": true + }, + "small_hole_max_size": + { + "label": "Small Hole Max Size", + "description": "Holes and part outlines with a diameter smaller than this will be printed using Small Feature Speed.", + "unit": "mm", + "type": "float", + "minimum_value": "0", + "default_value": 0, + "settable_per_mesh": false + }, + "small_feature_max_length": + { + "label": "Small Feature Max Length", + "description": "Feature outlines that are shorter than this length will be printed using Small Feature Speed.", + "unit": "mm", + "type": "float", + "minimum_value": "0", + "default_value": 0, + "value": "small_hole_max_size * math.pi", + "settable_per_mesh": false + }, + "small_feature_speed_factor": + { + "label": "Small Feature Speed", + "description": "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy.", + "unit": "%", + "type": "float", + "default_value": 50, + "minimum_value": "10", + "minimum_value_warning": "25", + "maximum_value": "100", + "settable_per_mesh": false } } }, From fe9bd029403c0cb103878530045378c27ad7211b Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Sun, 20 May 2018 11:32:54 +0100 Subject: [PATCH 2/8] Added small_feature_speed_factor_0 to specify small feature print speed on layer 0. --- resources/definitions/fdmprinter.def.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index e6e3dce0a9..7eeb0103dc 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6703,6 +6703,19 @@ "minimum_value_warning": "25", "maximum_value": "100", "settable_per_mesh": false + }, + "small_feature_speed_factor_0": + { + "label": "First Layer Speed", + "description": "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy.", + "unit": "%", + "type": "float", + "default_value": 50, + "value": "small_feature_speed_factor", + "minimum_value": "10", + "minimum_value_warning": "25", + "maximum_value": "100", + "settable_per_mesh": false } } }, From 2159908377c2b55bf999c38dfaa316f952698a29 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Sun, 7 Apr 2019 11:52:21 +0100 Subject: [PATCH 3/8] Small feature slowdown settings are now settable per mesh. --- resources/definitions/fdmprinter.def.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 9d3975072d..95800854d1 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7161,7 +7161,7 @@ "type": "float", "minimum_value": "0", "default_value": 0, - "settable_per_mesh": false + "settable_per_mesh": true }, "small_feature_max_length": { @@ -7172,7 +7172,7 @@ "minimum_value": "0", "default_value": 0, "value": "small_hole_max_size * math.pi", - "settable_per_mesh": false + "settable_per_mesh": true }, "small_feature_speed_factor": { @@ -7184,7 +7184,7 @@ "minimum_value": "10", "minimum_value_warning": "25", "maximum_value": "100", - "settable_per_mesh": false + "settable_per_mesh": true }, "small_feature_speed_factor_0": { @@ -7197,7 +7197,7 @@ "minimum_value": "10", "minimum_value_warning": "25", "maximum_value": "100", - "settable_per_mesh": false + "settable_per_mesh": true } } }, From 1aed8a1fa5db07ffc62830277c76a76a89786da9 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Thu, 8 Aug 2019 15:20:37 +0200 Subject: [PATCH 4/8] Add manage printer link Contributes to CS-251 --- .../resources/qml/MonitorPrinterCard.qml | 53 ++++++++++++++++++- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index e2b22312cd..08a8fb3079 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -39,7 +39,8 @@ Item { id: background anchors.fill: parent - color: UM.Theme.getColor("monitor_card_background") + // color: UM.Theme.getColor("monitor_card_background") + color: "red" border { color: UM.Theme.getColor("monitor_card_border") @@ -90,7 +91,7 @@ Item verticalCenter: parent.verticalCenter } width: 180 * screenScaleFactor // TODO: Theme! - height: printerNameLabel.height + printerFamilyPill.height + 6 * screenScaleFactor // TODO: Theme! + height: childrenRect.height Rectangle { @@ -135,6 +136,54 @@ Item } text: printer ? printer.type : "" } + Item + { + id: managePrinterLink + anchors { + top: printerFamilyPill.bottom + topMargin: 6 * screenScaleFactor + } + height: 18 * screenScaleFactor // TODO: Theme! + width: childrenRect.width + + Label + { + id: managePrinterText + anchors.verticalCenter: managePrinterLink.verticalCenter + color: UM.Theme.getColor("monitor_text_link") + font: UM.Theme.getFont("default") + linkColor: UM.Theme.getColor("monitor_text_link") + text: catalog.i18nc("@label link to Connect and Cloud interfaces", "Manage printer") + renderType: Text.NativeRendering + } + UM.RecolorImage + { + id: externalLinkIcon + anchors + { + left: managePrinterText.right + leftMargin: 6 * screenScaleFactor + verticalCenter: managePrinterText.verticalCenter + } + color: UM.Theme.getColor("monitor_text_link") + source: UM.Theme.getIcon("external_link") + width: 12 * screenScaleFactor + height: 12 * screenScaleFactor + } + } + MouseArea + { + anchors.fill: managePrinterLink + onClicked: OutputDevice.openPrintJobControlPanel() + onEntered: + { + manageQueueText.font.underline = true + } + onExited: + { + manageQueueText.font.underline = false + } + } } MonitorPrinterConfiguration From 9a29c772281abf04d29d14ddf342fb2acf2a51af Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Thu, 8 Aug 2019 15:23:29 +0200 Subject: [PATCH 5/8] Remove debug property Contributes to CS-251 --- .../UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index 08a8fb3079..0175d5a2ad 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -39,8 +39,7 @@ Item { id: background anchors.fill: parent - // color: UM.Theme.getColor("monitor_card_background") - color: "red" + color: UM.Theme.getColor("monitor_card_background") border { color: UM.Theme.getColor("monitor_card_border") From 862cdf80a719fbf112b087ce3d2e6cd77d568fc4 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 8 Aug 2019 17:37:43 +0200 Subject: [PATCH 6/8] Constrain already warned users less. part of CURA-6464 --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index ca179eca8f..02d030fadd 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7512,7 +7512,7 @@ "unit": "%", "type": "float", "default_value": 50, - "minimum_value": "10", + "minimum_value": "1", "minimum_value_warning": "25", "maximum_value": "100", "settable_per_mesh": true @@ -7525,7 +7525,7 @@ "type": "float", "default_value": 50, "value": "small_feature_speed_factor", - "minimum_value": "10", + "minimum_value": "1", "minimum_value_warning": "25", "maximum_value": "100", "settable_per_mesh": true From ff8a69712fb69326bcead62c255bc5f1787b4b8b Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 8 Aug 2019 18:51:56 +0200 Subject: [PATCH 7/8] Add new settings (slow for small hole/feature) to expert-visibility. part of CURA-6464 --- resources/setting_visibility/expert.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index e792f05978..d89cd5cd2b 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -407,3 +407,7 @@ wipe_hop_speed wipe_brush_pos_x wipe_repeat_count wipe_move_distance +small_hole_max_size +small_feature_max_length +small_feature_speed_factor +small_feature_speed_factor_0 From a063c33d4c864d1e552ae570f5457c81dfa185d0 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Thu, 8 Aug 2019 22:47:07 +0200 Subject: [PATCH 8/8] Fix target URL for cloud links in monitor page --- .../UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py index 5f9748c36d..259770857d 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py @@ -258,11 +258,11 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): @pyqtSlot(name="openPrintJobControlPanel") def openPrintJobControlPanel(self) -> None: - QDesktopServices.openUrl(QUrl("https://mycloud.ultimaker.com")) + QDesktopServices.openUrl(QUrl(self.clusterCloudUrl)) @pyqtSlot(name="openPrinterControlPanel") def openPrinterControlPanel(self) -> None: - QDesktopServices.openUrl(QUrl("https://mycloud.ultimaker.com")) + QDesktopServices.openUrl(QUrl(self.clusterCloudUrl)) ## Gets the cluster response from which this device was created. @property @@ -273,3 +273,9 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): @clusterData.setter def clusterData(self, value: CloudClusterResponse) -> None: self._cluster = value + + ## Gets the URL on which to monitor the cluster via the cloud. + @property + def clusterCloudUrl(self) -> str: + root_url_prefix = "-staging" if self._account.is_staging else "" + return "https://mycloud{}.ultimaker.com/app/jobs/{}".format(root_url_prefix, self.clusterData.cluster_id)