Browse Source

Upgrade the standard library

cxs 3 weeks ago
parent
commit
eb9f0f9dd4

BIN
Bin/x64/Debug/Config/SysData/Cleanness_F.db


BIN
Bin/x64/Debug/Config/SysData/Cleanness_ND - 副本.db


BIN
Bin/x64/Debug/Config/SysData/Cleanness_ND.db


BIN
Bin/x64/Debug/Config/SysData/Cleanness_ND1.db


+ 18 - 16
OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/SlopFocus.cs

@@ -1,18 +1,11 @@
-using OTSCLRINTERFACE;
-using OTSDataType;
-using OTSMeasureApp._0_OTSModel.OTSDataType;
+using OTSMeasureApp._0_OTSModel.OTSDataType;
 using OTSModelSharp.ServiceCenter;
 using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
+
 namespace OTSMeasureApp
 {
     public partial class SlopFocus : Form
@@ -78,12 +71,10 @@ namespace OTSMeasureApp
             slopFocusParam.FirstWD = dPW1;
             slopFocusParam.SecondPoint = new Point((int)iPX2, (int)iPY2);
             slopFocusParam.SecondWD = dPW2;
-            slopFocusParam.ThirdPoint = new Point((int)iPX3, (int)iPY3);
-            slopFocusParam.ThirdWD = dPW3;
+            slopFocusParam.ThirdPoint = new Point((int)iPX3, (int)iPY3);slopFocusParam.ThirdWD = dPW3;
             oTSSamplespaceWindow.setSlopFocusParam(this);
-            this.Hide();
+            this.Close();
         }
-
         private void SlopFocus_Load(object sender, EventArgs e)
         {
             if(cfun==null)
@@ -92,6 +83,12 @@ namespace OTSMeasureApp
             }
         }
 
+
+
+
+
+
+
         private void bn_FirstPoint_Click(object sender, EventArgs e)
         {
             //double a, b, c;
@@ -166,13 +163,14 @@ namespace OTSMeasureApp
         private void bn_Cancel_Click(object sender, EventArgs e)
         {
             m_result = false;
-            this.Hide();
+            this.Close();
         }
 
         private void SlopFocus_FormClosing(object sender, FormClosingEventArgs e)
         {
-            e.Cancel = true;
-            this.Hide();
+            //e.Cancel = true;
+
+            this.Close();
         }
 
         private void button1_Click(object sender, EventArgs e)
@@ -183,6 +181,10 @@ namespace OTSMeasureApp
             //cfun.SetSemPositionXY(a, b, c);
             //cfun.SetSemWorkingDistance(c);
 
+
+
+
+
             if (tB_FirstPointD.Text == "")
             {
                 MessageBox.Show("Please  read first!");