gongqiuhong hace 1 año
padre
commit
2a68e90427

+ 4 - 4
XdDw.App/UserControl/CtrlPosXd.cs

@@ -101,7 +101,7 @@ namespace XdDw.App.UserControl
                         var item = gridView1.GetRow(ids[0]) as XDPosRes;
                         if (x2D1GdopParam == null)
                         {
-                            x2D1GdopParam = new X2D1GDOPParam(item.SigTime);
+                            x2D1GdopParam = new X2D1GDOPParam(item.CgResID);
                         }
                         x2D1GdopParam.mapControl1 = mapControl1;
                         PopupHelper.ShowPopup(x2D1GdopParam, mapControl1, mapControl1.Width / 4);
@@ -117,7 +117,7 @@ namespace XdDw.App.UserControl
                         var item = gridView1.GetRow(ids[0]) as XDPosRes;
                         if (x2D1ErrEllipseParam == null)
                         {
-                            x2D1ErrEllipseParam = new X2D1ErrEllipseParam(item.SigTime);
+                            x2D1ErrEllipseParam = new X2D1ErrEllipseParam(item.CgResID);
                         }
                         x2D1ErrEllipseParam.mapControl1 = mapControl1;
                         x2D1ErrEllipseParam.lon = item.PosLon;
@@ -158,7 +158,7 @@ namespace XdDw.App.UserControl
                     {
                         if (x2D1GdopParam == null)
                         {
-                            x2D1GdopParam = new X2D1GDOPParam(item.SigTime);
+                            x2D1GdopParam = new X2D1GDOPParam(item.CgResID);
                         }
                         x2D1GdopParam.mapControl1 = mapControl1;
                         PopupHelper.ShowPopup(x2D1GdopParam, mapControl1, mapControl1.Width / 4);
@@ -167,7 +167,7 @@ namespace XdDw.App.UserControl
                     {
                         if (x2D1ErrEllipseParam == null)
                         {
-                            x2D1ErrEllipseParam = new X2D1ErrEllipseParam(item.SigTime);
+                            x2D1ErrEllipseParam = new X2D1ErrEllipseParam(item.CgResID);
                         }
                         x2D1ErrEllipseParam.mapControl1 = mapControl1;
                         x2D1ErrEllipseParam.lon = item.PosLon;

+ 14 - 5
XdDw.App/UserControl/X2D1ErrEllipseParam.cs

@@ -23,6 +23,7 @@ namespace XdDw.App.UserControl
         public MapControl mapControl1;
         public double lon;
         public double lat;
+
         public ErrEllipse星地两星一地接口 Model => new ErrEllipse星地两星一地接口()
         {
             TleMain = txtTleMain.Text.Trim(),
@@ -35,19 +36,27 @@ namespace XdDw.App.UserControl
             DtousErr = Convert.ToDouble(txtDtousErr1.Text),
             SatLocErr = Convert.ToDouble(txtSatLocErr1.Text),
         };
-        public X2D1ErrEllipseParam(DateTime sigTime)
+        public X2D1ErrEllipseParam(long cgResID)
         {
             InitializeComponent();
             txtCapTime.UseDefault();
-            txtCapTime.DateTime = sigTime;
             txtTleMain.UseDoubleClickToSelectAll();
             txtTleAdja.UseDoubleClickToSelectAll();
             txtStationLocation1.UseDoubleClickToSelectAll();
             txtRefLocation1.UseDoubleClickToSelectAll();
 
-            this.txtCapTime.DateTime = sigTime;
-            this.txtStationLocation1.Text = TestData.RecLoc;
-            this.txtRefLocation1.Text = TestData.RefLoc;
+            List<TxInfo> listTx = new List<TxInfo>();
+            CgRes cg;
+            using (RHDWContext db = new RHDWContext())
+            {
+                listTx = db.TxInfos.ToList();
+                cg = db.CgRes.Where(m => m.ID == cgResID).FirstOrDefault();
+            }
+            var cdbTx = listTx.Find(p => p.TxType == EnumTxType.Cdb);
+            var refTx = listTx.Find(p => p.TxType == EnumTxType.Ref);
+            this.txtCapTime.DateTime = cg.SigTime;
+            this.txtStationLocation1.Text = $"{cdbTx.Lon},{cdbTx.Lat}";
+            this.txtRefLocation1.Text = $"{refTx.Lon},{refTx.Lat}";
             txtTleMain.UseDefault().SetStringData(TestData.AllTle).Text = TestData.TleMain;
             txtTleAdja.UseDefault().SetStringData(TestData.AllTle).Text = TestData.TleAdja1;
             this.txtDtousErr1.EditValue = TestData.DtousErr;

+ 15 - 5
XdDw.App/UserControl/X2D1GDOPParam.cs

@@ -14,6 +14,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using XdDw.App;
 using XdDw.App.Api.星地GDOP误差椭圆;
+using XdDw.App.EFContext;
 using XzXdDw.App.Model;
 
 namespace XdDw.App.UserControl
@@ -33,19 +34,28 @@ namespace XdDw.App.UserControl
             DtousErr = Convert.ToDouble(txtDtousErr1.Text),
             SatLocErr = Convert.ToDouble(txtSatLocErr1.Text),
         };
-        public X2D1GDOPParam(DateTime sigTime)
+        public X2D1GDOPParam(long cgResID)
         {
             InitializeComponent();
             txtCapTime.UseDefault();
-            txtCapTime.DateTime = sigTime;
             txtTleMain.UseDoubleClickToSelectAll();
             txtTleAdja.UseDoubleClickToSelectAll();
             txtStationLocation1.UseDoubleClickToSelectAll();
             txtRefLocation1.UseDoubleClickToSelectAll();
 
-            this.txtCapTime.DateTime = sigTime;
-            this.txtStationLocation1.Text = TestData.RecLoc;
-            this.txtRefLocation1.Text = TestData.RefLoc;
+            List<TxInfo> listTx = new List<TxInfo>();
+            CgRes cg;
+            using (RHDWContext db = new RHDWContext())
+            {
+                listTx = db.TxInfos.ToList();
+                cg = db.CgRes.Where(m => m.ID == cgResID).FirstOrDefault();
+            }
+            var cdbTx = listTx.Find(p => p.TxType == EnumTxType.Cdb);
+            var refTx = listTx.Find(p => p.TxType == EnumTxType.Ref);
+
+            this.txtCapTime.DateTime = cg.SigTime;
+            this.txtStationLocation1.Text = $"{cdbTx.Lon},{cdbTx.Lat}";
+            this.txtRefLocation1.Text = $"{refTx.Lon},{refTx.Lat}";
             txtTleMain.UseDefault().SetStringData(TestData.AllTle).Text = TestData.TleMain;
             txtTleAdja.UseDefault().SetStringData(TestData.AllTle).Text = TestData.TleAdja1;
             this.txtDtousErr1.EditValue = TestData.DtousErr;