Browse Source

update SemPosition.cs and CutHole.cs

@wang_qi0307 5 years ago
parent
commit
abf95a79b5
2 changed files with 3 additions and 33 deletions
  1. 1 31
      MeasureData/CutHole.cs
  2. 2 2
      MeasureData/SemPosition.cs

+ 1 - 31
MeasureData/CutHole.cs

@@ -139,31 +139,7 @@ namespace MeasureData
             SampleName.AssignValue(this.HoleName);
             SampleName.AssignValue(this.HoleName);
             slo_cuthole.Register("SampleName", SampleName);
             slo_cuthole.Register("SampleName", SampleName);
 
 
-            Slo<SemPosition> slo_sp = new Slo<SemPosition>();
-            xDouble ptx = new xDouble();
-            ptx.AssignValue(this.Position.X);
-            slo_sp.Register("X", ptx);
-
-            xDouble pty = new xDouble();
-            pty.AssignValue(this.Position.X);
-            slo_sp.Register("Y", pty);
-
-            xDouble ptz = new xDouble();
-            ptz.AssignValue(this.Position.Z);
-            slo_sp.Register("Z", ptz);
-
-            xDouble ptt = new xDouble();
-            ptt.AssignValue(this.Position.T);
-            slo_sp.Register("T", ptt);
-
-            xDouble ptr = new xDouble();
-            ptr.AssignValue(this.Position.R);
-            slo_sp.Register("R", ptr);
-
-            xDouble ptm = new xDouble();
-            ptx.AssignValue(this.Position.M);
-            slo_sp.Register("M", ptm);
-            slo_cuthole.Register("Position", slo_sp);
+            slo_cuthole.Register("Position", this.Position);
            
            
             //操作步骤
             //操作步骤
             xInt OPT = new xInt();
             xInt OPT = new xInt();
@@ -199,12 +175,6 @@ namespace MeasureData
                 this.END = END.value();
                 this.END = END.value();
                 this.STATE = (State)STATE.value();
                 this.STATE = (State)STATE.value();
                 this.SWITCH = SWITCH.value();
                 this.SWITCH = SWITCH.value();
-                this.Position.X = (float)ptx.value();
-                this.Position.Y = (float)pty.value();
-                this.Position.Z = (float)ptz.value();
-                this.Position.T = (float)ptt.value();
-                this.Position.R = (float)ptr.value();
-                this.Position.M = (float)ptm.value();
             }
             }
         }
         }
 
 

+ 2 - 2
MeasureData/SemPosition.cs

@@ -156,7 +156,7 @@ namespace MeasureData
             slo_sp.Register("X", ptx);
             slo_sp.Register("X", ptx);
 
 
             xDouble pty = new xDouble();
             xDouble pty = new xDouble();
-            pty.AssignValue(this.X);
+            pty.AssignValue(this.Y);
             slo_sp.Register("Y", pty);
             slo_sp.Register("Y", pty);
 
 
             xDouble ptz = new xDouble();
             xDouble ptz = new xDouble();
@@ -172,7 +172,7 @@ namespace MeasureData
             slo_sp.Register("R", ptr);
             slo_sp.Register("R", ptr);
 
 
             xDouble ptm = new xDouble();
             xDouble ptm = new xDouble();
-            ptx.AssignValue(this.M);
+            ptm.AssignValue(this.M);
             slo_sp.Register("M", ptm);
             slo_sp.Register("M", ptm);
 
 
             if (isStoring)
             if (isStoring)