窗口间距调整

Change-Id: I6e2071936c73232214ae1c0025ce9fb91785d1ec

Login.cpp

@@ -44,3 +44,9 @@ void Login::on_SinginButton_clicked()
         parent->setCurrentIndex(parent->indexOf(originalWnd));
     }
 }
+
+void Login::on_ExitButton_clicked()
+{
+    qApp->quit();
+}
+

Login.h

@@ -21,6 +21,8 @@ private slots:
     void on_SinginButton_clicked();
     void onUserNameChanged(const QString &userName);
 
+    void on_ExitButton_clicked();
+
 private:
     Ui::Login *ui;
 };

Login.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1864</width>
-    <height>1149</height>
+    <width>1800</width>
+    <height>1080</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,10 +17,10 @@
    <widget class="QWidget" name="widget" native="true">
     <property name="geometry">
      <rect>
-      <x>600</x>
-      <y>290</y>
+      <x>670</x>
+      <y>250</y>
       <width>550</width>
-      <height>470</height>
+      <height>556</height>
      </rect>
     </property>
     <widget class="QLineEdit" name="userNameLineEdit">
@@ -134,14 +134,27 @@
       <enum>Qt::Vertical</enum>
      </property>
     </widget>
+    <widget class="QPushButton" name="ExitButton">
+     <property name="geometry">
+      <rect>
+       <x>58</x>
+       <y>437</y>
+       <width>434</width>
+       <height>50</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Exit</string>
+     </property>
+    </widget>
    </widget>
    <widget class="QWidget" name="widget_2" native="true">
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>-120</y>
-      <width>1768</width>
-      <height>1271</height>
+      <y>0</y>
+      <width>1800</width>
+      <height>1080</height>
      </rect>
     </property>
    </widget>

MainWnd.ui

@@ -153,7 +153,7 @@
       </font>
      </property>
      <property name="text">
-      <string extracomment="焊接">Production</string>
+      <string extracomment="焊接">Prod. Assist</string>
      </property>
      <property name="iconSize">
       <size>
@@ -203,7 +203,7 @@
       </font>
      </property>
      <property name="text">
-      <string extracomment="焊接">Program</string>
+      <string extracomment="焊接">Programme</string>
      </property>
      <property name="iconSize">
       <size>
@@ -278,7 +278,7 @@
      <property name="geometry">
       <rect>
        <x>13</x>
-       <y>427</y>
+       <y>503</y>
        <width>94</width>
        <height>60</height>
       </rect>
@@ -303,7 +303,7 @@
       </font>
      </property>
      <property name="text">
-      <string extracomment="焊接">Module</string>
+      <string extracomment="焊接">Calibration</string>
      </property>
      <property name="iconSize">
       <size>
@@ -328,7 +328,7 @@
      <property name="geometry">
       <rect>
        <x>13</x>
-       <y>503</y>
+       <y>579</y>
        <width>94</width>
        <height>60</height>
       </rect>
@@ -353,7 +353,7 @@
       </font>
      </property>
      <property name="text">
-      <string extracomment="焊接">Disposition</string>
+      <string extracomment="焊接">Module Config.</string>
      </property>
      <property name="iconSize">
       <size>
@@ -378,7 +378,7 @@
      <property name="geometry">
       <rect>
        <x>13</x>
-       <y>579</y>
+       <y>427</y>
        <width>94</width>
        <height>60</height>
       </rect>
@@ -453,7 +453,7 @@
       </font>
      </property>
      <property name="text">
-      <string extracomment="焊接">System</string>
+      <string extracomment="焊接">System Info.</string>
      </property>
      <property name="iconSize">
       <size>
@@ -541,10 +541,10 @@
    <widget class="QStackedWidget" name="stackedWidget_UI">
     <property name="geometry">
      <rect>
-      <x>136</x>
-      <y>16</y>
-      <width>1784</width>
-      <height>1049</height>
+      <x>120</x>
+      <y>0</y>
+      <width>1800</width>
+      <height>1080</height>
      </rect>
     </property>
     <widget class="QWidget" name="stackedWidget_UIPage1"/>

OriginalWnd/ChartsAndCamerasWnd.cpp

@@ -231,63 +231,52 @@ void ChartsAndCamerasWnd::initFrom() {
 
     QWidget *viewport = ui->scrollArea->viewport();
     QWidget *container = new QWidget(viewport);
+    QHBoxLayout *layout = new QHBoxLayout(container);
 
-    // 创建水平布局
-    QHBoxLayout *mainLayout = new QHBoxLayout(container);
+    layout->setSpacing(16); // 设置Group之间的间隔距离
+    layout->setContentsMargins(0, 0, 0, 0); // 设置布局的边距为0
 
-    // 创建两个垂直布局，分别用于左右两排
-    QVBoxLayout *leftLayout = new QVBoxLayout();
-    QVBoxLayout *rightLayout = new QVBoxLayout();
-
-    leftLayout->setSpacing(16); // 设置Group之间的间隔距离
-    leftLayout->setMargin(0);
-    rightLayout->setSpacing(16); // 设置Group之间的间隔距离
-    rightLayout->setMargin(0);
-
-    // 添加控件到左侧布局
     QStringList dispmodel;
     dispmodel << "P die align" << "D device align";
-    Group *widget = new Group(6, ":/images/test_image/image_1.png", ":/images/test_image/image_2.png", dispmodel, this);
-    leftLayout->addWidget(widget);
+    Group *widget = new Group(1, ":/images/test_image/image_1.png", ":/images/test_image/image_2.png", dispmodel, this);
+    layout->addWidget(widget);
 
     QStringList dispmodel1;
     dispmodel1 << "D device align" << "P die align";
-    Group *widget_1 = new Group(7, ":/images/test_image/image_3.png", ":/images/test_image/image_4.png", dispmodel1, this);
-    leftLayout->addWidget(widget_1);
+    Group *widget_1 = new Group(2, ":/images/test_image/image_3.png", ":/images/test_image/image_4.png", dispmodel1, this);
+    layout->addWidget(widget_1);
 
-    // 添加控件到右侧布局
     QStringList dispmodel2;
     dispmodel2 << "B device align" << "P die align";
-    Group *widget_2 = new Group(8, ":/images/test_image/image_5.png", ":/images/test_image/image_6.png", dispmodel2, this);
-    rightLayout->addWidget(widget_2);
+    Group *widget_2 = new Group(3, ":/images/test_image/image_5.png", ":/images/test_image/image_6.png", dispmodel2, this);
+    layout->addWidget(widget_2);
 
     QStringList dispmodel3;
     dispmodel3 << "U die align" << "D device align";
-    Group *widget_3 = new Group(9, ":/images/test_image/image_7.png", ":/images/test_image/image_8.png", dispmodel3, this);
-    rightLayout->addWidget(widget_3);
+    Group *widget_3 = new Group(4, ":/images/test_image/image_7.png", ":/images/test_image/image_8.png", dispmodel3, this);
+    layout->addWidget(widget_3);
 
-    // 添加最后一个控件到左侧布局
-    // Group *widget_4 = new Group(5, ":/images/test_image/image.png", ":/images/test_image/image_2.png", dispmodel, this);
-    // leftLayout->addWidget(widget_4);
+    Group *widget_4 = new Group(5, ":/images/test_image/image.png", ":/images/test_image/image_2.png", dispmodel, this);
+    layout->addWidget(widget_4);
 
     // 设置控件的最小高度和最大宽度
     int minHeight = 162;
     int maxWidth = 244;
-    QWidgetList widgets = {widget, widget_1, widget_2, widget_3, /*widget_4*/};
+    QWidgetList widgets = {widget, widget_1, widget_2, widget_3, widget_4};
     for (QWidget *w : widgets) {
         w->setMinimumHeight(minHeight);
         w->setMaximumWidth(maxWidth);
     }
 
-    mainLayout->addLayout(leftLayout);
-    mainLayout->addSpacing(8);
-    mainLayout->addLayout(rightLayout);
+    container->setLayout(layout);
+    ui->scrollArea->setWidget(container);
 
-    mainLayout->setContentsMargins(0, 0, 0, 0);
+    // 确保滚动条策略正确设置
+    ui->scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    ui->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
-    container->setLayout(mainLayout);
-    ui->scrollArea->setWidget(container);
-    ui->scrollArea->resize(521, 162);
+    // 调整滚动区域的大小以适应内容
+    ui->scrollArea->resize(529, 172);
 
     ui->Operatewidget->setMouseTracking(true);
 }

OriginalWnd/ChartsAndCamerasWnd.ui

@@ -323,9 +323,9 @@
    <widget class="QWidget" name="Rightwidget" native="true">
     <property name="geometry">
      <rect>
-      <x>566</x>
+      <x>558</x>
       <y>0</y>
-      <width>536</width>
+      <width>544</width>
       <height>988</height>
      </rect>
     </property>
@@ -532,7 +532,7 @@
      <property name="geometry">
       <rect>
        <x>16</x>
-       <y>830</y>
+       <y>840</y>
        <width>114</width>
        <height>114</height>
       </rect>
@@ -633,7 +633,7 @@
      <property name="geometry">
       <rect>
        <x>146</x>
-       <y>830</y>
+       <y>840</y>
        <width>114</width>
        <height>114</height>
       </rect>
@@ -734,7 +734,7 @@
      <property name="geometry">
       <rect>
        <x>276</x>
-       <y>830</y>
+       <y>840</y>
        <width>114</width>
        <height>114</height>
       </rect>
@@ -849,8 +849,8 @@
       <rect>
        <x>16</x>
        <y>652</y>
-       <width>521</width>
-       <height>162</height>
+       <width>529</width>
+       <height>172</height>
       </rect>
      </property>
      <property name="verticalScrollBarPolicy">
@@ -864,8 +864,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>519</width>
-        <height>160</height>
+        <width>527</width>
+        <height>170</height>
        </rect>
       </property>
      </widget>

OriginalWnd/OriginalWnd.cpp

@@ -147,19 +147,22 @@ void OriginalWnd::initForm()
     QSettings settings("OrganizationName__", "ApplicationName__");
     int lastSavedIndex = settings.value("lastIndex", 1).toInt();
     if (lastSavedIndex == 1) {
-        ChartsAndCamerasWnd *demo001_1 = new ChartsAndCamerasWnd;
-        ui->switchShowPageUI->addWidget(demo001_1);
-        ui->switchShowPageUI->setCurrentIndex(ui->switchShowPageUI->indexOf(demo001_1));
+        ChartsAndCamerasWnd *chartsAndCamerasWnd = new ChartsAndCamerasWnd;
+        ui->switchShowPageUI->addWidget(chartsAndCamerasWnd);
+        ui->switchShowPageUI->setCurrentIndex(ui->switchShowPageUI->indexOf(chartsAndCamerasWnd));
+        // ui->ChartButton->setStyleSheet("background-color: #A9B4FF;");
     }
     if (lastSavedIndex == 2) {
-        MainAndSecondaryCamerasWnd *demo001_2 = new MainAndSecondaryCamerasWnd;
-        ui->switchShowPageUI->addWidget(demo001_2);
-        ui->switchShowPageUI->setCurrentIndex(ui->switchShowPageUI->indexOf(demo001_2));
+        MainAndSecondaryCamerasWnd *mainAndSecondaryCamerasWnd = new MainAndSecondaryCamerasWnd;
+        ui->switchShowPageUI->addWidget(mainAndSecondaryCamerasWnd);
+        ui->switchShowPageUI->setCurrentIndex(ui->switchShowPageUI->indexOf(mainAndSecondaryCamerasWnd));
+        // ui->DoubleImageButton->setStyleSheet("background-color: #A9B4FF;");
     }
     if (lastSavedIndex == 3) {
-        SingleCameraOperationWnd *demo001_3 = new SingleCameraOperationWnd;
-        ui->switchShowPageUI->addWidget(demo001_3);
-        ui->switchShowPageUI->setCurrentIndex(ui->switchShowPageUI->indexOf(demo001_3));
+        SingleCameraOperationWnd *singleCameraOperationWnd = new SingleCameraOperationWnd;
+        ui->switchShowPageUI->addWidget(singleCameraOperationWnd);
+        ui->switchShowPageUI->setCurrentIndex(ui->switchShowPageUI->indexOf(singleCameraOperationWnd));
+        // ui->SingleImageButton->setStyleSheet("background-color: #A9B4FF;");
     }
 
 

OriginalWnd/OriginalWnd.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1856</width>
-    <height>1080</height>
+    <height>1096</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,8 +17,8 @@
    <widget class="QStackedWidget" name="switchShowPageUI">
     <property name="geometry">
      <rect>
-      <x>0</x>
-      <y>60</y>
+      <x>8</x>
+      <y>76</y>
       <width>1102</width>
       <height>988</height>
      </rect>
@@ -34,8 +34,8 @@
     <property name="geometry">
      <rect>
       <x>1118</x>
-      <y>60</y>
-      <width>460</width>
+      <y>76</y>
+      <width>484</width>
       <height>988</height>
      </rect>
     </property>
@@ -43,8 +43,8 @@
    <widget class="QWidget" name="widget" native="true">
     <property name="geometry">
      <rect>
-      <x>1594</x>
-      <y>60</y>
+      <x>1610</x>
+      <y>76</y>
       <width>190</width>
       <height>988</height>
      </rect>
@@ -146,8 +146,8 @@ production</string>
    <widget class="QWidget" name="Toptitlebar" native="true">
     <property name="geometry">
      <rect>
-      <x>0</x>
-      <y>0</y>
+      <x>8</x>
+      <y>16</y>
       <width>1779</width>
       <height>44</height>
      </rect>

OriginalWnd/SingleCameraOperationWnd.cpp

@@ -73,17 +73,13 @@ void SingleCameraOperationWnd::initFrom() {
     Group *widget_4 = new Group(5, ":/images/test_image/image.png", ":/images/test_image/image_2.png", dispmodel, this);
     layout->addWidget(widget_4);
 
-    widget->setMinimumHeight(162);
-    widget_1->setMinimumHeight(162);
-    widget_2->setMinimumHeight(162);
-    widget_3->setMinimumHeight(162);
-    widget_4->setMinimumHeight(162);
-
-    widget->setMaximumWidth(244);
-    widget_1->setMaximumWidth(244);
-    widget_2->setMaximumWidth(244);
-    widget_3->setMaximumWidth(244);
-    widget_4->setMaximumWidth(244);
+    int minHeight = 162;
+    int maxWidth = 244;
+    QWidgetList widgets = {widget, widget_1, widget_2, widget_3, widget_4};
+    for (QWidget *w : widgets) {
+        w->setMinimumHeight(minHeight);
+        w->setMaximumWidth(maxWidth);
+    }
 
     container->setLayout(layout);
     ui->scrollArea->setWidget(container);

SBTdie-bonder-ui.pro

@@ -5,10 +5,6 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 CONFIG += c++17
 
-# LIBS += -L"D:\build-qwt-Desktop_Qt_5_12_8_MSVC2017_64bit-Debug\lib" -lqwtd
-# LIBS += -L"D:\build-qwt-Desktop_Qt_5_12_8_MSVC2017_64bit-Debug\lib" -lqwt
-# INCLUDEPATH += D:\app\Qt\5.15.2\msvc2019_64\include\qwt
-
 # You can make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0

SBTdie-bonder-ui.pro.user

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 15.0.0, 2025-01-02T16:47:52. -->
+<!-- Written by QtCreator 14.0.2, 2025-01-06T15:56:41. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
-  <value type="QByteArray">{f2ab8eff-3fdd-4b92-9bff-1d8cb181cb85}</value>
+  <value type="QByteArray">{18ca618c-d623-4564-b8b0-9ee73c53f748}</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -33,7 +33,6 @@
    <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
    <value type="int" key="EditorConfiguration.IndentSize">4</value>
    <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
-   <value type="int" key="EditorConfiguration.LineEndingBehavior">1</value>
    <value type="int" key="EditorConfiguration.MarginColumn">80</value>
    <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
    <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
@@ -49,7 +48,7 @@
    <value type="int" key="EditorConfiguration.TabSize">8</value>
    <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
    <value type="bool" key="EditorConfiguration.UseIndenter">false</value>
-   <value type="int" key="EditorConfiguration.Utf8BomBehavior">0</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
    <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
    <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
    <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
@@ -95,201 +94,13 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.2 MinGW 64-bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.2 MinGW 64-bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5152.win64_mingw81_kit</value>
-   <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
-   <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
-   <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">1</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\David\Desktop\build\12</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/David/Desktop/build/12</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
-      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
-     </valuemap>
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-     </valuemap>
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
-     </valuemap>
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
-   </valuemap>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\David\Desktop\build</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/David/Desktop/build</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
-      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
-     </valuemap>
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-     </valuemap>
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
-     </valuemap>
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
-    <value type="int" key="QtQuickCompiler">0</value>
-   </valuemap>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
-    <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\David\Desktop\1230dev1\die-bonder-ui\build\Desktop_Qt_5_15_2_MinGW_64_bit-Profile</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/David/Desktop/1230dev1/die-bonder-ui/build/Desktop_Qt_5_15_2_MinGW_64_bit-Profile</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
-      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
-     </valuemap>
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-     </valuemap>
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
-     </valuemap>
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
-    <value type="int" key="QtQuickCompiler">0</value>
-    <value type="int" key="SeparateDebugInfo">0</value>
-   </valuemap>
-   <value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">部署</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">部署</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
-    <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
-   </valuemap>
-   <value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
-    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
-    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
-    <value type="int" key="Analyzer.Valgrind.Callgrind.CostFormat">0</value>
-    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
-    <value type="QList&lt;int&gt;" key="Analyzer.Valgrind.VisibleErrorKinds"></value>
-    <valuelist type="QVariantList" key="CustomOutputParsers"/>
-    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
-    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
-    <value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph &quot;dwarf,4096&quot; -F 250</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">SBTdie-bonder-ui2</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:</value>
-    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/Users/David/Desktop/1230dev2/die-bonder-ui/SBTdie-bonder-ui.pro</value>
-    <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">true</value>
-    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
-    <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-   </valuemap>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
-    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
-    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
-    <value type="int" key="Analyzer.Valgrind.Callgrind.CostFormat">0</value>
-    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
-    <value type="QList&lt;int&gt;" key="Analyzer.Valgrind.VisibleErrorKinds"></value>
-    <valuelist type="QVariantList" key="CustomOutputParsers"/>
-    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
-    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
-    <value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph &quot;dwarf,4096&quot; -F 250</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:</value>
-    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/Users/David/Desktop/20250102dev1/die-bonder-ui/SBTdie-bonder-ui.pro</value>
-    <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
-    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
-    <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/David/Desktop/build</value>
-   </valuemap>
-   <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">2</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Target.1</variable>
-  <valuemap type="QVariantMap">
-   <value type="QString" key="DeviceType">Desktop</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.2 MSVC2019 32bit</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.2 MSVC2019 32bit</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5152.win32_msvc2019_kit</value>
    <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
     <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\David\Desktop\1230dev1\die-bonder-ui\build\Desktop_Qt_5_15_2_MSVC2019_32bit-Debug</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/David/Desktop/1230dev1/die-bonder-ui/build/Desktop_Qt_5_15_2_MSVC2019_32bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\qt\new1\die-bonder-ui\build\Desktop_Qt_5_15_2_MinGW_64_bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/qt/new1/die-bonder-ui/build/Desktop_Qt_5_15_2_MinGW_64_bit-Debug</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -327,8 +138,8 @@
     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\David\Desktop\1230dev1\die-bonder-ui\build\Desktop_Qt_5_15_2_MSVC2019_32bit-Release</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/David/Desktop/1230dev1/die-bonder-ui/build/Desktop_Qt_5_15_2_MSVC2019_32bit-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\qt\3\die-bonder-ui\build\Desktop_Qt_5_15_2_MinGW_64_bit-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/qt/3/die-bonder-ui/build/Desktop_Qt_5_15_2_MinGW_64_bit-Release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -368,8 +179,8 @@
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
     <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\David\Desktop\1230dev1\die-bonder-ui\build\Desktop_Qt_5_15_2_MSVC2019_32bit-Profile</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/David/Desktop/1230dev1/die-bonder-ui/build/Desktop_Qt_5_15_2_MSVC2019_32bit-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\qt\3\die-bonder-ui\build\Desktop_Qt_5_15_2_MinGW_64_bit-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/qt/3/die-bonder-ui/build/Desktop_Qt_5_15_2_MinGW_64_bit-Profile</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -433,20 +244,21 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
     <value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph &quot;dwarf,4096&quot; -F 250</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:</value>
-    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/Users/David/Desktop/1230dev1/die-bonder-ui/SBTdie-bonder-ui.pro</value>
-    <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">SBTdie-bonder-ui2</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/qt/new1/die-bonder-ui/SBTdie-bonder-ui.pro</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">D:/qt/new1/die-bonder-ui/SBTdie-bonder-ui.pro</value>
+    <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">true</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
     <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/qt/new1/die-bonder-ui/build/Desktop_Qt_5_15_2_MinGW_64_bit-Debug</value>
    </valuemap>
    <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>
  </data>
  <data>
   <variable>ProjectExplorer.Project.TargetCount</variable>
-  <value type="qlonglong">2</value>
+  <value type="qlonglong">1</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.Updater.FileVersion</variable>

build/Desktop_Qt_5_15_2_MinGW_64_bit-Debug/.qmake.stash

@@ -0,0 +1,21 @@
+QMAKE_CXX.QT_COMPILER_STDCXX = 201402L
+QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 8
+QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 1
+QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
+QMAKE_CXX.COMPILER_MACROS = \
+    QT_COMPILER_STDCXX \
+    QMAKE_GCC_MAJOR_VERSION \
+    QMAKE_GCC_MINOR_VERSION \
+    QMAKE_GCC_PATCH_VERSION
+QMAKE_CXX.INCDIRS = \
+    D:/app/Qt/Tools/mingw810_64/lib/gcc/x86_64-w64-mingw32/8.1.0/include/c++ \
+    D:/app/Qt/Tools/mingw810_64/lib/gcc/x86_64-w64-mingw32/8.1.0/include/c++/x86_64-w64-mingw32 \
+    D:/app/Qt/Tools/mingw810_64/lib/gcc/x86_64-w64-mingw32/8.1.0/include/c++/backward \
+    D:/app/Qt/Tools/mingw810_64/lib/gcc/x86_64-w64-mingw32/8.1.0/include \
+    D:/app/Qt/Tools/mingw810_64/lib/gcc/x86_64-w64-mingw32/8.1.0/include-fixed \
+    D:/app/Qt/Tools/mingw810_64/x86_64-w64-mingw32/include
+QMAKE_CXX.LIBDIRS = \
+    D:/app/Qt/Tools/mingw810_64/lib/gcc/x86_64-w64-mingw32/8.1.0 \
+    D:/app/Qt/Tools/mingw810_64/lib/gcc \
+    D:/app/Qt/Tools/mingw810_64/x86_64-w64-mingw32/lib \
+    D:/app/Qt/Tools/mingw810_64/lib