Merge pull request #111 from mikelsv/StatusBar-Zero-Coordinates

Add Zero coordinate to StatusBar
XRay3D · Mar 7, 2024 · a65c200 · a65c200
2 parents 2a17bdb + 26a1890
commit a65c200
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/GGEasy/mainwindow.cpp b/GGEasy/mainwindow.cpp
@@ -95,6 +95,10 @@ MainWindow::MainWindow(QWidget* parent)
         ui.statusbar->showMessage(QString("X = %1, Y = %2").arg(point.x()).arg(point.y()));
     });
 
+    connect(ui.graphicsView, &GraphicsView::mouseMove2, [this](const QPointF& point, const QPointF& gpoint) {
+        ui.statusbar->showMessage(QString("Home: X = %1, Y = %2\t\t\t\tZero: X = %3, Y = %4").arg(point.x()).arg(point.y()).arg(gpoint.x()).arg(gpoint.y()));
+    });
+
     ui.treeView->setModel(new FileTree::Model(ui.treeView));
 
     connect(ui.treeView, &FileTree::View::saveGCodeFile, this, &MainWindow::saveGCodeFile);

diff --git a/static_libs/graphicsview/graphicsview.cpp b/static_libs/graphicsview/graphicsview.cpp
@@ -670,7 +670,12 @@ void GraphicsView::mouseMoveEvent(QMouseEvent* event) {
     if (ruler_ && rulerCtr & 0x1)
         rulPt2 = point;
 
-    emit mouseMove(point);
+    // расчёт смещения для нулевых координат
+    QPointF hpoint = App::project()->homePos();
+    QPointF zpoint = App::project()->zeroPos();
+    QPointF gpoint = hpoint - zpoint + point;
+
+    emit mouseMove2(point, gpoint);
     scene()->update();
 }
 

diff --git a/static_libs/graphicsview/graphicsview.h b/static_libs/graphicsview/graphicsview.h
@@ -52,6 +52,7 @@ class GraphicsView : public QGraphicsView {
 signals:
     void fileDroped(const QString&);
     void mouseMove(const QPointF&);
+    void mouseMove2(const QPointF&, const QPointF&);
     void mouseClickR(const QPointF&);
     void mouseClickL(const QPointF&);