From 714d54f8118bc15560f658eebd4de923dda98349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20R=C3=B6ssler?= Date: Thu, 8 Aug 2019 17:22:05 +0200 Subject: [PATCH 1/2] ApplicationControls: add spindle speed to DRO --- src/application/ApplicationSettings.qml | 1 + src/applicationcontrols/AbstractDigitalReadOut.qml | 3 +++ src/applicationcontrols/DigitalReadOut.qml | 12 ++++++++++++ 3 files changed, 16 insertions(+) diff --git a/src/application/ApplicationSettings.qml b/src/application/ApplicationSettings.qml index a68de21f..bf9e92e3 100644 --- a/src/application/ApplicationSettings.qml +++ b/src/application/ApplicationSettings.qml @@ -57,6 +57,7 @@ LocalSettings { setValue("dro.showOffsets", false, false); setValue("dro.showVelocity", true, false); setValue("dro.showDistanceToGo", true, false); + setValue("dro.showSpindleSpeed", true, false); setValue("preview.enable", false, false); setValue("preview.showMachineLimits", true, false); setValue("preview.showProgram", true, false); diff --git a/src/applicationcontrols/AbstractDigitalReadOut.qml b/src/applicationcontrols/AbstractDigitalReadOut.qml index 5b257a79..a0123a5d 100644 --- a/src/applicationcontrols/AbstractDigitalReadOut.qml +++ b/src/applicationcontrols/AbstractDigitalReadOut.qml @@ -47,6 +47,9 @@ ApplicationItem { property bool distanceToGoVisible: settings.initialized && settings.values.dro.showDistanceToGo property int positionFeedback: _ready ? status.config.positionFeedback : ApplicationStatus.ActualPositionFeedback property int positionOffset: _ready ? status.config.positionOffset : ApplicationStatus.RelativePositionOffset + property double spindleSpeed: _ready ? Math.abs(status.motion.spindleSpeed) : 0.0 + property int spindleDirection: _ready ? status.motion.spindleDirection: 0 + property bool spindleSpeedVisible: _ready && settings.initialized ? settings.values.dro.showSpindleSpeed && status.ui.spindlePlusVisible : false readonly property bool _ready: status.synced readonly property var _axisNames: helper.ready ? helper.axisNames : ["x", "y", "z", "a"] diff --git a/src/applicationcontrols/DigitalReadOut.qml b/src/applicationcontrols/DigitalReadOut.qml index 12c2bc60..678b004b 100644 --- a/src/applicationcontrols/DigitalReadOut.qml +++ b/src/applicationcontrols/DigitalReadOut.qml @@ -245,6 +245,18 @@ AbstractDigitalReadOut { active: true visible: !droRect.offsetsVisible && distanceToGoVisible } + + Loader { + sourceComponent: textLine + onLoaded: { + item.title = qsTr("S:") + item.type = Qt.binding(function() { return droRect.spindleDirection === 1 ? "⟳" : (droRect.spindleDirection === -1 ? "⟲" : ""); }); + item.homed = false; + item.value = Qt.binding(function() { return droRect.spindleSpeed; }); + } + active: true + visible: !droRect.offsetsVisible && spindleSpeedVisible + } } ColumnLayout { From 8b7c64aafd1e7dd9f31944745f1a789dc440697a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20R=C3=B6ssler?= Date: Thu, 8 Aug 2019 17:46:01 +0200 Subject: [PATCH 2/2] GCodeSync: remove unreliable code --- src/pathview/GCodeSync.qml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/pathview/GCodeSync.qml b/src/pathview/GCodeSync.qml index d3710411..7b5f1e0f 100644 --- a/src/pathview/GCodeSync.qml +++ b/src/pathview/GCodeSync.qml @@ -35,6 +35,7 @@ Item { || status.task.execState === ApplicationStatus.TaskDone) : false readonly property string file: status.synced ? status.task.file : "" property int lastLine: 1 + property string lastFile: "" readonly property bool ready: status.synced onCurrentLineChanged: updateLine() @@ -45,22 +46,11 @@ Item { return; } - if (d.lastLine > d.currentLine) { - for (var line = 1; line <= d.lastLine; ++line) { - model.setData(file, line, false, GCodeProgramModel.ExecutedRole); - model.setData(file, line, false, GCodeProgramModel.ActiveRole); - } - d.lastLine = d.currentLine; - } - - for (line = d.lastLine; line < d.currentLine; ++line) { - model.setData(file, line, true, GCodeProgramModel.ExecutedRole); - model.setData(file, line, false, GCodeProgramModel.ActiveRole); - } - + model.setData(d.lastFile, d.lastLine, false, GCodeProgramModel.ActiveRole) model.setData(file, currentLine, true, GCodeProgramModel.ActiveRole); d.lastLine = d.currentLine; + d.lastFile = d.file; } } }