JonYang il y a 2 jours
Parent
commit
a8fbbc96d1

+ 3 - 0
View/die-bonder-ui/OriginalWnd/MainAndSecondaryCamerasWnd.cpp

@@ -28,6 +28,9 @@ MainAndSecondaryCamerasWnd::MainAndSecondaryCamerasWnd(QWidget *parent)
     ui->control_L->HideOrShowPage(false);
     ui->viewwidgetgroup_L->setBlueBord();
     qApp->installEventFilter(this);
+
+    m_veCurrentSelectGroup_R = {};
+    m_veCurrentSelectGroup_L = {};
     m_veCurrentSelectGroup_R.isInitialed = false;
     m_veCurrentSelectGroup_L.isInitialed = false;
     m_veCurrentSelectGroup_R.isBond = false;

+ 11 - 10
View/die-bonder-ui/Src/RewriteControl/ControlOperationPage.cpp

@@ -348,8 +348,8 @@ void ControlOperationPage::on_moduleTypeComboBox_currentIndexChanged(int index)
             ui->axisTypeComboBox->addItem(a->GetStringAxisType().c_str());
         }
     }
-
     m_isAdd = false;
+
     UpdataModuleType(strMod, 1);
 }
 
@@ -532,15 +532,16 @@ void ControlOperationPage::LockMouse(bool islockMouse)
 
 void ControlOperationPage::UpdataModuleType(const QString& strMode, int nIndex)
 {
-    if (nIndex == 1)
-    {
-        m_currentSelectRunAxis.ModuleType = strMode.toStdString();
-    }
-    else if (nIndex == 2)
-    {
-        m_currentSelectRunAxis.AxisType = strMode.toStdString();
-    }
-    
+    //if (nIndex == 1)
+    //{
+    //    m_currentSelectRunAxis.ModuleType = strMode.toStdString();
+    //}
+    //else if (nIndex == 2)
+    //{
+    //    m_currentSelectRunAxis.AxisType = strMode.toStdString();
+    //}
+    m_currentSelectRunAxis.ModuleType = ui->moduleTypeComboBox->currentText().toStdString();
+    m_currentSelectRunAxis.AxisType = ui->axisTypeComboBox->currentText().toStdString();
 
     if (m_isAdd == false)
     {