|
@@ -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)
|
|
|
{
|