Skip to content

TouchOffDialog: Align use of axisNames #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

TouchOffDialog: Align use of axisNames #300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/applicationcontrols/TouchOffDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Dialog {
property int axis: 0
property var axisNames: helper.ready ? helper.axisNamesUpper : ["X", "Y", "Z"]
property var _axisNames: helper.ready ? helper.axisNames : ["x", "y", "z"]
property int _index: helper.ready ? helper.axisIndices.indexOf(axis) : 0

property bool _ready: status.synced && command.connected
property bool _done: true
Expand All @@ -56,10 +57,10 @@ Dialog {
if (status.task.taskMode !== ApplicationStatus.TaskModeMdi) {
command.setTaskMode('execute', ApplicationCommand.TaskModeMdi);
}
var axisName = _axisNames[axis];
var axisName = _axisNames[_index];
var position = status.motion.position[axisName] - status.motion.g92Offset[axisName] - status.io.toolOffset[axisName];
var newOffset = (position - coordinateSpin.value);
var mdi = "G10 L2 P" + (coordinateSystemCombo.currentIndex + 1) + " " + axisNames[axis] + newOffset.toFixed(6);
var mdi = "G10 L2 P" + (coordinateSystemCombo.currentIndex + 1) + " " + axisNames[_index] + newOffset.toFixed(6);
command.executeMdi('execute', mdi);
}

Expand All @@ -69,7 +70,7 @@ Dialog {
ColumnLayout {
anchors.fill: parent
Label {
text: qsTr("Enter %1 coordinate relative to workpiece:").arg(dialog.axisNames[dialog.axis])
text: qsTr("Enter %1 coordinate relative to workpiece:").arg(dialog.axisNames[dialog._index])
}
SpinBox {
id: coordinateSpin
Expand Down