Browse Source

灯光失效,样式修改

JonYang 1 day ago
parent
commit
52f50d8fe9

+ 5 - 0
View/die-bonder-ui/CameraMaterialGroupWnd/Group.cpp

@@ -303,6 +303,11 @@ void Group::setWaffleWidget(QPixmap pixmap) {
     layout2->addWidget(pixmapLabel);
     layout2->addWidget(pixmapLabel);
 }
 }
 
 
+void Group::SetCameaInfo(CameraInfo cameaInfo)
+{
+    m_cameaInfo = cameaInfo;
+}
+
 void Group::WaffleWidget()
 void Group::WaffleWidget()
 {
 {
     //QVBoxLayout *layout2 = new QVBoxLayout(ui->Imagewidget_right);
     //QVBoxLayout *layout2 = new QVBoxLayout(ui->Imagewidget_right);

+ 5 - 0
View/die-bonder-ui/CameraMaterialGroupWnd/Group.h

@@ -40,6 +40,9 @@ public:
     void setWafer(Wafer* wafer);
     void setWafer(Wafer* wafer);
     void setWaffleWidget(QPixmap pixmap);
     void setWaffleWidget(QPixmap pixmap);
 
 
+
+    void SetCameaInfo(CameraInfo cameaInfo);
+
 signals:
 signals:
     void send_button_Signal();
     void send_button_Signal();
     void send_ComboBox_singal(int groupId,int index);
     void send_ComboBox_singal(int groupId,int index);
@@ -87,6 +90,8 @@ private:
     int      m_stnCurrentComboBoxIndex;
     int      m_stnCurrentComboBoxIndex;
 
 
 public:
 public:
+    CameraInfo      m_cameaInfo;
+
     int             m_nGroupId;  // 新增:记录当前 Group 的 ID
     int             m_nGroupId;  // 新增:记录当前 Group 的 ID
     ns_module::CViewInterface* m_pCViewInterface;
     ns_module::CViewInterface* m_pCViewInterface;
 };
 };

+ 1 - 0
View/die-bonder-ui/OriginalWnd/ChartsAndCamerasWnd.cpp

@@ -282,6 +282,7 @@ void ChartsAndCamerasWnd::initFrom() {
             }
             }
 
 
             Group* widget = manager->getGroup();
             Group* widget = manager->getGroup();
+            widget->SetCameaInfo(m_pMainCameraBind->m_vecCamera[i]);
             //connect(widget,&Group::send_button_Signal,this,&ChartsAndCamerasWnd::showAndHide);
             //connect(widget,&Group::send_button_Signal,this,&ChartsAndCamerasWnd::showAndHide);
             if (widget != nullptr)
             if (widget != nullptr)
             {
             {

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

@@ -110,6 +110,7 @@ void MainAndSecondaryCamerasWnd::InitPage()
             }
             }
 
 
             Group* widget = manager->getGroup();
             Group* widget = manager->getGroup();
+            widget->SetCameaInfo(m_pMainCameraBind->m_vecCamera[i]);
             CameraConnectUpdateImageFun(i, widget);
             CameraConnectUpdateImageFun(i, widget);
 
 
             connect(widget, &Group::sendUpdateGroupState,
             connect(widget, &Group::sendUpdateGroupState,

+ 1 - 0
View/die-bonder-ui/OriginalWnd/SingleCameraOperationWnd.cpp

@@ -75,6 +75,7 @@ void SingleCameraOperationWnd::initFrom() {
             }
             }
            
            
             Group* widget = manager->getGroup();
             Group* widget = manager->getGroup();
+            widget->SetCameaInfo(m_pMainCameraBind->m_vecCamera[i]);
             if (widget != nullptr)
             if (widget != nullptr)
             {
             {
                 CameraConnectUpdateImageFun(i, widget);
                 CameraConnectUpdateImageFun(i, widget);

+ 41 - 13
View/die-bonder-ui/Src/Res/qss/light.qss

@@ -5,6 +5,47 @@
     outline: 0px;
     outline: 0px;
 }
 }
 
 
+/***全局样式区域**/
+
+QTabWidget
+{
+    border-radius: 10px;
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F1F4FD, stop: 1 #E5E4F6);
+}
+
+QTabWidget QWidget
+{
+    background: #D6D8ED;
+}
+
+QTabBar::tab 
+{
+    background-color: #D6D8ED;
+    color: #666666;
+    min-width: 100px;
+    padding: 8px 16px;
+    margin-right: 2px;
+    border: 1px solid #e0e0e0;
+    border-bottom: none;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+}
+
+QTabBar::tab:hover 
+{
+    background-color: #F2F2FA;
+    color: #2196F3;
+}
+
+QTabBar::tab:selected 
+{
+    background-color: #EDEDFC;
+    color: #2196F3;
+    border-bottom: 2px solid #2196F3;
+}
+
+/*------------------------------------------全局样式区域------------------------------------------*/
+
 /*登录*/
 /*登录*/
 Login QWidget#widget_2
 Login QWidget#widget_2
 {
 {
@@ -676,19 +717,6 @@ LightJoystickSwitchPage{
    background: #D6D8ED; 
    background: #D6D8ED; 
 }
 }
 
 
-LightJoystickSwitchPage QTabWidget#switchTabWidget
-{
-    border-radius: 10px;
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F1F4FD, stop: 1 #E5E4F6);
-}
-
-LightJoystickSwitchPage QTabWidget#switchTabWidget QWidget,
-LightJoystickSwitchPage QTabWidget#switchTabWidget QWidget#GreenLightTab QWidget,
-LightJoystickSwitchPage QTabWidget#switchTabWidget QWidget#JoystickTab QWidget
-
-{
-    background: #D6D8ED;
-}
 
 
 LightJoystickSwitchPage QSlider#RedLightverticalSlider::handle:vertical
 LightJoystickSwitchPage QSlider#RedLightverticalSlider::handle:vertical
 {
 {

+ 2 - 2
View/die-bonder-ui/Src/RewriteControl/LightJoystickSwitchPage.cpp

@@ -283,7 +283,7 @@ void LightJoystickSwitchPage::BondSliderAndLineEdit(QSlider* slider, QLineEdit*
             if (m_pPageSwitchGroup)
             if (m_pPageSwitchGroup)
             {
             {
                 // 执行匹配灯光
                 // 执行匹配灯光
-                int niD = m_pPageSwitchGroup->m_nGroupId;
+                int niD = m_pPageSwitchGroup->m_cameaInfo.iCameraId;
                 //if (niD == 1)
                 //if (niD == 1)
                 {
                 {
                     // 相机窗口
                     // 相机窗口
@@ -549,7 +549,7 @@ void LightJoystickSwitchPage::UpdataLightVal()
 
 
     if (m_pPageSwitchGroup)
     if (m_pPageSwitchGroup)
     {
     {
-        int niD = m_pPageSwitchGroup->m_nGroupId;
+        int niD = m_pPageSwitchGroup->m_cameaInfo.iCameraId;
         //if (niD == 1)
         //if (niD == 1)
         {
         {
             // 切换灯光
             // 切换灯光