更新“手动”功能页

CGH_Printer.cpp

@@ -265,10 +265,11 @@ void CGH_Printer::ReadConfigure()
     infile.close();
 
     // 参数设置
-    ui.lineEditMoveUp->setText(QString::fromStdString(maps_Configure["前"]));
-    ui.lineEditMoveDown->setText(QString::fromStdString(maps_Configure["后"]));
-    ui.lineEditMoveLeft->setText(QString::fromStdString(maps_Configure["左"]));
-    ui.lineEditMoveRight->setText(QString::fromStdString(maps_Configure["右"]));
+    //ui.lineEditMoveUp->setText(QString::fromStdString(maps_Configure["前"]));
+    //ui.lineEditMoveDown->setText(QString::fromStdString(maps_Configure["后"]));
+    //ui.lineEditMoveLeft->setText(QString::fromStdString(maps_Configure["左"]));
+    //ui.lineEditMoveRight->setText(QString::fromStdString(maps_Configure["右"]));
+    ui.lineEditMove->setText(QString::fromStdString(maps_Configure["位移"]));
     ui.lineEditShutter->setText(QString::fromStdString(maps_Configure["时间"]));
 
     ReadTransTableConfigue();
@@ -476,7 +477,7 @@ void CGH_Printer::MoveUp()
 {
     if (curTransTableState)
     {
-        double offset = ui.lineEditMoveUp->text().toDouble();
+        double offset = ui.lineEditMove->text().toDouble();
         offset = -1 * offset;
 
         if (!PI_MVR(Devices[1], sAxis.c_str(), &offset))
@@ -502,7 +503,7 @@ void CGH_Printer::MoveDown()
 {
     if (curTransTableState)
     {
-        double offset = ui.lineEditMoveDown->text().toDouble();
+        double offset = ui.lineEditMove->text().toDouble();
 
         if (!PI_MVR(Devices[1], sAxis.c_str(), &offset))
         {
@@ -528,7 +529,7 @@ void CGH_Printer::MoveLeft()
 {
     if (curTransTableState)
     {
-        double offset = ui.lineEditMoveLeft->text().toDouble();
+        double offset = ui.lineEditMove->text().toDouble();
 
         if (!PI_MVR(Devices[0], sAxis.c_str(), &offset))
         {
@@ -554,7 +555,7 @@ void CGH_Printer::MoveRight()
 {
     if (curTransTableState)
     {
-        double offset = ui.lineEditMoveRight->text().toDouble();
+        double offset = ui.lineEditMove->text().toDouble();
         offset = -1 * offset;
 
         if (!PI_MVR(Devices[0], sAxis.c_str(), &offset))

CGH_Printer.vcxproj

@@ -237,10 +237,10 @@
     <QtMoc Include="Include\CGH_Printer.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="Include\resource.h" />
     <ClInclude Include="Include\SerialPort.h" />
     <ClInclude Include="Include\ui_CGH_Printer.h" />
     <ClInclude Include="Include\ui_CGH_ProjectView.h" />
-    <ClInclude Include="resource.h" />
     <QtMoc Include="Include\CGH_CheckStateThread.h" />
     <QtMoc Include="Include\CGH_CoordinateThread.h" />
     <ClInclude Include="Include\CGH_Project.h" />

CGH_Printer.vcxproj.filters

@@ -110,13 +110,13 @@
     <ClInclude Include="Include\ui_CGH_ProjectView.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Include\ui_CGH_Printer.h">
+    <ClInclude Include="Include\SerialPort.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="Include\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Include\SerialPort.h">
+    <ClInclude Include="Include\ui_CGH_Printer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

CGH_Printer.vcxproj.user

@@ -2,15 +2,15 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup />
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <QtLastBackgroundBuild>2022-11-22T00:45:16.6561437Z</QtLastBackgroundBuild>
+    <QtLastBackgroundBuild>2022-12-08T11:35:50.5996402Z</QtLastBackgroundBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="QtSettings">
-    <QtLastBackgroundBuild>2022-06-16T06:46:31.0161586Z</QtLastBackgroundBuild>
+    <QtLastBackgroundBuild>2022-12-08T11:35:50.7354092Z</QtLastBackgroundBuild>
   </PropertyGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <QtLastBackgroundBuild>2022-11-22T00:45:09.0611728Z</QtLastBackgroundBuild>
+    <QtLastBackgroundBuild>2022-12-08T11:35:50.8457378Z</QtLastBackgroundBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="QtSettings">
-    <QtLastBackgroundBuild>2022-06-16T06:46:31.5458195Z</QtLastBackgroundBuild>
+    <QtLastBackgroundBuild>2022-12-08T11:35:50.9357384Z</QtLastBackgroundBuild>
   </PropertyGroup>
 </Project>

Configure/Configure.txt

@@ -1,5 +1,2 @@
-前 10.0000
-后 10.0000
-左 10.0000
-右 10.0000
+位移 10.0000
 时间 10000