|
@@ -308,12 +308,28 @@ void ControlOperationPage::RequestCursorMoveSlots(const QPoint& pos)
|
|
|
|
|
|
void ControlOperationPage::on_moduleTypeComboBox_currentIndexChanged(int index)
|
|
|
{
|
|
|
- UpdataModuleType(ui->moduleTypeComboBox->itemText(index), 1);
|
|
|
+ m_isAdd = true;
|
|
|
+ QString strMod = ui->moduleTypeComboBox->itemText(index);
|
|
|
+ ui->axisTypeComboBox->clear();
|
|
|
+ for (auto a: m_pCameraBindCopy->m_vecCAxis)
|
|
|
+ {
|
|
|
+ // 如果2个相等说明当前模组,与轴匹配
|
|
|
+ if (strMod == a->GetModuleType().c_str())
|
|
|
+ {
|
|
|
+ ui->axisTypeComboBox->addItem(a->GetStringAxisType().c_str());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ UpdataModuleType(strMod, 1);
|
|
|
+ m_isAdd = false;
|
|
|
}
|
|
|
|
|
|
void ControlOperationPage::on_axisTypeComboBox_currentIndexChanged(int index)
|
|
|
{
|
|
|
- UpdataModuleType(ui->axisTypeComboBox->itemText(index), 2);
|
|
|
+ if (!m_isAdd)
|
|
|
+ {
|
|
|
+ UpdataModuleType(ui->axisTypeComboBox->itemText(index), 2);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
void ControlOperationPage::timerEvent(QTimerEvent* event)
|