继续整合

View/die-bonder-ui/OriginalWnd/ChartsAndCamerasWnd.ui

@@ -346,7 +346,7 @@
      <property name="geometry">
       <rect>
        <x>16</x>
-       <y>652</y>
+       <y>642</y>
        <width>508</width>
        <height>177</height>
       </rect>
@@ -385,7 +385,7 @@
      <property name="geometry">
       <rect>
        <x>20</x>
-       <y>860</y>
+       <y>830</y>
        <width>491</width>
        <height>151</height>
       </rect>

View/die-bonder-ui/OriginalWnd/SingleCameraOperationWnd.cpp

@@ -13,7 +13,7 @@ SingleCameraOperationWnd::SingleCameraOperationWnd(QWidget *parent)
 {
     ui->setupUi(this);
     ui->viewwidgetgroup->resizeSingleUI();
-
+    ui->lightJoystickSwitchPage->resizeSingleUI();
     isShow = true;
     liveClick = true;
     initFrom();

View/die-bonder-ui/OriginalWnd/SingleCameraOperationWnd.ui

@@ -59,278 +59,6 @@
      </property>
     </widget>
    </widget>
-   <widget class="QWidget" name="RedLight" native="true">
-    <property name="geometry">
-     <rect>
-      <x>834</x>
-      <y>800</y>
-      <width>61</width>
-      <height>114</height>
-     </rect>
-    </property>
-    <widget class="QSlider" name="RedLightverticalSlider">
-     <property name="geometry">
-      <rect>
-       <x>10</x>
-       <y>12</y>
-       <width>18</width>
-       <height>56</height>
-      </rect>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-    <widget class="QLineEdit" name="RedLightlineEdit">
-     <property name="geometry">
-      <rect>
-       <x>10</x>
-       <y>78</y>
-       <width>40</width>
-       <height>24</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string>22</string>
-     </property>
-    </widget>
-    <widget class="QLabel" name="RedLightlabel">
-     <property name="geometry">
-      <rect>
-       <x>39</x>
-       <y>22</y>
-       <width>10</width>
-       <height>34</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QProgressBar" name="RedLightprogressBar">
-     <property name="geometry">
-      <rect>
-       <x>32</x>
-       <y>15</y>
-       <width>18</width>
-       <height>51</height>
-      </rect>
-     </property>
-     <property name="value">
-      <number>24</number>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="format">
-      <string/>
-     </property>
-    </widget>
-   </widget>
-   <widget class="QWidget" name="GreenLight" native="true">
-    <property name="geometry">
-     <rect>
-      <x>900</x>
-      <y>800</y>
-      <width>61</width>
-      <height>114</height>
-     </rect>
-    </property>
-    <widget class="QSlider" name="GreenLightverticalSlider">
-     <property name="geometry">
-      <rect>
-       <x>10</x>
-       <y>12</y>
-       <width>18</width>
-       <height>56</height>
-      </rect>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-    <widget class="QLineEdit" name="GreenLightlineEdit">
-     <property name="geometry">
-      <rect>
-       <x>10</x>
-       <y>78</y>
-       <width>40</width>
-       <height>24</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string>11</string>
-     </property>
-    </widget>
-    <widget class="QLabel" name="GreenLightlabel">
-     <property name="geometry">
-      <rect>
-       <x>36</x>
-       <y>22</y>
-       <width>12</width>
-       <height>34</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QProgressBar" name="GreenLightprogressBar">
-     <property name="geometry">
-      <rect>
-       <x>32</x>
-       <y>15</y>
-       <width>18</width>
-       <height>51</height>
-      </rect>
-     </property>
-     <property name="value">
-      <number>24</number>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="format">
-      <string/>
-     </property>
-    </widget>
-   </widget>
-   <widget class="QWidget" name="BlueLight" native="true">
-    <property name="geometry">
-     <rect>
-      <x>966</x>
-      <y>800</y>
-      <width>61</width>
-      <height>114</height>
-     </rect>
-    </property>
-    <widget class="QSlider" name="BlueLightverticalSlider">
-     <property name="geometry">
-      <rect>
-       <x>10</x>
-       <y>12</y>
-       <width>18</width>
-       <height>56</height>
-      </rect>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-    <widget class="QLineEdit" name="BlueLightlineEdit">
-     <property name="geometry">
-      <rect>
-       <x>10</x>
-       <y>78</y>
-       <width>40</width>
-       <height>24</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string>0</string>
-     </property>
-    </widget>
-    <widget class="QLabel" name="BlueLightlabel">
-     <property name="geometry">
-      <rect>
-       <x>32</x>
-       <y>22</y>
-       <width>19</width>
-       <height>34</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QProgressBar" name="BlueLightprogressBar">
-     <property name="geometry">
-      <rect>
-       <x>32</x>
-       <y>15</y>
-       <width>18</width>
-       <height>51</height>
-      </rect>
-     </property>
-     <property name="value">
-      <number>24</number>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="format">
-      <string/>
-     </property>
-    </widget>
-   </widget>
-   <widget class="QWidget" name="DotLight" native="true">
-    <property name="geometry">
-     <rect>
-      <x>1032</x>
-      <y>800</y>
-      <width>61</width>
-      <height>114</height>
-     </rect>
-    </property>
-    <widget class="QSlider" name="DotLightverticalSlider">
-     <property name="geometry">
-      <rect>
-       <x>10</x>
-       <y>12</y>
-       <width>18</width>
-       <height>56</height>
-      </rect>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-    <widget class="QLineEdit" name="DotLightlineEdit">
-     <property name="geometry">
-      <rect>
-       <x>10</x>
-       <y>78</y>
-       <width>40</width>
-       <height>24</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string>0</string>
-     </property>
-    </widget>
-    <widget class="QLabel" name="DotLightlabel">
-     <property name="geometry">
-      <rect>
-       <x>32</x>
-       <y>22</y>
-       <width>19</width>
-       <height>34</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QProgressBar" name="DotLightprogressBar">
-     <property name="geometry">
-      <rect>
-       <x>32</x>
-       <y>15</y>
-       <width>18</width>
-       <height>51</height>
-      </rect>
-     </property>
-     <property name="value">
-      <number>24</number>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="format">
-      <string/>
-     </property>
-    </widget>
-   </widget>
    <widget class="ControlOperationPage" name="viewwidgetgroup" native="true">
     <property name="geometry">
      <rect>
@@ -341,6 +69,16 @@
      </rect>
     </property>
    </widget>
+   <widget class="LightJoystickSwitchPage" name="lightJoystickSwitchPage" native="true">
+    <property name="geometry">
+     <rect>
+      <x>830</x>
+      <y>730</y>
+      <width>265</width>
+      <height>240</height>
+     </rect>
+    </property>
+   </widget>
   </widget>
  </widget>
  <customwidgets>
@@ -350,6 +88,12 @@
    <header>src/RewriteControl/controloperationpage.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>LightJoystickSwitchPage</class>
+   <extends>QWidget</extends>
+   <header>src/RewriteControl/lightjoystickswitchpage.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

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

@@ -201,15 +201,18 @@ void ControlOperationPage::resizeSingleUI() {
     ui->Operatewidget->setGeometry(QRect(5, 5, 786, 786));
     //ui->line_2->setGeometry(QRect(826, 20, 1, 953));
     ui->LiveButton->setGeometry(QRect(436, 20, 60, 32));
-    ui->horizontalLayout_2->setGeometry(QRect(22, 882, 786, 32));
-    ui->horizontalLayout->setGeometry(QRect(22, 882, 786, 32));
-    ui->ZoomUpButton->setGeometry(QRect(25, 882, 138, 32));
-    ui->layoutWidget->setGeometry(QRect(22, 882, 800, 31));
-
-    ui->ZoomOutButton->setGeometry(QRect(163, 882, 112, 32));
-    ui->RulerButton->setGeometry(QRect(430, 882, 124, 32));
-    ui->PenButton->setGeometry(QRect(555, 882, 108, 32));
-    ui->label_Percentage->setGeometry(QRect(275, 882, 135, 32));
+    ui->horizontalLayout_2->setGeometry(QRect(12, 882, 786, 32));
+    
+    
+    ui->layoutWidget->setGeometry(QRect(10, 882, 790, 31));
+    ui->ZoomUpButton->setGeometry(QRect(25, 882, 120, 32));
+    ui->ZoomOutButton->setGeometry(QRect(155, 882, 100, 32));
+    ui->label_Percentage->setGeometry(QRect(265, 882, 120, 32));
+    ui->RulerButton->setGeometry(QRect(400, 882, 110, 32));
+    ui->PenButton->setGeometry(QRect(530, 882, 100, 32));
+    // ui->switchJoystickBut
+    ui->horizontalLayout->setGeometry(QRect(12, 882, 786, 32));
+    
     ui->BackGround->setGeometry(QRect(16, 68, 794, 794));
 }
 

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

@@ -325,3 +325,48 @@ EN_LIGHT_INDEX LightJoystickSwitchPage::MatchSelectedLightIndex(QLineEdit* lineE
     return nIndex;
 }
 
+void LightJoystickSwitchPage::resizeSingleUI() {
+    //ui->resize(265, 240)
+    ui->switchTabWidget->setGeometry(QRect(0, 0, 265, 240));
+ 
+    ui->GreenLightTab->setGeometry(QRect(0, 0, 60, 32));
+    ui->JoystickTab->setGeometry(QRect(0, 0, 259, 215));
+    
+    
+    ui->RedLight->setGeometry(QRect(0, 0, 61, 114));
+    ui->RedLightlineEdit->setGeometry(QRect(10, 78, 40, 24));
+    ui->RedLightprogressBar->setGeometry(QRect(32, 15, 18, 51));
+    ui->RedLightverticalSlider->setGeometry(QRect(10, 12, 18, 56));
+    ui->RedLightlabel->setGeometry(QRect(39, 22, 10, 34));
+
+    ui->GreenLight->setGeometry(QRect(70, 0, 61, 114));
+    ui->GreenLightlineEdit->setGeometry(QRect(10, 78, 40, 24));
+    ui->GreenLightprogressBar->setGeometry(QRect(32, 15, 18, 51));
+    ui->GreenLightverticalSlider->setGeometry(QRect(10, 12, 18, 56));
+    ui->GreenLightlabel->setGeometry(QRect(36, 22, 10, 34));
+
+    ui->BlueLight->setGeometry(QRect(140, 0, 61, 114));
+    ui->BlueLightlineEdit->setGeometry(QRect(10, 78, 40, 24));
+    ui->BlueLightprogressBar->setGeometry(QRect(32, 15, 18, 51));
+    ui->BlueLightverticalSlider->setGeometry(QRect(10, 12, 18, 56));
+    ui->BlueLightlabel->setGeometry(QRect(32, 22, 19, 34));
+
+    ui->DotLight->setGeometry(QRect(200, 0, 61, 114));
+    ui->DotLightlineEdit->setGeometry(QRect(10, 78, 40, 24));
+    ui->DotLightprogressBar->setGeometry(QRect(32, 15, 18, 51));
+    ui->DotLightverticalSlider->setGeometry(QRect(10, 12, 18, 56));
+    ui->DotLightlabel->setGeometry(QRect(32, 22, 19, 34));
+
+    ui->groupBox->setGeometry(QRect(0, 100, 141, 111));
+    ui->left_Button->setGeometry(QRect(10, 40, 41, 31));
+    ui->right_Button->setGeometry(QRect(90, 40, 41, 31));
+    ui->up_Button->setGeometry(QRect(50, 10, 41, 31));
+    ui->down_Button->setGeometry(QRect(50, 70, 41, 31));
+    ui->move_Button->setGeometry(QRect(170, 130, 60, 23));
+    ui->JTabShowLableLoop->setGeometry(QRect(10, 50, 200, 41));
+    ui->moveTo_Button->setGeometry(QRect(170, 170, 60, 23));
+    ui->valLineEdit->setGeometry(QRect(160, 100, 71, 21));
+    ui->JTabShowLable->setGeometry(QRect(10, 0, 200, 40));
+
+}
+

View/die-bonder-ui/Src/RewriteControl/LightJoystickSwitchPage.h

@@ -33,6 +33,7 @@ public:
 
     void setLigthValue(int redLight,int greenLight,int blueLight,int dotLight);
     void setLightWidget(int value, QWidget *lightWidget, QLineEdit *lineEdit, QSlider *slider, QProgressBar *progressBar, QLabel *label);
+    void resizeSingleUI();
 public slots:
     void on_move_Button_clicked();
     void on_moveTo_Button_clicked();

View/die-bonder-ui/light.qss

@@ -283,10 +283,6 @@ ChartsAndCamerasWnd QPushButton#LiveButton
     background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #949FE8,stop:1 #2D309B);
 }
 
-SingleCameraOperationWnd QWidget#RedLight,
-SingleCameraOperationWnd QWidget#GreenLight,
-SingleCameraOperationWnd QWidget#BlueLight,
-SingleCameraOperationWnd QWidget#DotLight,
 MainAndSecondaryCamerasWnd QWidget#RedLight,
 MainAndSecondaryCamerasWnd QWidget#GreenLight,
 MainAndSecondaryCamerasWnd QWidget#BlueLight,
@@ -295,10 +291,22 @@ MainAndSecondaryCamerasWnd QTabWidget#switchTabWidget,
 MainAndSecondaryCamerasWnd QWidget#LightJoystickSwitchPage,
 MainAndSecondaryCamerasWnd QWidget#GreenLightTab,
 MainAndSecondaryCamerasWnd QWidget#JoystickTab,
+SingleCameraOperationWnd QWidget#RedLight,
+SingleCameraOperationWnd QWidget#GreenLight,
+SingleCameraOperationWnd QWidget#BlueLight,
+SingleCameraOperationWnd QWidget#DotLight,
+SingleCameraOperationWnd QTabWidget#switchTabWidget,
+SingleCameraOperationWnd QWidget#LightJoystickSwitchPage,
+SingleCameraOperationWnd QWidget#GreenLightTab,
+SingleCameraOperationWnd QWidget#JoystickTab,
 ChartsAndCamerasWnd QWidget#RedLight,
 ChartsAndCamerasWnd QWidget#GreenLight,
 ChartsAndCamerasWnd QWidget#BlueLight,
-ChartsAndCamerasWnd QWidget#DotLight
+ChartsAndCamerasWnd QWidget#DotLight,
+ChartsAndCamerasWnd QTabWidget#switchTabWidget,
+ChartsAndCamerasWnd QWidget#LightJoystickSwitchPage,
+ChartsAndCamerasWnd QWidget#GreenLightTab,
+ChartsAndCamerasWnd QWidget#JoystickTab
 {
     background: #D6D8ED;
 }
@@ -362,17 +370,20 @@ QProgressBar#DotLightprogressBar_L::chunk
 }
 
 /* 工具栏 */
-SingleCameraOperationWnd QWidget#Toolbar,
-MainAndSecondaryCamerasWnd QWidget#Toolbar,
-ChartsAndCamerasWnd QWidget#Toolbar
+SingleCameraOperationWnd QHBoxLayout#horizontalLayout_2,
+MainAndSecondaryCamerasWnd QHBoxLayout#horizontalLayout_2,
+ChartsAndCamerasWnd QHBoxLayout#horizontalLayout_2,
+SingleCameraOperationWnd QHBoxLayout#horizontalLayout,
+MainAndSecondaryCamerasWnd QHBoxLayout#horizontalLayout,
+ChartsAndCamerasWnd QHBoxLayout#horizontalLayout
 {
     border-radius: 6px;
     background: #CBD0FF;
 }
 
-SingleCameraOperationWnd QWidget#Toolbar QPushButton,
-MainAndSecondaryCamerasWnd QWidget#Toolbar QPushButton,
-ChartsAndCamerasWnd QWidget#Toolbar QPushButton
+SingleCameraOperationWnd QWidget#layoutWidget QPushButton,
+MainAndSecondaryCamerasWnd QWidget#layoutWidget QPushButton,
+ChartsAndCamerasWnd QWidget#layoutWidget QPushButton
 {
     border-radius: 6px;
     background: #CBD0FF;