modify ui: move system setting to page 2

src/ui/ui_ads_hmi_1px/ADCIntelligentVehicle.cpp

@@ -263,7 +263,7 @@ ADCIntelligentVehicle::ADCIntelligentVehicle(QWidget *parent)
 
     myview = new MyView(ui->stackedWidget->widget(1));
     myview->setObjectName(QStringLiteral("graphicsView"));
-    myview->setGeometry(QRect(0, 100, 900, 900)); //从屏幕上（0，100）位置开始（即为最左上角的点），显示一个900*900的界面（宽900，高900）
+    myview->setGeometry(QRect(0, 100, 900, 750)); //从屏幕上（0，100）位置开始（即为最左上角的点），显示一个900*900的界面（宽900，高900）
 
 #if 0
     myview_small = new MyView(ui->stackedWidget->widget(1));
@@ -274,17 +274,17 @@ ADCIntelligentVehicle::ADCIntelligentVehicle(QWidget *parent)
     //    myview_small->scale(0.7,0.7);
     //myview_small->centerOn(-200,-200);
 
-    image = new QImage(900 * 2, 900 * 2, QImage::Format_RGB32);//画布的初始化大小设为600*500，使用32位颜色
+    image = new QImage(900 , 750 , QImage::Format_RGB32);//画布的初始化大小设为600*500，使用32位颜色
     //QImage的32、24、8位图。 图像格式:QImage::Format_RGB32 ,QImage::Format_RGB888,QImage::Format_Indexed8。
     //QImage myImage2 = QImage(width, height, QImage::Format_…); 根据图像宽高来构造一幅图像，程序会自动根据图像格式对齐图像数据。
-    image_small = new QImage(1800,1800,QImage::Format_RGB32);
+//    image_small = new QImage(,1500,QImage::Format_RGB32);
 
     myview->setCacheMode(myview->CacheBackground);
 #if 0
     myview_small->setCacheMode(myview_small->CacheBackground);
 #endif
     painter = new QPainter(image);   //创建QPainter对象
-    painter_small = new QPainter(image_small);   //创建QPainter对象
+//    painter_small = new QPainter(image_small);   //创建QPainter对象
     scene = new QGraphicsScene;
     scene_small = new QGraphicsScene;
     timer = new QTimer(this);
@@ -1005,9 +1005,9 @@ void ADCIntelligentVehicle::closeEvent(QCloseEvent *event)
 void MyView::wheelEvent(QWheelEvent *event)
 {
     // 滚轮的滚动量
-    QPoint scrollAmount = event->angleDelta();
-    // 正值表示滚轮远离使用者（放大），负值表示朝向使用者（缩小）
-    scrollAmount.y() > 0 ? zoomIn() : zoomOut();
+//    QPoint scrollAmount = event->angleDelta();
+//    // 正值表示滚轮远离使用者（放大），负值表示朝向使用者（缩小）
+//    scrollAmount.y() > 0 ? zoomIn() : zoomOut();
 }
 
 /**
@@ -1050,7 +1050,7 @@ void ADCIntelligentVehicle::paintEvent(QPaintEvent *)
 
         // image->fill(QColor(60, 60, 60));//对画布进行填充
         image->fill(QColor(220, 220, 220));//对画布进行填充
-        image_small->fill(QColor(220,220,220));
+//        image_small->fill(QColor(220,220,220));
         std::vector<iv::GPSData> navigation_data;
         mMutexNavi.lock();
         navigation_data = m_navigation_data;
@@ -1074,7 +1074,7 @@ void ADCIntelligentVehicle::paintEvent(QPaintEvent *)
 
         //        std::vector<iv::GPSData> navigation_data = brain->navigation_data;
         painter->setRenderHint(QPainter::Antialiasing, true);//设置反锯齿模式，好看一点
-        painter_small->setRenderHint(QPainter::Antialiasing, true);//设置反锯齿模式，好看一点
+//        painter_small->setRenderHint(QPainter::Antialiasing, true);//设置反锯齿模式，好看一点
 
 
         int pointx = 450, pointy = 700;//确定坐标轴起点坐标，这里定义(35,280)

src/ui/ui_ads_hmi_1px/ADCIntelligentVehicle.ui

@@ -376,113 +376,6 @@
      <number>1</number>
     </property>
     <widget class="QWidget" name="page_0">
-     <widget class="QGroupBox" name="groupBox_2">
-      <property name="enabled">
-       <bool>true</bool>
-      </property>
-      <property name="geometry">
-       <rect>
-        <x>140</x>
-        <y>330</y>
-        <width>571</width>
-        <height>261</height>
-       </rect>
-      </property>
-      <property name="font">
-       <font>
-        <family>AR PL UKai CN</family>
-       </font>
-      </property>
-      <property name="styleSheet">
-       <string notr="true">color: rgb(238, 238, 236);</string>
-      </property>
-      <property name="title">
-       <string>系统功能</string>
-      </property>
-      <layout class="QGridLayout" name="gridLayout_8">
-       <item row="0" column="0">
-        <widget class="QPushButton" name="button_start">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="font">
-          <font>
-           <family>AR PL UKai CN</family>
-          </font>
-         </property>
-         <property name="text">
-          <string>启动自动驾驶</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QPushButton" name="button_platform_en">
-         <property name="font">
-          <font>
-           <family>AR PL UKai CN</family>
-          </font>
-         </property>
-         <property name="text">
-          <string>云平台开关</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QPushButton" name="button_obu_en">
-         <property name="font">
-          <font>
-           <family>AR PL UKai CN</family>
-          </font>
-         </property>
-         <property name="text">
-          <string>路测开关</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="2">
-        <widget class="QPushButton" name="button_vin_set">
-         <property name="font">
-          <font>
-           <family>AR PL UKai CN</family>
-          </font>
-         </property>
-         <property name="text">
-          <string>VIN设置</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="2">
-        <widget class="QPushButton" name="button_speedLimit_set">
-         <property name="font">
-          <font>
-           <family>AR PL UKai CN</family>
-          </font>
-         </property>
-         <property name="text">
-          <string>限速设置</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QPushButton" name="button_map_set">
-         <property name="font">
-          <font>
-           <family>AR PL UKai CN</family>
-          </font>
-         </property>
-         <property name="statusTip">
-          <string/>
-         </property>
-         <property name="whatsThis">
-          <string extracomment="请在配置文件中设置终点信息"/>
-         </property>
-         <property name="text">
-          <string>地图设置</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
      <widget class="QLabel" name="label_5">
       <property name="geometry">
        <rect>
@@ -11847,7 +11740,7 @@ p, li { white-space: pre-wrap; }
     <property name="geometry">
      <rect>
       <x>1020</x>
-      <y>910</y>
+      <y>920</y>
       <width>178</width>
       <height>31</height>
      </rect>
@@ -11878,10 +11771,118 @@ p, li { white-space: pre-wrap; }
      </item>
     </layout>
    </widget>
+   <widget class="QGroupBox" name="groupBox_2">
+    <property name="enabled">
+     <bool>true</bool>
+    </property>
+    <property name="geometry">
+     <rect>
+      <x>50</x>
+      <y>890</y>
+      <width>781</width>
+      <height>71</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>AR PL UKai CN</family>
+     </font>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">color: rgb(238, 238, 236);</string>
+    </property>
+    <property name="title">
+     <string>系统设置</string>
+    </property>
+    <layout class="QGridLayout" name="gridLayout_8">
+     <item row="0" column="1">
+      <widget class="QPushButton" name="button_obu_en">
+       <property name="font">
+        <font>
+         <family>AR PL UKai CN</family>
+        </font>
+       </property>
+       <property name="text">
+        <string>路测开关</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QPushButton" name="button_start">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="font">
+        <font>
+         <family>AR PL UKai CN</family>
+        </font>
+       </property>
+       <property name="text">
+        <string>启动自动驾驶</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QPushButton" name="button_vin_set">
+       <property name="font">
+        <font>
+         <family>AR PL UKai CN</family>
+        </font>
+       </property>
+       <property name="text">
+        <string>VIN设置</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <widget class="QPushButton" name="button_map_set">
+       <property name="font">
+        <font>
+         <family>AR PL UKai CN</family>
+        </font>
+       </property>
+       <property name="statusTip">
+        <string/>
+       </property>
+       <property name="whatsThis">
+        <string extracomment="请在配置文件中设置终点信息"/>
+       </property>
+       <property name="text">
+        <string>地图设置</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="4">
+      <widget class="QPushButton" name="button_platform_en">
+       <property name="font">
+        <font>
+         <family>AR PL UKai CN</family>
+        </font>
+       </property>
+       <property name="text">
+        <string>云平台开关</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="5">
+      <widget class="QPushButton" name="button_speedLimit_set">
+       <property name="font">
+        <font>
+         <family>AR PL UKai CN</family>
+        </font>
+       </property>
+       <property name="text">
+        <string>限速设置</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
    <zorder>listWidget</zorder>
    <zorder>widget</zorder>
    <zorder>stackedWidget</zorder>
    <zorder>verticalLayoutWidget</zorder>
+   <zorder>groupBox_2</zorder>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">