Przeglądaj źródła

修复切换物料异常的bug以及物料小窗口显示的问题

yun 5 dni temu
rodzic
commit
c255e5a6ad

+ 11 - 1
View/die-bonder-ui/CameraMaterialGroupWnd/Group.cpp

@@ -607,7 +607,7 @@ void Group::setCurrentCombox(const int index){
 }
 
 void Group::initBorderStyle(int index,int color) {
-    if (index == 2) {
+     if (index == 2) {
         if(color == 0){
             ui->rightBackground->setStyleSheet("border: 2px solid blue;");
             m_pPreviouslySelectedBlueGroup = this;
@@ -616,6 +616,11 @@ void Group::initBorderStyle(int index,int color) {
             ui->rightBackground->setStyleSheet("border: 2px solid red;");
             m_pCurrentlySelectedGroup = this;
             m_pLastClickedGroup = this;
+            if (m_pPreviouslySelectedBlueGroup != nullptr) {
+                m_pPreviouslySelectedBlueGroup->ui->leftBackground->setStyleSheet("");
+                m_pPreviouslySelectedBlueGroup->ui->rightBackground->setStyleSheet("");
+                m_pPreviouslySelectedBlueGroup = nullptr;
+            }
         }
  
     }
@@ -627,6 +632,11 @@ void Group::initBorderStyle(int index,int color) {
         else {
             ui->leftBackground->setStyleSheet("border: 2px solid red;");
             m_pCurrentlySelectedGroup = this;
+            if (m_pPreviouslySelectedBlueGroup != nullptr) {
+                m_pPreviouslySelectedBlueGroup->ui->leftBackground->setStyleSheet("");
+                m_pPreviouslySelectedBlueGroup->ui->rightBackground->setStyleSheet("");
+                m_pPreviouslySelectedBlueGroup = nullptr;
+            }
             m_pLastClickedGroup = this;
         }
     }

+ 14 - 6
View/die-bonder-ui/OriginalWnd/MainAndSecondaryCamerasWnd.cpp

@@ -37,6 +37,7 @@ MainAndSecondaryCamerasWnd::MainAndSecondaryCamerasWnd(QWidget* parent)
 MainAndSecondaryCamerasWnd::~MainAndSecondaryCamerasWnd()
 {
     UnCameraBind();
+    disconnect(m_timerMaterial, &QTimer::timeout, this, &MainAndSecondaryCamerasWnd::UpdateMaterialByTimer);
     m_timerMaterial->stop();
     delete ui;
 }
@@ -160,12 +161,19 @@ void MainAndSecondaryCamerasWnd::InitPage()
             delete manager;
         }
         //清理ui->viewwidgetgroup_L
-        int width = ui->viewwidgetgroup_L->width();
-        int height = ui->viewwidgetgroup_L->height();
-        QPixmap pixmap(width, height);
-        pixmap.fill(Qt::white); // 白色背景
-        GetGroupImageShowSignalsTo_L(pixmap);
-
+        //int width = ui->viewwidgetgroup_L->width();
+        //int height = ui->viewwidgetgroup_L->height();
+        //QPixmap pixmap(width, height);
+        //pixmap.fill(Qt::white); // 白色背景
+        //GetGroupImageShowSignalsTo_L(pixmap);
+        /*delete ui->viewwidgetgroup_L;
+        ControlOperationPage* viewwidgetgroup_L;
+        viewwidgetgroup_L = new ControlOperationPage(ui->centralwidget);
+        viewwidgetgroup_L->setObjectName(QString::fromUtf8("viewwidgetgroup_L"));
+        viewwidgetgroup_L->setGeometry(QRect(10, 10, 525, 605));
+        viewwidgetgroup_L->setBlueBord();
+        connect(viewwidgetgroup_L, &ControlOperationPage::send_ComboBox_singal, this, &MainAndSecondaryCamerasWnd::HandleComboxchange_L);*/
+        ui->viewwidgetgroup_L->getOperatewidget()->clearPixmap();
         // 设置控件的最小高度和最大宽度
         int minHeight = 162;
         int maxWidth = 244;