From 60568a30706ece60b945aa9635dafd5d191424af Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 5 Sep 2016 18:10:35 +0200 Subject: [PATCH 1/5] Fix size of LayerPolygon.__jump_map CURA-2049 --- cura/LayerPolygon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/LayerPolygon.py b/cura/LayerPolygon.py index 67b665eb4c..db9582c960 100644 --- a/cura/LayerPolygon.py +++ b/cura/LayerPolygon.py @@ -16,7 +16,7 @@ class LayerPolygon: MoveRetractionType = 9 SupportInterfaceType = 10 - __jump_map = numpy.logical_or( numpy.arange(10) == NoneType, numpy.arange(10) >= MoveCombingType ) + __jump_map = numpy.logical_or( numpy.arange(11) == NoneType, numpy.arange(11) >= MoveCombingType ) def __init__(self, mesh, extruder, line_types, data, line_widths): self._mesh = mesh From 287cbcbb161c388f75155345fc86d460ea41dcca Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 5 Sep 2016 18:15:02 +0200 Subject: [PATCH 2/5] Properly fix LayerPolygon.__jump_map CURA-2049 --- cura/LayerPolygon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/LayerPolygon.py b/cura/LayerPolygon.py index db9582c960..c5eb4b699e 100644 --- a/cura/LayerPolygon.py +++ b/cura/LayerPolygon.py @@ -16,7 +16,7 @@ class LayerPolygon: MoveRetractionType = 9 SupportInterfaceType = 10 - __jump_map = numpy.logical_or( numpy.arange(11) == NoneType, numpy.arange(11) >= MoveCombingType ) + __jump_map = numpy.logical_or( numpy.arange(11) == NoneType, numpy.arange(11) >= MoveRetractionType ) def __init__(self, mesh, extruder, line_types, data, line_widths): self._mesh = mesh From b735d46e9016581ff3452321805d9ca4f81e01a8 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 5 Sep 2016 20:35:20 +0200 Subject: [PATCH 3/5] Show sidebar tooltips above messagestack --- resources/qml/Cura.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 34dbcf1b67..42c2ad9cf4 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -346,6 +346,7 @@ UM.MainWindow bottom: parent.bottom; right: parent.right; } + z: 1 onMonitoringPrintChanged: base.monitoringPrint = monitoringPrint width: UM.Theme.getSize("sidebar").width; } From 46acc4d351fb2ed25d60b51149fa2460ae587006 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 6 Sep 2016 08:32:51 +0200 Subject: [PATCH 4/5] Update wording CURA-2236 --- cura/Settings/MachineManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index bf82a95f1a..3e6b55ec7e 100644 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -890,7 +890,7 @@ class MachineManager(QObject): return containers[0] # Notify user that we were unable to find a matching quality - message = Message(catalog.i18nc("@info:status", "Unable to find a quality profile for this combination, using an empty one instead.")) + message = Message(catalog.i18nc("@info:status", "Unable to find a quality profile for this combination. Default settings will be used instead.")) message.show() return self._empty_quality_container From 2380614bd87f043d69bea7162baacbd103c846ea Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 6 Sep 2016 08:43:00 +0200 Subject: [PATCH 5/5] Update wording of error messages Clearly list problem first, followed by possible resolvement. --- plugins/CuraEngineBackend/CuraEngineBackend.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 9e6bec45e4..72884ce5a5 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -229,7 +229,7 @@ class CuraEngineBackend(Backend): if job.getResult() == StartSliceJob.StartJobResult.SettingError: if Application.getInstance().getPlatformActivity: - self._error_message = Message(catalog.i18nc("@info:status", "Unable to slice. Please check your setting values for errors.")) + self._error_message = Message(catalog.i18nc("@info:status", "Unable to slice with the current settings. Please check your settings for errors.")) self._error_message.show() self.backendStateChange.emit(BackendState.Error) else: @@ -238,7 +238,7 @@ class CuraEngineBackend(Backend): if job.getResult() == StartSliceJob.StartJobResult.NothingToSlice: if Application.getInstance().getPlatformActivity: - self._error_message = Message(catalog.i18nc("@info:status", "Unable to slice. No suitable models found.")) + self._error_message = Message(catalog.i18nc("@info:status", "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit.")) self._error_message.show() self.backendStateChange.emit(BackendState.Error) else: