Merge branch 'master' of http://47.116.26.105:10880/JonYang/JSBTDieBondH

View/die-bonder-ui/OriginalWnd/TreeViewManager/JIoMapPage.cpp

@@ -1,4 +1,5 @@
 #include "JIoMapPage.h"
+#include <Machine.h>
 
 JIoMapPage::JIoMapPage() {}
 
@@ -10,7 +11,7 @@ QWidget* JIoMapPage::CreateIoPage(const CONFIG_BASE_STRUCT& control)
     // 2. 创建垂直布局
     QHBoxLayout* pHLayout = new QHBoxLayout();
 
-    ClickCircleLabel* pIoState = new ClickCircleLabel();
+    IoStateLab* pIoState = new IoStateLab();
     pIoState->setIoName(strName);
     QLabel* pAxisNmae = new QLabel();
     QString strAxisName = tr("AxisNmae:", "轴名称:");
@@ -66,7 +67,7 @@ QWidget* JIoMapPage::CreateAxisTestPage(const CONFIG_BASE_STRUCT& control)
     QPushButton* pTest = new QPushButton(tr("Axis Test","轴测试"));
     QObject::connect(pTest, &QPushButton::clicked, [strName]()
         {
-            // 执行弹出窗口
+            ns_module::CViewMotion::GetInstance()->ShowMotionAdjustPage(strName.toStdString());
         });
 
     pHLayout->addWidget(pTest);

View/die-bonder-ui/OriginalWnd/TreeViewManager/JIoMapPage.h

@@ -4,11 +4,11 @@
 #include "Src/common/JLogAllOutput.h"
 #include <QMouseEvent>
 
-class ClickCircleLabel : public QLabel {
+class IoStateLab : public QLabel {
     Q_OBJECT
 
 public:
-    ClickCircleLabel(QWidget* parent = nullptr)
+    IoStateLab(QWidget* parent = nullptr)
         : QLabel(parent) 
     {
         setFixedSize(30, 30);