合并冲突

.gitignore

@@ -15,3 +15,12 @@
 /View/die-bonder-ui/ui_OriginalWnd.h
 /View/die-bonder-ui/ui_SingleCameraOperationWnd.h
 /View/die-bonder-ui/ui_SystemInfoPage.h
+/View/build-SBTdie-bonder-ui-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug
+/View/die-bonder-ui/*.user
+/View/die-bonder-ui/log_config.txt
+/View/die-bonder-ui/ui_ControlOperationPage.h
+/View/die-bonder-ui/ui_CustomMessageDlg.h
+/Output/bin/x64/SBTdie-bonder-ui.lib
+/Output/bin/x64/SBTdie-bonder-ui.exe
+/Output/bin/x64/SBTdie-bonder-ui.exp
+/Output/bin/x64/SBTdie-bonder-ui.ilk

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

@@ -74,8 +74,6 @@ void MainAndSecondaryCamerasWnd::initFrom()
     QTimer* timer = new QTimer(this);
     connect(timer, &QTimer::timeout, this, &MainAndSecondaryCamerasWnd::checkSettings);
     timer->start(100);
-
-    InitModulesShow();
 }
 
 void MainAndSecondaryCamerasWnd::InitPage()
@@ -199,55 +197,6 @@ void MainAndSecondaryCamerasWnd::CameraConnectUpdateImageFun(int nIndex, Group*
     }
 }
 
-void MainAndSecondaryCamerasWnd::InitModulesShow()
-{
-    //if (m_pMainCameraBind != nullptr)
-    //{
-    //    DeduplicationBox(ui->axisComboBox, m_pMainCameraBind->m_vecCAxis, 0);
-    //    DeduplicationBox(ui->axisTypeComboBox, m_pMainCameraBind->m_vecCAxis, 1);
-    //}
-}
-
-template<class T>
-void MainAndSecondaryCamerasWnd::DeduplicationBox(QComboBox* pCom, const T& veTemp, int nIndex)
-{
-    QStringList items;
-    for (int i = 0; i < pCom->count(); ++i)
-    {
-        items << pCom->itemText(i);
-    }
-
-    for (auto& a : veTemp)
-    {
-        QString strName;
-        if (nIndex == 0)
-        {
-            strName = a->GetModuleType().c_str();
-        }
-        else if (nIndex == 1)
-        {
-            strName = a->GetStringAxisType().c_str();
-        }
-       
-        bool bMa = false; // 是否匹配
-        for (auto b : items)
-        {
-            if (b == strName)
-            {
-                bMa = true;
-                break;
-            }
-        }
-
-        if (!bMa)
-        {
-            pCom->addItem(strName);
-        }
-    }
-}
-
-
-
 void MainAndSecondaryCamerasWnd::checkSettings() {
     QSettings settings("YourCompany", "YourApplication_");
     int groupId = settings.value("GroupId", 0).toInt();
@@ -294,30 +243,28 @@ void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index)
     QPixmap newPixmap;
     QPixmap Last_newPixmap;
 
-    if (Index == 1) {
-
-
-
+    if (Index == 1) 
+    {
         newPixmap = QPixmap(imagePath);
         QStringList test = { "1","2" };
         ui->viewwidgetgroup_R->updateOperateWidget(newPixmap, test);
     }
 
-        if (lastIndex == 1) {
-            
-            Last_newPixmap = QPixmap(imagePath);
-            QStringList test = { "1","2" };
-            ui->viewwidgetgroup_L->updateOperateWidget(Last_newPixmap, test);
-        }
-        else if (lastIndex == 2) {
-            updateMaterialWidget(last_left,Last_materialWndType, lastGroupId);
-
-        }
-    
-    if (Index == 2) {
- 
-        updateMaterialWidget(current_right,materialWndType, Id);
+    if (lastIndex == 1) 
+    {
         
+        Last_newPixmap = QPixmap(imagePath);
+        QStringList test = { "1","2" };
+        ui->viewwidgetgroup_L->updateOperateWidget(Last_newPixmap, test);
+    }
+    else if (lastIndex == 2) 
+    {
+        updateMaterialWidget(last_left,Last_materialWndType, lastGroupId);
+    }
+    
+    if (Index == 2) 
+    {
+        updateMaterialWidget(current_right,materialWndType, Id);   
     }
 
     QSettings settings2("YourOrganization", "YourApplication_lastWndType");

View/die-bonder-ui/OriginalWnd/MainAndSecondaryCamerasWnd.h

@@ -30,14 +30,9 @@ public:
 
     /**初始化界面运动控制轴
      */
-    void InitModulesShow();
     void updateMaterialWidget(int side, int materialWndType, int groupId);
 
-    template<class T>
-    void DeduplicationBox(QComboBox* pCom, const T& veTemp, int nIndex);
-
-
-public slots: // 确保这里声明了槽函数
+public slots:
 
     void CheckIs();
 

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

@@ -1,11 +1,13 @@
 #include "ControlOperationPage.h"
 #include "ui_ControlOperationPage.h"
 
-ControlOperationPage::ControlOperationPage(QWidget *parent)
+ControlOperationPage::ControlOperationPage(QWidget* parent)
     : QWidget(parent)
     , ui(new Ui::ControlOperationPage)
 {
     ui->setupUi(this);
+
+    HideLayout(false);
 }
 
 ControlOperationPage::~ControlOperationPage()
@@ -13,20 +15,20 @@ ControlOperationPage::~ControlOperationPage()
     delete ui;
 }
 
-void ControlOperationPage::updateOperateWidget(const QPixmap& pixmap, const QStringList& textList){
+void ControlOperationPage::updateOperateWidget(const QPixmap& pixmap, const QStringList& textList) {
     QSize size = ui->Operatewidget->size();
     QPixmap scaledPixmap = pixmap.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 
-        clearLayout();
+    clearLayout();
 
-        ui->Operatewidget->setPixmap(scaledPixmap);
-        m_currentPixmap = scaledPixmap;
-        m_scaleFactor = 1.0;
-        m_previousScaleFactor = 1.0;
-        ui->label_Percentage->setText("100%");
-        ui->DataSources->clear();
-        ui->DataSources->addItems(textList);
-        m_currentMode = ModeImage;
+    ui->Operatewidget->setPixmap(scaledPixmap);
+    m_currentPixmap = scaledPixmap;
+    m_scaleFactor = 1.0;
+    m_previousScaleFactor = 1.0;
+    ui->label_Percentage->setText("100%");
+    ui->DataSources->clear();
+    ui->DataSources->addItems(textList);
+    m_currentMode = ModeImage;
 
 }
 // 清除大窗口上当前的布局
@@ -34,7 +36,7 @@ void ControlOperationPage::clearLayout() {
     // 获取当前布局
     QLayout* layout = ui->Operatewidget->layout();
     if (layout) {
-        QLayoutItem *child;
+        QLayoutItem* child;
         while ((child = layout->takeAt(0)) != nullptr) {
             if (child->widget() != nullptr) {
                 delete child->widget();  // 删除控件
@@ -61,7 +63,8 @@ void ControlOperationPage::on_ZoomOutButton_clicked() {
 void ControlOperationPage::updateScale(double newScaleFactor) {
     if (newScaleFactor >= 1.0) {
         m_scaleFactor = newScaleFactor;
-    } else {
+    }
+    else {
         m_scaleFactor = 1.0; // 最小缩放比例为 1.0
     }
 
@@ -78,7 +81,8 @@ void ControlOperationPage::applyScale() {
         QPixmap scaledImage = m_currentPixmap.scaled(newWidth, newHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation);
         ui->Operatewidget->setPixmapAndPoint(scaledImage, m_previousScaleFactor, m_scaleFactor, m_mousePos);
         m_previousScaleFactor = m_scaleFactor;
-    } else if (m_currentMode == ModeView && m_currentView) {
+    }
+    else if (m_currentMode == ModeView && m_currentView) {
         // View 模式：缩放 view
         QTransform transform;
         transform.scale(m_scaleFactor, m_scaleFactor);
@@ -91,11 +95,12 @@ void ControlOperationPage::applyScale() {
     ui->label_Percentage->setText(QString("%1%").arg(percentageStr));
 }
 
-void ControlOperationPage::handleDoubleClick(){
+void ControlOperationPage::handleDoubleClick() {
     if (m_currentMode == ModeImage) {
         QPixmap scaledImage = m_currentPixmap.scaled(m_currentPixmap.width(), m_currentPixmap.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
         ui->Operatewidget->setPixmap(scaledImage); // 这里传递缩放后的图片
-    } else if (m_currentMode == ModeView && m_currentView) {
+    }
+    else if (m_currentMode == ModeView && m_currentView) {
         QTransform transform;
         transform.scale(1, 1);
         m_currentView->setTransform(transform);
@@ -106,60 +111,62 @@ void ControlOperationPage::handleDoubleClick(){
 
 }
 
-void ControlOperationPage::updateMaterialWidget( kinds materialWndType) {
-
-        clearLayout();
-
-        switch (materialWndType) {
-        case wafer_kind: KindsofWidget(wafer_kind); break;
-        case waffle_kind: KindsofWidget(waffle_kind); break;
-        case materialbox_kind: KindsofWidget(materialbox_kind); break;
-        case bond_kind:KindsofWidget(bond_kind);break;
-        }
-
+void ControlOperationPage::updateMaterialWidget(kinds materialWndType)
+{
+    clearLayout();
+
+    switch (materialWndType)
+    {
+    case wafer_kind: KindsofWidget(wafer_kind); break;
+    case waffle_kind: KindsofWidget(waffle_kind); break;
+    case materialbox_kind: KindsofWidget(materialbox_kind); break;
+    case bond_kind:KindsofWidget(bond_kind); break;
+    }
 }
 
-void ControlOperationPage::KindsofWidget(kinds kind) {
-
-
-        ui->Operatewidget->clearPixmap();
-        QVBoxLayout *layout = new QVBoxLayout(ui->Operatewidget);
-        layout->setContentsMargins(0, 0, 0, 0);
-        m_currentMode = ModeView;
-        if(kind == wafer_kind){
-            m_wafer->initFrom(ui->Operatewidget);
-            layout->addWidget(m_wafer->view);
-            m_currentView = m_wafer->view;
-        }else if(kind == waffle_kind){
-            m_waffle->initFrom(ui->Operatewidget);
-            layout->addWidget(m_waffle->view);
-            m_currentView = m_waffle->view;
-        }else if(kind == materialbox_kind){
-            m_materialbox->initFrom(ui->Operatewidget);
-            layout->addWidget(m_materialbox->view);
-            m_currentView = m_materialbox->view;
-        }else{
-
-        }
+void ControlOperationPage::KindsofWidget(kinds kind)
+{
+    ui->Operatewidget->clearPixmap();
+    QVBoxLayout* layout = new QVBoxLayout(ui->Operatewidget);
+    layout->setContentsMargins(0, 0, 0, 0);
+    m_currentMode = ModeView;
+    if (kind == wafer_kind)
+    {
+        m_wafer->initFrom(ui->Operatewidget);
+        layout->addWidget(m_wafer->view);
+        m_currentView = m_wafer->view;
+    }
+    else if (kind == waffle_kind)
+    {
+        m_waffle->initFrom(ui->Operatewidget);
+        layout->addWidget(m_waffle->view);
+        m_currentView = m_waffle->view;
+    }
+    else if (kind == materialbox_kind)
+    {
+        m_materialbox->initFrom(ui->Operatewidget);
+        layout->addWidget(m_materialbox->view);
+        m_currentView = m_materialbox->view;
+    }
 
-        ui->Operatewidget->setLayout(layout);
-        m_currentMode = ModeView;
+    ui->Operatewidget->setLayout(layout);
+    m_currentMode = ModeView;
 
-        m_scaleFactor = 1.0;
-        applyScale();
+    m_scaleFactor = 1.0;
+    applyScale();
 
 }
 
-void ControlOperationPage::setWafer(Wafer *wafer){
+void ControlOperationPage::setWafer(Wafer* wafer) {
     m_wafer = wafer;
     updateMaterialWidget(wafer_kind);
-    
+
 }
-void ControlOperationPage::setWaffle(Waffle *waffle){
+void ControlOperationPage::setWaffle(Waffle* waffle) {
     m_waffle = waffle;
     updateMaterialWidget(waffle_kind);
 }
-void ControlOperationPage::setMaterialBox(MaterialBox *materialbox){
+void ControlOperationPage::setMaterialBox(MaterialBox* materialbox) {
     m_materialbox = materialbox;
     updateMaterialWidget(materialbox_kind);
 }
@@ -167,11 +174,25 @@ void ControlOperationPage::setMaterialBox(MaterialBox *materialbox){
 //    m_bond = bond;
 //}
 
-void ControlOperationPage::initForm() {
+void ControlOperationPage::initForm()
+{
+    {
+        // 后面在做
+        //if (m_pMainCameraBind != nullptr)
+        //{
+        //    DeduplicationBox(ui->axisComboBox, m_pMainCameraBind->m_vecCAxis, 0);
+        //    DeduplicationBox(ui->axisTypeComboBox, m_pMainCameraBind->m_vecCAxis, 1);
+        //}
+    }
+
+
+
     connect(ui->Operatewidget, &ImageWidget::sendDoubleClicksignal, this, &ControlOperationPage::handleDoubleClick);
     ui->Operatewidget->setMouseTracking(true);
 }
-ImageWidget* ControlOperationPage::getOperatewidget() {
+
+ImageWidget* ControlOperationPage::getOperatewidget()
+{
     return ui->Operatewidget;
 }
 
@@ -197,4 +218,94 @@ void ControlOperationPage::resizeSingleUI() {
 
 void ControlOperationPage::resizeChartsAndCamerasUI() {
 
-}
+}
+}
+
+void ControlOperationPage::on_switchJoystickBut_clicked()
+{
+    ResetIdleTimer(true);
+}
+
+void ControlOperationPage::timerEvent(QTimerEvent* event)
+{
+    int nID = event->timerId();
+    if (nID == m_idleTimer)
+    {
+        ResetIdleTimer(false);
+    }
+}
+
+void ControlOperationPage::HideLayout(bool bShow)
+{
+    for (int i = 0; i < ui->horizontalLayout->count(); ++i)
+    {
+        QWidget* widget = ui->horizontalLayout->itemAt(i)->widget();
+        if (widget)
+        {
+            if (bShow)
+            {
+                widget->show();
+            }
+            else
+            {
+                widget->hide();
+            }
+        }
+    }
+}
+
+void ControlOperationPage::ResetIdleTimer(bool bStart /*= false*/)
+{
+    if (bStart)
+    {
+        if (isActiveWindow())
+        {
+            m_idleTimer = startTimer(3000);
+        }
+    }
+    else
+    {
+        killTimer(m_idleTimer);
+        m_idleTimer = -1;
+    }
+    HideLayout(bStart);
+}
+
+template<class T>
+void ControlOperationPage::DeduplicationBox(QComboBox* pCom, const T& veTemp, int nIndex)
+{
+    QStringList items;
+    for (int i = 0; i < pCom->count(); ++i)
+    {
+        items << pCom->itemText(i);
+    }
+
+    for (auto& a : veTemp)
+    {
+        QString strName;
+        if (nIndex == 0)
+        {
+            strName = a->GetModuleType().c_str();
+        }
+        else if (nIndex == 1)
+        {
+            strName = a->GetStringAxisType().c_str();
+        }
+
+        bool bMa = false; // 是否匹配
+        for (auto b : items)
+        {
+            if (b == strName)
+            {
+                bMa = true;
+                break;
+            }
+        }
+
+        if (!bMa)
+        {
+            pCom->addItem(strName);
+        }
+    }
+}
+

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

@@ -48,18 +48,35 @@ private slots:
 
     //void on_PenButton_clicked();
     void handleDoubleClick();
+    void on_switchJoystickBut_clicked();
+
+protected:
+    void timerEvent(QTimerEvent* event) override;
+
 private:
-    Ui::ControlOperationPage*ui;
-    QPixmap m_currentPixmap;
-    qreal m_scaleFactor;
-    QPoint m_mousePos;
-    OperateMode m_currentMode = ModeImage;
-    QGraphicsView *m_currentView = nullptr;
-    double m_previousScaleFactor;
-    Wafer *m_wafer; // 声明Wafer指针
-    Waffle *m_waffle; // 声明Waffle指针
-    MaterialBox *m_materialbox; // 声明materialbox指针
+    void HideLayout(bool bShow);
+    void ResetIdleTimer(bool bStart = false);
+private:
+    template<class T>
+    void DeduplicationBox(QComboBox* pCom, const T& veTemp, int nIndex);
+
+private:
+    Ui::ControlOperationPage*   ui;
+    QPixmap                     m_currentPixmap;
+    qreal                       m_scaleFactor;
+    QPoint                      m_mousePos;
+    OperateMode                 m_currentMode = ModeImage;
+    QGraphicsView*              m_currentView = nullptr;
+    double                      m_previousScaleFactor;
+    Wafer*                      m_wafer; // 声明Wafer指针
+    Waffle*                     m_waffle; // 声明Waffle指针
+    MaterialBox*                m_materialbox; // 声明materialbox指针
     //Bond *m_bond;
+
+
+    /**用作定时使用，后面移动到整个类里面，目前先实现功能
+    */
+    int                         m_idleTimer = -1;
 };
 
 #endif // VIEWWIDGETGROUP_H

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

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>525</width>
-    <height>605</height>
+    <height>599</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,7 +17,7 @@
    <property name="geometry">
     <rect>
      <x>452</x>
-     <y>20</y>
+     <y>10</y>
      <width>60</width>
      <height>32</height>
     </rect>
@@ -29,187 +29,20 @@
   <widget class="QComboBox" name="DataSources">
    <property name="geometry">
     <rect>
-     <x>34</x>
-     <y>20</y>
-     <width>400</width>
+     <x>12</x>
+     <y>10</y>
+     <width>421</width>
      <height>32</height>
     </rect>
    </property>
   </widget>
-  <widget class="QWidget" name="Toolbar" native="true">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>572</y>
-     <width>504</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <widget class="Line" name="line">
-    <property name="geometry">
-     <rect>
-      <x>80</x>
-      <y>8</y>
-      <width>1</width>
-      <height>16</height>
-     </rect>
-    </property>
-    <property name="orientation">
-     <enum>Qt::Vertical</enum>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="ZoomUpButton">
-    <property name="geometry">
-     <rect>
-      <x>0</x>
-      <y>0</y>
-      <width>78</width>
-      <height>32</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="Line" name="line_3">
-    <property name="geometry">
-     <rect>
-      <x>156</x>
-      <y>8</y>
-      <width>1</width>
-      <height>16</height>
-     </rect>
-    </property>
-    <property name="orientation">
-     <enum>Qt::Vertical</enum>
-    </property>
-   </widget>
-   <widget class="Line" name="line_4">
-    <property name="geometry">
-     <rect>
-      <x>255</x>
-      <y>8</y>
-      <width>1</width>
-      <height>16</height>
-     </rect>
-    </property>
-    <property name="orientation">
-     <enum>Qt::Vertical</enum>
-    </property>
-   </widget>
-   <widget class="Line" name="line_5">
-    <property name="geometry">
-     <rect>
-      <x>343</x>
-      <y>8</y>
-      <width>1</width>
-      <height>16</height>
-     </rect>
-    </property>
-    <property name="orientation">
-     <enum>Qt::Vertical</enum>
-    </property>
-   </widget>
-   <widget class="Line" name="line_6">
-    <property name="geometry">
-     <rect>
-      <x>415</x>
-      <y>8</y>
-      <width>1</width>
-      <height>16</height>
-     </rect>
-    </property>
-    <property name="orientation">
-     <enum>Qt::Vertical</enum>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="pushButton_2">
-    <property name="geometry">
-     <rect>
-      <x>417</x>
-      <y>0</y>
-      <width>87</width>
-      <height>32</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>.......</string>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="ZoomOutButton">
-    <property name="geometry">
-     <rect>
-      <x>82</x>
-      <y>0</y>
-      <width>72</width>
-      <height>32</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="RulerButton">
-    <property name="geometry">
-     <rect>
-      <x>257</x>
-      <y>0</y>
-      <width>84</width>
-      <height>32</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="PenButton">
-    <property name="geometry">
-     <rect>
-      <x>345</x>
-      <y>0</y>
-      <width>68</width>
-      <height>32</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QLabel" name="label_Percentage">
-    <property name="geometry">
-     <rect>
-      <x>158</x>
-      <y>0</y>
-      <width>95</width>
-      <height>32</height>
-     </rect>
-    </property>
-    <property name="layoutDirection">
-     <enum>Qt::LeftToRight</enum>
-    </property>
-    <property name="text">
-     <string>100%</string>
-    </property>
-   </widget>
-   <zorder>PenButton</zorder>
-   <zorder>line</zorder>
-   <zorder>ZoomUpButton</zorder>
-   <zorder>line_3</zorder>
-   <zorder>line_4</zorder>
-   <zorder>line_5</zorder>
-   <zorder>line_6</zorder>
-   <zorder>pushButton_2</zorder>
-   <zorder>ZoomOutButton</zorder>
-   <zorder>RulerButton</zorder>
-   <zorder>label_Percentage</zorder>
-  </widget>
   <widget class="QWidget" name="BackGround" native="true">
    <property name="geometry">
     <rect>
-     <x>30</x>
-     <y>72</y>
-     <width>484</width>
-     <height>484</height>
+     <x>13</x>
+     <y>50</y>
+     <width>501</width>
+     <height>501</height>
     </rect>
    </property>
    <property name="styleSheet">
@@ -220,12 +53,105 @@
      <rect>
       <x>4</x>
       <y>4</y>
-      <width>476</width>
-      <height>476</height>
+      <width>493</width>
+      <height>493</height>
      </rect>
     </property>
    </widget>
   </widget>
+  <widget class="QWidget" name="layoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>560</y>
+     <width>511</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout_2">
+    <property name="spacing">
+     <number>2</number>
+    </property>
+    <item>
+     <widget class="QPushButton" name="ZoomUpButton">
+      <property name="text">
+       <string/>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QPushButton" name="ZoomOutButton">
+      <property name="text">
+       <string/>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLabel" name="label_Percentage">
+      <property name="layoutDirection">
+       <enum>Qt::LeftToRight</enum>
+      </property>
+      <property name="text">
+       <string>100%</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QPushButton" name="RulerButton">
+      <property name="text">
+       <string/>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QPushButton" name="PenButton">
+      <property name="text">
+       <string/>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="spacing">
+       <number>1</number>
+      </property>
+      <item>
+       <widget class="QComboBox" name="moduleTypeComboBox_2">
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>25</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="axisTypeComboBox">
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>27</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item>
+     <widget class="QPushButton" name="switchJoystickBut">
+      <property name="maximumSize">
+       <size>
+        <width>53</width>
+        <height>16777215</height>
+       </size>
+      </property>
+      <property name="text">
+       <string>.......</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
  </widget>
  <customwidgets>
   <customwidget>