数据库

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -729,12 +729,12 @@ namespace XdCxRhDW.App.UserControl
                     return;
                 }
                 DtoLineXdOption dtoLineXd = new DtoLineXdOption();
-                dtoLineXd.MsEph = new double[] { cg.MainX, cg.MainY, cg.MainZ, 0, 0, 0 };
+                dtoLineXd.MsEph = new double[] { cg.MainX.Value, cg.MainY.Value, cg.MainZ.Value, 0, 0, 0 };
                 dtoLineXd.MsAnt = new double[] { satTx.Lon, satTx.Lat, 0 };
                 dtoLineXd.CDBAnt = new double[] { cdbTx.Lon, cdbTx.Lat, 0 };
                 dtoLineXd.RefGeod = new double[] { refTx.Lon, refTx.Lat, 0 };
                 dtoLineXd.xdDto = cg.DtoCdb.Value;
-                dtoLineXd.RefDto = cg.YbMain.Value;
+                dtoLineXd.RefDto = cg.YbMainDto.Value;
                 dtoLineXd.PosLon = item.PosLon;
                 dtoLineXd.PosLat = item.PosLat;
                 var xdDtoLine = DrawDtoLineHelper.DtoLineXd(dtoLineXd);
@@ -743,13 +743,13 @@ namespace XdCxRhDW.App.UserControl
                 if (posType == EnumPosType.X2D1)
                 {
                     DtoLineTwoStartOption twoStartOption = new DtoLineTwoStartOption();
-                    twoStartOption.MsEph = new double[] { cg.MainX, cg.MainY, cg.MainZ, 0, 0, 0 };
-                    twoStartOption.NsEph = new double[] { cg.AdjaX, cg.AdjaY, cg.AdjaZ, 0, 0, 0 };
+                    twoStartOption.MsEph = new double[] { cg.MainX.Value, cg.MainY.Value, cg.MainZ.Value, 0, 0, 0 };
+                    twoStartOption.NsEph = new double[] { cg.Adja1X.Value, cg.Adja1Y.Value, cg.Adja1Z.Value, 0, 0, 0 };
                     twoStartOption.MsAnt = new double[] { satTx.Lon, satTx.Lat, 0 };
                     twoStartOption.NsAnt = new double[] { satNTx.Lon, satNTx.Lat, 0 };
                     twoStartOption.RefGeod = new double[] { refTx.Lon, refTx.Lat, 0 };
-                    twoStartOption.TargetDto = cg.DtoSx.Value;
-                    twoStartOption.RefDto = cg.YbMain.Value - cg.YbAdja.Value;
+                    twoStartOption.TargetDto = cg.Dto1.Value;
+                    twoStartOption.RefDto = cg.YbMainDto.Value - cg.YbAdja1Dto.Value;
                     twoStartOption.PosLon = item.PosLon;
                     twoStartOption.PosLat = item.PosLat;
                     var tsDtoLine = DrawDtoLineHelper.DtoLineXDTwoStart(twoStartOption);
@@ -828,8 +828,8 @@ namespace XdCxRhDW.App.UserControl
                 if (posType == EnumPosType.X2D1)
                 {
                     DfoLineTwoStartOption twoStartOption = new DfoLineTwoStartOption();
-                    twoStartOption.MsEph = new double[] { cg.MainX, cg.MainY, cg.MainZ, 0, 0, 0 };
-                    twoStartOption.NsEph = new double[] { cg.AdjaX, cg.AdjaY, cg.AdjaZ, 0, 0, 0 };
+                    twoStartOption.MsEph = new double[] { cg.MainX.Value, cg.MainY.Value, cg.MainZ.Value, 0, 0, 0 };
+                    twoStartOption.NsEph = new double[] { cg.Adja1X.Value, cg.Adja1Y.Value, cg.Adja1Z.Value, 0, 0, 0 };
                     twoStartOption.MsAnt = new double[] { satTx.Lon, satTx.Lat, 0 };
                     twoStartOption.NsAnt = new double[] { satNTx.Lon, satNTx.Lat, 0 };
                     twoStartOption.RefGeod = new double[] { refTx.Lon, refTx.Lat, 0 };