refactor(*):03LaserCut_V00.00.01,Spark100项目发货前功能提取

device/ui/devicecontrolpanelwidget.cpp

@@ -657,7 +657,7 @@ void DeviceControlPanelWidget::on_pbStop_clicked()
 
 
 }
-
+extern bool bReadApFlag;
 void DeviceControlPanelWidget::on_pbSemiAutoMach_clicked()
 {
 
@@ -667,6 +667,7 @@ void DeviceControlPanelWidget::on_pbSemiAutoMach_clicked()
 //    machCodeFilePath = machCodeFilePath + QString("_%1.txt").arg(index);
     //DEV->bRunning = true;
    //ShowSmallAreasDialog();
+    bReadApFlag = false;
     if (ui->chkAuto->checkState() == Qt::Checked)
     {
         DEV->runType = 1;
@@ -2237,7 +2238,9 @@ void DeviceControlPanelWidget::on_pbCompenTestPos_clicked()
 
 void DeviceControlPanelWidget::on_pbFindEdge_clicked()
 {
-    DEV->FindEdge();
+    DEV->RSToZero_Z0();
+    //DEV->reset_z();
+    //DEV->FindEdge();
 }
 
 void DeviceControlPanelWidget::on_cmbType_currentTextChanged(const QString &strValue)
@@ -2758,3 +2761,24 @@ void DeviceControlPanelWidget::on_spbPowerAdjust_valueChanged(int arg1)
 
     Sleep(50);
 }
+
+void DeviceControlPanelWidget::on_pbReset_clicked()
+{
+//    DEVICE_INFO->printDeviceSystemInfo(QString("Z2轴工作位置改变完成1231242"));
+//    double value = 2.333;
+//    DEVICE_INFO->printDeviceSystemInfo(QString("Z2轴工作位置改变完成，当前位置为：%1mm").arg(value));
+
+    int choose= QMessageBox::question(this, tr("强制复位"),
+                                  QString(tr("是否强制复位？")),
+                                  QMessageBox::Yes | QMessageBox::No);
+
+    if (choose== QMessageBox::No)
+    {
+
+    }
+    else if (choose== QMessageBox::Yes)
+    {
+        DEV->reset();
+    }
+
+}