6 Commits 5c6c1cc810 ... 523a2a8d82

Autor SHA1 Nachricht Datum
  DESKTOP-55AB90D\user 523a2a8d82 Merge remote-tracking branch 'origin/dev' into dev vor 2 Jahren
  DESKTOP-55AB90D\user 1050dbbc9d 全息图加载不再自适应,同时设置背景色为黑色 vor 2 Jahren
  DESKTOP-55AB90D\user 922c49aaae ui小调整 vor 2 Jahren
  DESKTOP-55AB90D\user a8d5ae2669 ui界面小修改 vor 2 Jahren
  DESKTOP-55AB90D\user c7312f90d0 之前是s型路径打印 现在换成了从左往右的单向打印 vor 2 Jahren
  DESKTOP-55AB90D\user e9d24bdee4 更改了一些界面,窗口大小暂时调小 vor 2 Jahren
4 geänderte Dateien mit 350 neuen und 5 gelöschten Zeilen
  1. 6 1
      CGH_Printer.cpp
  2. 340 0
      CGH_Printer.ui
  3. 3 3
      CGH_Printer.vcxproj
  4. 1 1
      main.cpp

+ 6 - 1
CGH_Printer.cpp

@@ -1337,7 +1337,12 @@ void CGH_Printer::SLMDisplay()
     //labelPrint->move(winMain.width(), 0);
     labelPrint->showFullScreen();
     labelPrint->setAlignment(Qt::AlignCenter);
-    labelPrint->setScaledContents(true);
+    //labelPrint->setScaledContents(true);
+    labelPrint->setScaledContents(false);
+    QPalette label_palette;
+    label_palette.setColor(QPalette::Background, QColor(0, 0, 0));
+    labelPrint->setAutoFillBackground(true);
+    labelPrint->setPalette(label_palette);
 }
 
 

+ 340 - 0
CGH_Printer.ui

@@ -2333,6 +2333,346 @@ QGroupBox{background-color:rgb(235, 235,235);border:1px solid rgb(179, 179, 179)
         </item>
        </layout>
       </widget>
+      <widget class="QWidget" name="tab_8">
+       <attribute name="icon">
+        <iconset resource="CGH_Printer.qrc">
+         <normaloff>:/CGH_Printer/Configure/IMG/set.png</normaloff>:/CGH_Printer/Configure/IMG/set.png</iconset>
+       </attribute>
+       <attribute name="title">
+        <string>配置(新)</string>
+       </attribute>
+       <widget class="QWidget" name="layoutWidget">
+        <property name="geometry">
+         <rect>
+          <x>20</x>
+          <y>13</y>
+          <width>791</width>
+          <height>391</height>
+         </rect>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_75">
+         <item row="0" column="0">
+          <widget class="QGroupBox" name="groupBox_49">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+             <weight>50</weight>
+             <bold>false</bold>
+            </font>
+           </property>
+           <property name="title">
+            <string>轴x</string>
+           </property>
+           <layout class="QGridLayout" name="gridLayout_74">
+            <item row="0" column="1">
+             <widget class="QLineEdit" name="lineEditAccX_7">
+              <property name="font">
+               <font>
+                <pointsize>9</pointsize>
+               </font>
+              </property>
+              <property name="text">
+               <string>000.000</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="2">
+             <widget class="QLabel" name="label_173">
+              <property name="font">
+               <font>
+                <pointsize>9</pointsize>
+               </font>
+              </property>
+              <property name="text">
+               <string>mm/s^2</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_170">
+              <property name="font">
+               <font>
+                <pointsize>9</pointsize>
+               </font>
+              </property>
+              <property name="text">
+               <string>减速度</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_169">
+              <property name="font">
+               <font>
+                <pointsize>9</pointsize>
+               </font>
+              </property>
+              <property name="text">
+               <string>最大速度</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="2">
+             <widget class="QLabel" name="label_171">
+              <property name="font">
+               <font>
+                <pointsize>9</pointsize>
+               </font>
+              </property>
+              <property name="text">
+               <string>mm/s</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QLineEdit" name="lineEditDecX_7">
+              <property name="font">
+               <font>
+                <pointsize>9</pointsize>
+               </font>
+              </property>
+              <property name="text">
+               <string>000.000</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_172">
+              <property name="font">
+               <font>
+                <pointsize>9</pointsize>
+               </font>
+              </property>
+              <property name="text">
+               <string>加速度</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="2">
+             <widget class="QLabel" name="label_174">
+              <property name="font">
+               <font>
+                <pointsize>9</pointsize>
+               </font>
+              </property>
+              <property name="text">
+               <string>mm/s^2</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <widget class="QLineEdit" name="lineEditMaxvX_7">
+              <property name="font">
+               <font>
+                <pointsize>9</pointsize>
+               </font>
+              </property>
+              <property name="text">
+               <string>000.000</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QGroupBox" name="groupBox_47">
+           <property name="title">
+            <string>轴y</string>
+           </property>
+           <layout class="QGridLayout" name="gridLayout_73">
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_163">
+              <property name="text">
+               <string>加速度</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QLineEdit" name="lineEditAccY_7">
+              <property name="text">
+               <string>000.000</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="2">
+             <widget class="QLabel" name="label_164">
+              <property name="text">
+               <string>mm/s^2</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_165">
+              <property name="text">
+               <string>减速度</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QLineEdit" name="lineEditDecY_7">
+              <property name="text">
+               <string>000.000</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="2">
+             <widget class="QLabel" name="label_166">
+              <property name="text">
+               <string>mm/s^2</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_167">
+              <property name="text">
+               <string>最大速度</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <widget class="QLineEdit" name="lineEditMaxvY_7">
+              <property name="text">
+               <string>000.000</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="2">
+             <widget class="QLabel" name="label_168">
+              <property name="text">
+               <string>mm/s</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <spacer name="verticalSpacer_13">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item row="2" column="0">
+          <spacer name="verticalSpacer_14">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item row="2" column="1">
+          <widget class="QGroupBox" name="groupBox_48">
+           <property name="title">
+            <string/>
+           </property>
+           <layout class="QHBoxLayout" name="horizontalLayout_45">
+            <item>
+             <widget class="QPushButton" name="pushButtonTempSaved_7">
+              <property name="text">
+               <string>恢复默认</string>
+              </property>
+              <property name="icon">
+               <iconset resource="CGH_Printer.qrc">
+                <normaloff>:/CGH_Printer/Configure/IMG/zeroblue.png</normaloff>:/CGH_Printer/Configure/IMG/zeroblue.png</iconset>
+              </property>
+              <property name="iconSize">
+               <size>
+                <width>20</width>
+                <height>20</height>
+               </size>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="pushButtonPermSaved_7">
+              <property name="text">
+               <string> 永久保存</string>
+              </property>
+              <property name="icon">
+               <iconset resource="CGH_Printer.qrc">
+                <normaloff>:/CGH_Printer/Configure/IMG/saveblue.png</normaloff>:/CGH_Printer/Configure/IMG/saveblue.png</iconset>
+              </property>
+              <property name="iconSize">
+               <size>
+                <width>15</width>
+                <height>20</height>
+               </size>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </widget>
      </widget>
     </item>
    </layout>

+ 3 - 3
CGH_Printer.vcxproj

@@ -34,7 +34,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -42,7 +42,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
@@ -54,7 +54,7 @@
     <QtBuildConfig>debug</QtBuildConfig>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="QtSettings">
-    <QtInstall>5.15.2_msvc2019</QtInstall>
+    <QtInstall>Qt5.15.2_32</QtInstall>
     <QtModules>core;gui;multimedia;widgets;multimediawidgets</QtModules>
     <QtBuildConfig>debug</QtBuildConfig>
   </PropertyGroup>

+ 1 - 1
main.cpp

@@ -25,7 +25,7 @@ int main(int argc, char *argv[])
 
 
 	 //实现全屏显示
-	qputenv("QT_SCALE_FACTOR", "2.0");
+	//qputenv("QT_SCALE_FACTOR", "2.0");
 
 	//QT设计师的预览界面和运行界面不一致解决办法
 	//if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))