wyq 1 жил өмнө
parent
commit
fd22e5a6a2

+ 10 - 8
XdDw.App/EditForms/X2D1PosParamEditor.cs

@@ -26,6 +26,8 @@ namespace XdDw.App.EditForms
         public XDPosRes info;
         public List<TxInfo> listTx;
         private CgRes cgRes;
+
+        private double[] PosRes;
         private Action callBack;
         public X2D1PosParamEditor(XDPosRes info, CgRes cgRes, List<TxInfo> listTx, Action callBack)
         {
@@ -113,16 +115,16 @@ namespace XdDw.App.EditForms
                 cgRes.AdjaZ = Convert.ToDouble(this.txtAdjaZ.Text);
 
                 string posstr = this.listBox.Items[0].ToString();
-                var allstrs = posstr.Split(new string[] { ":", "PosLon", "PosLat", "MirrLon", "MirrLat" }, StringSplitOptions.RemoveEmptyEntries);
+                var allstrs = posstr.Split(new string[] { ":", "定位经度", "定位纬度", "镜像经度", "镜像纬度" }, StringSplitOptions.RemoveEmptyEntries);
 
-                if (allstrs.Length == 5)
+                if (allstrs.Length == 4)
                 {
                     using (RHDWContext db = new RHDWContext())
                     {
-                        info.PosLon = Convert.ToDouble(allstrs[1]);
-                        info.PosLat = Convert.ToDouble(allstrs[2]);
-                        info.MirrLon = Convert.ToDouble(allstrs[3]);
-                        info.MirrLat = Convert.ToDouble(allstrs[4]);
+                        info.PosLon = Convert.ToDouble(PosRes[0]);
+                        info.PosLat = Convert.ToDouble(PosRes[1]);
+                        info.MirrLon = Convert.ToDouble(PosRes[3]);
+                        info.MirrLat = Convert.ToDouble(PosRes[4]);
                         db.CgRes.AddOrUpdate(cgRes);//参估结果入库
                         db.XDPosRes.AddOrUpdate(info);//定位结果入库
                         db.SaveChangesAsync();
@@ -186,8 +188,8 @@ namespace XdDw.App.EditForms
                 cgRes.AdjaY = Convert.ToDouble(this.txtAdjaY.Text);
                 cgRes.AdjaZ = Convert.ToDouble(this.txtAdjaZ.Text);
 
-                var res = PosApi.X2D1_POS(cgRes, satTx, cdbTx, refTx);
-                listBox.Items.Add($" 定位结果 PosLon:{res[0]} PosLat:{res[1]} MirrLon:{res[3]} MirrLat:{res[4]}");
+                PosRes = PosApi.X2D1_POS(cgRes, satTx, cdbTx, refTx);
+                listBox.Items.Add($"定位经度:{PosRes[0]:f4} 定位纬度:{PosRes[1]:f4} 镜像经度:{PosRes[3]:f4} 镜像纬度:{PosRes[4]:f4}");
 
 
             }

+ 11 - 10
XzDw.App/EditForms/SinglePosParamEditor.cs

@@ -26,6 +26,7 @@ namespace XzXdDw.App.EditForms
         public PosRes info;
         private CgRes cgRes1;
         private CgRes cgRes2;
+        private double[] PosRes;
         private Action callBack;
         public SinglePosParamEditor(PosRes info, CgRes cgRes1, CgRes cgRes2, Action callBack)
         {
@@ -57,7 +58,7 @@ namespace XzXdDw.App.EditForms
 
             this.txtDfoSx1.Text = $"{cgRes1.DfoSx}";
             this.txtDfoSx2.Text = $"{cgRes2.DfoSx}";
-            this.txtUpFreq.Text = $"{info.UpFreq/1000000}";
+            this.txtUpFreq.Text = $"{info.UpFreq / 1000000}";
             this.sigTime.EditValue = cgRes1.SigTime;
 
             this.txtMainX.Text = $"{cgRes1.MainX}";
@@ -123,20 +124,20 @@ namespace XzXdDw.App.EditForms
                 cgRes2.AdjaVY = Convert.ToDouble(this.txtMainVY11.Text);
                 cgRes2.AdjaVZ = Convert.ToDouble(this.txtMainVZ11.Text);
 
-                info.UpFreq= Convert.ToDouble(this.txtUpFreq.Text) * 1e6;
+                info.UpFreq = Convert.ToDouble(this.txtUpFreq.Text) * 1e6;
                 info.UpdateTime = DateTime.Now;
 
                 string posstr = this.listBox.Items[0].ToString();
-                var allstrs = posstr.Split(new string[] { ":", "PosLon", "PosLat", "MirrLon", "MirrLat" }, StringSplitOptions.RemoveEmptyEntries);
+                var allstrs = posstr.Split(new string[] { ":", "定位经度", "定位纬度", "镜像经度", "镜像纬度" }, StringSplitOptions.RemoveEmptyEntries);
 
-                if (allstrs.Length == 5)
+                if (allstrs.Length == 4)
                 {
                     using (RHDWContext db = new RHDWContext())
                     {
-                        info.PosLon = Convert.ToDouble(allstrs[1]);
-                        info.PosLat = Convert.ToDouble(allstrs[2]);
-                        info.MirrLon = Convert.ToDouble(allstrs[3]);
-                        info.MirrLat = Convert.ToDouble(allstrs[4]);
+                        info.PosLon = Convert.ToDouble(PosRes[0]);
+                        info.PosLat = Convert.ToDouble(PosRes[1]);
+                        info.MirrLon = Convert.ToDouble(PosRes[3]);
+                        info.MirrLat = Convert.ToDouble(PosRes[4]);
                         db.CgRes.AddOrUpdate(cgRes1);//参估结果入库
                         db.CgRes.AddOrUpdate(cgRes2);//参估结果入库
                         db.PosRes.AddOrUpdate(info);//定位结果入库
@@ -194,8 +195,8 @@ namespace XzXdDw.App.EditForms
                 };
                 double Upfreq = Convert.ToDouble(this.txtUpFreq.Text) * 1e6;
 
-                var res = PosApi.X1_POS(cgRes1, cgRes2, Upfreq);
-                listBox.Items.Add($" 定位结果 PosLon:{res[0]} PosLat:{res[1]} MirrLon:{res[3]} MirrLat:{res[4]}");
+                PosRes = PosApi.X1_POS(cgRes1, cgRes2, Upfreq);
+                listBox.Items.Add($"定位经度:{PosRes[0]:f4} 定位纬度:{PosRes[1]:f4} 镜像经度:{PosRes[3]:f4} 镜像纬度:{PosRes[4]:f4}");
 
 
             }

+ 10 - 8
XzDw.App/EditForms/X2D1PosParamEditor.cs

@@ -26,6 +26,8 @@ namespace XzXdDw.App.EditForms
         public XDPosRes info;
         public List<TxInfo> listTx;
         private CgRes cgRes;
+
+        private double[] PosRes;
         private Action callBack;
         public X2D1PosParamEditor(XDPosRes info, CgRes cgRes, List<TxInfo> listTx, Action callBack)
         {
@@ -113,16 +115,16 @@ namespace XzXdDw.App.EditForms
                 cgRes.AdjaZ = Convert.ToDouble(this.txtAdjaZ.Text);
 
                 string posstr = this.listBox.Items[0].ToString();
-                var allstrs = posstr.Split(new string[] { ":", "PosLon", "PosLat", "MirrLon", "MirrLat" }, StringSplitOptions.RemoveEmptyEntries);
+                var allstrs = posstr.Split(new string[] { ":", "定位经度", "定位纬度", "镜像经度", "镜像纬度" }, StringSplitOptions.RemoveEmptyEntries);
 
-                if (allstrs.Length == 5)
+                if (allstrs.Length == 4)
                 {
                     using (RHDWContext db = new RHDWContext())
                     {
-                        info.PosLon = Convert.ToDouble(allstrs[1]);
-                        info.PosLat = Convert.ToDouble(allstrs[2]);
-                        info.MirrLon = Convert.ToDouble(allstrs[3]);
-                        info.MirrLat = Convert.ToDouble(allstrs[4]);
+                        info.PosLon = Convert.ToDouble(PosRes[0]);
+                        info.PosLat = Convert.ToDouble(PosRes[1]);
+                        info.MirrLon = Convert.ToDouble(PosRes[3]);
+                        info.MirrLat = Convert.ToDouble(PosRes[4]);
                         db.CgRes.AddOrUpdate(cgRes);//参估结果入库
                         db.XDPosRes.AddOrUpdate(info);//定位结果入库
                         db.SaveChangesAsync();
@@ -186,8 +188,8 @@ namespace XzXdDw.App.EditForms
                 cgRes.AdjaY = Convert.ToDouble(this.txtAdjaY.Text);
                 cgRes.AdjaZ = Convert.ToDouble(this.txtAdjaZ.Text);
 
-                var res = PosApi.X2D1_POS(cgRes, satTx, cdbTx, refTx);
-                listBox.Items.Add($" 定位结果 PosLon:{res[0]} PosLat:{res[1]} MirrLon:{res[3]} MirrLat:{res[4]}");
+                PosRes = PosApi.X2D1_POS(cgRes, satTx, cdbTx, refTx);
+                listBox.Items.Add($"定位经度:{PosRes[0]:f4} 定位纬度:{PosRes[1]:f4} 镜像经度:{PosRes[3]:f4} 镜像纬度:{PosRes[4]:f4}");
 
 
             }

+ 10 - 8
XzDw.App/EditForms/X2PosParamEditor.cs

@@ -25,6 +25,8 @@ namespace XzXdDw.App.EditForms
     {
         public XZPosRes info;
         private CgRes cgRes;
+
+        private double[] PosRes;
         private Action callBack;
         public X2PosParamEditor(XZPosRes info, CgRes cgRes, TxInfo refTx,double fu1,double fu2, Action callBack)
         {
@@ -95,16 +97,16 @@ namespace XzXdDw.App.EditForms
                 cgRes.AdjaVZ = Convert.ToDouble(this.txtAdjaVZ.Text);
 
                 string posstr = this.listBox.Items[0].ToString();
-                var allstrs = posstr.Split(new string[] { ":", "PosLon", "PosLat", "MirrLon", "MirrLat" }, StringSplitOptions.RemoveEmptyEntries);
+                var allstrs = posstr.Split(new string[] { ":", "定位经度", "定位纬度", "镜像经度", "镜像纬度" }, StringSplitOptions.RemoveEmptyEntries);
 
-                if (allstrs.Length == 5)
+                if (allstrs.Length == 4)
                 {
                     using (RHDWContext db = new RHDWContext())
                     {
-                        info.PosLon = Convert.ToDouble(allstrs[1]);
-                        info.PosLat = Convert.ToDouble(allstrs[2]);
-                        info.MirrLon = Convert.ToDouble(allstrs[3]);
-                        info.MirrLat = Convert.ToDouble(allstrs[4]);
+                        info.PosLon = Convert.ToDouble(PosRes[0]);
+                        info.PosLat = Convert.ToDouble(PosRes[1]);
+                        info.MirrLon = Convert.ToDouble(PosRes[3]);
+                        info.MirrLat = Convert.ToDouble(PosRes[4]);
                         db.CgRes.AddOrUpdate(cgRes);//参估结果入库
                         db.XZPosRes.AddOrUpdate(info);//定位结果入库
                         db.SaveChangesAsync();
@@ -163,8 +165,8 @@ namespace XzXdDw.App.EditForms
                 cgRes.AdjaVY = Convert.ToDouble(this.txtAdjaVY.Text);
                 cgRes.AdjaVZ = Convert.ToDouble(this.txtAdjaVZ.Text);
 
-                var res = PosApi.X2_POS(cgRes,refTx,fu1,fu2);
-                listBox.Items.Add($" 定位结果 PosLon:{res[0]} PosLat:{res[1]} MirrLon:{res[3]} MirrLat:{res[4]}");
+                PosRes = PosApi.X2_POS(cgRes,refTx,fu1,fu2);
+                listBox.Items.Add($"定位经度:{PosRes[0]:f4} 定位纬度:{PosRes[1]:f4} 镜像经度:{PosRes[3]:f4} 镜像纬度:{PosRes[4]:f4}");
 
 
             }

+ 11 - 10
XzXdDw.App/EditForms/SinglePosParamEditor.cs

@@ -26,6 +26,7 @@ namespace XzXdDw.App.EditForms
         public PosRes info;
         private CgRes cgRes1;
         private CgRes cgRes2;
+        private double[] PosRes;
         private Action callBack;
         public SinglePosParamEditor(PosRes info, CgRes cgRes1, CgRes cgRes2, Action callBack)
         {
@@ -57,7 +58,7 @@ namespace XzXdDw.App.EditForms
 
             this.txtDfoSx1.Text = $"{cgRes1.DfoSx}";
             this.txtDfoSx2.Text = $"{cgRes2.DfoSx}";
-            this.txtUpFreq.Text = $"{info.UpFreq/1000000}";
+            this.txtUpFreq.Text = $"{info.UpFreq / 1000000}";
             this.sigTime.EditValue = cgRes1.SigTime;
 
             this.txtMainX.Text = $"{cgRes1.MainX}";
@@ -123,20 +124,20 @@ namespace XzXdDw.App.EditForms
                 cgRes2.AdjaVY = Convert.ToDouble(this.txtMainVY11.Text);
                 cgRes2.AdjaVZ = Convert.ToDouble(this.txtMainVZ11.Text);
 
-                info.UpFreq= Convert.ToDouble(this.txtUpFreq.Text) * 1e6;
+                info.UpFreq = Convert.ToDouble(this.txtUpFreq.Text) * 1e6;
                 info.UpdateTime = DateTime.Now;
 
                 string posstr = this.listBox.Items[0].ToString();
-                var allstrs = posstr.Split(new string[] { ":", "PosLon", "PosLat", "MirrLon", "MirrLat" }, StringSplitOptions.RemoveEmptyEntries);
+                var allstrs = posstr.Split(new string[] { ":", "定位经度", "定位纬度", "镜像经度", "镜像纬度" }, StringSplitOptions.RemoveEmptyEntries);
 
-                if (allstrs.Length == 5)
+                if (allstrs.Length == 4)
                 {
                     using (RHDWContext db = new RHDWContext())
                     {
-                        info.PosLon = Convert.ToDouble(allstrs[1]);
-                        info.PosLat = Convert.ToDouble(allstrs[2]);
-                        info.MirrLon = Convert.ToDouble(allstrs[3]);
-                        info.MirrLat = Convert.ToDouble(allstrs[4]);
+                        info.PosLon = Convert.ToDouble(PosRes[0]);
+                        info.PosLat = Convert.ToDouble(PosRes[1]);
+                        info.MirrLon = Convert.ToDouble(PosRes[3]);
+                        info.MirrLat = Convert.ToDouble(PosRes[4]);
                         db.CgRes.AddOrUpdate(cgRes1);//参估结果入库
                         db.CgRes.AddOrUpdate(cgRes2);//参估结果入库
                         db.PosRes.AddOrUpdate(info);//定位结果入库
@@ -194,8 +195,8 @@ namespace XzXdDw.App.EditForms
                 };
                 double Upfreq = Convert.ToDouble(this.txtUpFreq.Text) * 1e6;
 
-                var res = PosApi.X1_POS(cgRes1, cgRes2, Upfreq);
-                listBox.Items.Add($" 定位结果 PosLon:{res[0]} PosLat:{res[1]} MirrLon:{res[3]} MirrLat:{res[4]}");
+                PosRes = PosApi.X1_POS(cgRes1, cgRes2, Upfreq);
+                listBox.Items.Add($"定位经度:{PosRes[0]:f4} 定位纬度:{PosRes[1]:f4} 镜像经度:{PosRes[3]:f4} 镜像纬度:{PosRes[4]:f4}");
 
 
             }

+ 10 - 8
XzXdDw.App/EditForms/X2D1PosParamEditor.cs

@@ -26,6 +26,8 @@ namespace XzXdDw.App.EditForms
         public XDPosRes info;
         public List<TxInfo> listTx;
         private CgRes cgRes;
+
+        private double[] PosRes;
         private Action callBack;
         public X2D1PosParamEditor(XDPosRes info, CgRes cgRes, List<TxInfo> listTx, Action callBack)
         {
@@ -113,16 +115,16 @@ namespace XzXdDw.App.EditForms
                 cgRes.AdjaZ = Convert.ToDouble(this.txtAdjaZ.Text);
 
                 string posstr = this.listBox.Items[0].ToString();
-                var allstrs = posstr.Split(new string[] { ":", "PosLon", "PosLat", "MirrLon", "MirrLat" }, StringSplitOptions.RemoveEmptyEntries);
+                var allstrs = posstr.Split(new string[] { ":", "定位经度", "定位纬度", "镜像经度", "镜像纬度" }, StringSplitOptions.RemoveEmptyEntries);
 
-                if (allstrs.Length == 5)
+                if (allstrs.Length == 4)
                 {
                     using (RHDWContext db = new RHDWContext())
                     {
-                        info.PosLon = Convert.ToDouble(allstrs[1]);
-                        info.PosLat = Convert.ToDouble(allstrs[2]);
-                        info.MirrLon = Convert.ToDouble(allstrs[3]);
-                        info.MirrLat = Convert.ToDouble(allstrs[4]);
+                        info.PosLon = Convert.ToDouble(PosRes[0]);
+                        info.PosLat = Convert.ToDouble(PosRes[1]);
+                        info.MirrLon = Convert.ToDouble(PosRes[3]);
+                        info.MirrLat = Convert.ToDouble(PosRes[4]);
                         db.CgRes.AddOrUpdate(cgRes);//参估结果入库
                         db.XDPosRes.AddOrUpdate(info);//定位结果入库
                         db.SaveChangesAsync();
@@ -186,8 +188,8 @@ namespace XzXdDw.App.EditForms
                 cgRes.AdjaY = Convert.ToDouble(this.txtAdjaY.Text);
                 cgRes.AdjaZ = Convert.ToDouble(this.txtAdjaZ.Text);
 
-                var res = PosApi.X2D1_POS(cgRes, satTx, cdbTx, refTx);
-                listBox.Items.Add($" 定位结果 PosLon:{res[0]} PosLat:{res[1]} MirrLon:{res[3]} MirrLat:{res[4]}");
+                PosRes = PosApi.X2D1_POS(cgRes, satTx, cdbTx, refTx);
+                listBox.Items.Add($"定位经度:{PosRes[0]:f4} 定位纬度:{PosRes[1]:f4} 镜像经度:{PosRes[3]:f4} 镜像纬度:{PosRes[4]:f4}");
 
 
             }

+ 10 - 8
XzXdDw.App/EditForms/X2PosParamEditor.cs

@@ -25,6 +25,8 @@ namespace XzXdDw.App.EditForms
     {
         public XZPosRes info;
         private CgRes cgRes;
+
+        private double[] PosRes;
         private Action callBack;
         public X2PosParamEditor(XZPosRes info, CgRes cgRes, TxInfo refTx,double fu1,double fu2, Action callBack)
         {
@@ -95,16 +97,16 @@ namespace XzXdDw.App.EditForms
                 cgRes.AdjaVZ = Convert.ToDouble(this.txtAdjaVZ.Text);
 
                 string posstr = this.listBox.Items[0].ToString();
-                var allstrs = posstr.Split(new string[] { ":", "PosLon", "PosLat", "MirrLon", "MirrLat" }, StringSplitOptions.RemoveEmptyEntries);
+                var allstrs = posstr.Split(new string[] { ":", "定位经度", "定位纬度", "镜像经度", "镜像纬度" }, StringSplitOptions.RemoveEmptyEntries);
 
-                if (allstrs.Length == 5)
+                if (allstrs.Length == 4)
                 {
                     using (RHDWContext db = new RHDWContext())
                     {
-                        info.PosLon = Convert.ToDouble(allstrs[1]);
-                        info.PosLat = Convert.ToDouble(allstrs[2]);
-                        info.MirrLon = Convert.ToDouble(allstrs[3]);
-                        info.MirrLat = Convert.ToDouble(allstrs[4]);
+                        info.PosLon = Convert.ToDouble(PosRes[0]);
+                        info.PosLat = Convert.ToDouble(PosRes[1]);
+                        info.MirrLon = Convert.ToDouble(PosRes[3]);
+                        info.MirrLat = Convert.ToDouble(PosRes[4]);
                         db.CgRes.AddOrUpdate(cgRes);//参估结果入库
                         db.XZPosRes.AddOrUpdate(info);//定位结果入库
                         db.SaveChangesAsync();
@@ -163,8 +165,8 @@ namespace XzXdDw.App.EditForms
                 cgRes.AdjaVY = Convert.ToDouble(this.txtAdjaVY.Text);
                 cgRes.AdjaVZ = Convert.ToDouble(this.txtAdjaVZ.Text);
 
-                var res = PosApi.X2_POS(cgRes,refTx,fu1,fu2);
-                listBox.Items.Add($" 定位结果 PosLon:{res[0]} PosLat:{res[1]} MirrLon:{res[3]} MirrLat:{res[4]}");
+                PosRes = PosApi.X2_POS(cgRes,refTx,fu1,fu2);
+                listBox.Items.Add($"定位经度:{PosRes[0]:f4} 定位纬度:{PosRes[1]:f4} 镜像经度:{PosRes[3]:f4} 镜像纬度:{PosRes[4]:f4}");
 
 
             }