Răsfoiți Sursa

修复了双窗口相机初始偏移问题和物料刷新叠加的bug

yun 1 săptămână în urmă
părinte
comite
d4149fc4b1

+ 1 - 0
View/die-bonder-ui/CameraMaterialGroupWnd/MaterialWindow/Bond.cpp

@@ -703,6 +703,7 @@ void Bond::paintInitFrom(QWidget* parent) {
 
 void Bond::UpdataVal(std::vector<ns_mat::POINT_INFO_STRUCT>& stPointInfo)
 {
+    bondData.clear();
     maxPoint = QPointF(stPointInfo[0].stBondStatus.stAlnBondPosition.x, stPointInfo[0].stBondStatus.stAlnBondPosition.y);
     minPoint = QPointF(stPointInfo[0].stBondStatus.stAlnBondPosition.x, stPointInfo[0].stBondStatus.stAlnBondPosition.y);
     QVector<POINT_INFO_STRUCT> ptMatrix;

+ 2 - 0
View/die-bonder-ui/CameraMaterialGroupWnd/MaterialWindow/MaterialBox.cpp

@@ -134,6 +134,8 @@ void MaterialBox::initFrom(QWidget *parent)
 
 void MaterialBox::UpdataVal(std::vector<ns_module::MATERIAL_BOX_STRUCT>& veMaterial)
 {
+    //m_boxes = {};
+
     for (auto& a : veMaterial)
     {
         m_boxes = a;

+ 1 - 0
View/die-bonder-ui/CameraMaterialGroupWnd/MaterialWindow/Wafer.cpp

@@ -65,6 +65,7 @@ void Wafer::UpdataGenerateTestData()
 
 void Wafer::UpdataVal(const std::vector<ns_mat::WAFER_MATRIX_POINT_INFO_STRUCT>& veWafer)
 {
+    waferData.clear();
     int currentDieMatrixId = veWafer[0].nDieMatrixId;
     int rowMax = veWafer[0].nDieRow;
     int colsMax = veWafer[0].nDieCol;

+ 1 - 1
View/die-bonder-ui/CameraMaterialGroupWnd/MaterialWindow/Waffle.cpp

@@ -89,7 +89,7 @@ void Waffle::UpdataGenerateTestData()
 void Waffle::UpdataVal(const std::vector<ns_mat::WAFFLE_MATRIX_POINT_STRUCT>& veWaffle)
 {
 
-
+    m_vWaffleData.clear();
     maxPoint = QPointF(veWaffle[0].stPosition.x, veWaffle[0].stPosition.y);
     minPoint = QPointF(veWaffle[0].stPosition.x, veWaffle[0].stPosition.y);
     WAFFLE_MATRIX_POINT_STRUCT minMatrixPoint = veWaffle[0];

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

@@ -305,6 +305,8 @@ void MainAndSecondaryCamerasWnd::initLeftAndRightWidget() {
             else {
                 BindImageOrMaterial(m_nCurrentRight, m_nMaterialIndex);
                 ui->viewwidgetgroup_R->setEnableControls(false);
+                QPixmap pixmap_L = ui->viewwidgetgroup_L->getCurrentComboBoxPixmap(currentLeftComboBoxIndex);
+                GetGroupImageShowSignalsTo_L(pixmap_L);
                 BindImageOrMaterial(m_nLastLeft, m_nImageIndex);
                 ui->viewwidgetgroup_L->setEnableControls(true);