修复相机跳动问题

View/die-bonder-ui/ImageView.cpp

@@ -27,6 +27,7 @@ ImageView::ImageView(QWidget* parent) :
     setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
     this->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     this->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    this->resize(parent->size());
 
 }
 
@@ -61,7 +62,7 @@ void ImageView::setCurPixmap(const QPixmap& newPixmap) {
         QRectF sceneRect(-pixmapCenter.x(), -pixmapCenter.y(), m_pixmap.width(), m_pixmap.height());
         scene()->setSceneRect(sceneRect);
         setSceneRect(scene()->itemsBoundingRect());
-        this->resize(m_pixmap.width(), m_pixmap.height());
+        //this->resize(m_pixmap.width(), m_pixmap.height());
         m_imageOffset = QPoint(0, 0); // 重置图片偏移量为(0, 0)
         setCursor(Qt::ArrowCursor);
         update(); // 触发重绘

View/die-bonder-ui/Src/RewriteControl/ControlOperationPage.cpp

@@ -365,8 +365,8 @@ void ControlOperationPage::on_moduleTypeComboBox_currentIndexChanged(int index)
             ui->axisTypeComboBox->addItem(a->GetStringAxisType().c_str());
         }
     }
-    m_isAdd = false;
 
+    m_isAdd = false;
     UpdataModuleType(strMod, 1);
 }
 
@@ -549,16 +549,15 @@ 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();
-    //}
-    m_currentSelectRunAxis.ModuleType = ui->moduleTypeComboBox->currentText().toStdString();
-    m_currentSelectRunAxis.AxisType = ui->axisTypeComboBox->currentText().toStdString();
+    if (nIndex == 1)
+    {
+        m_currentSelectRunAxis.ModuleType = strMode.toStdString();
+    }
+    else if (nIndex == 2)
+    {
+        m_currentSelectRunAxis.AxisType = strMode.toStdString();
+    }
+    
 
     if (m_isAdd == false)
     {