|
@@ -5,6 +5,7 @@ using System;
|
|
|
using System.CodeDom;
|
|
|
using System.Collections.Generic;
|
|
|
using System.ComponentModel;
|
|
|
+using System.Configuration;
|
|
|
using System.Data;
|
|
|
using System.Data.Entity;
|
|
|
using System.Drawing;
|
|
@@ -98,6 +99,14 @@ namespace XdCxRhDW.App.EditForms
|
|
|
txtRefLocation.Properties.ReadOnly = true;
|
|
|
this.txtRefLocation.Text = $"{0},{0}";
|
|
|
}
|
|
|
+
|
|
|
+ //txtsatStation.Text = "43.7,12.9";
|
|
|
+ //txtcdbStation.Text = "43.7,12.9";
|
|
|
+ //txtDtoSx.Text = "6348.6030";
|
|
|
+ //txtDtoCdb.Text = "246616.0330";
|
|
|
+ //ucEphXYZMain.SetXYZ("a",1,(11265194.9906, 40486056.6399, -2055810.5412),Color.Red);
|
|
|
+ //ucEphXYZAdaj.SetXYZ("b",1,(25525328.3455, 33539987.1755, -49504.0378),Color.Red);
|
|
|
+
|
|
|
//double tarLon = 46, tarLat = 24;
|
|
|
//double recLon = 45.9, recLat = 23.9;
|
|
|
//var tarEcef = PhysicsHelper.GeoToEcef((tarLon, tarLat, 0));
|
|
@@ -217,12 +226,15 @@ namespace XdCxRhDW.App.EditForms
|
|
|
var xdDtoLine1 = DrawDtoLineHelper.DtoLineXdNoRefEx(dtoLineXd);
|
|
|
mapControl1.DrawDtoLineTwo($"[{msat},超短{CDBAnt[0]}°]无参时差线", xdDtoLine1);
|
|
|
|
|
|
- var xdDtoLine2 = DrawDtoLineHelper.DtoLineXdNoRefZl(dtoLineXd);
|
|
|
- mapControl1.DrawDtoLine($"[{msat},超短{CDBAnt[0]}°]无参时差线zl", xdDtoLine2);
|
|
|
+ //var xdDtoLine2 = DrawDtoLineHelper.DtoLineXdNoRefZl(dtoLineXd);
|
|
|
+ //mapControl1.DrawDtoLine($"[{msat},超短{CDBAnt[0]}°]无参时差线zl", xdDtoLine2);
|
|
|
|
|
|
|
|
|
var tsDtoLine = DrawDtoLineHelper.DtoLine2XNoRefStart(twoStartOption);
|
|
|
mapControl1.DrawDtoLine($"[{msat},{nsat}]时差线", tsDtoLine);
|
|
|
+
|
|
|
+ //var tsDtoLine2 = DrawDtoLineHelper.DtoLine2XNoRefStartZl(twoStartOption);
|
|
|
+ //mapControl1.DrawDtoLine($"[{msat},{nsat}]时差线zl", tsDtoLine2);
|
|
|
}
|
|
|
}
|
|
|
catch (Exception ex)
|
|
@@ -344,8 +356,17 @@ namespace XdCxRhDW.App.EditForms
|
|
|
Adja1Y = dto.AdjaY,
|
|
|
Adja1Z = dto.AdjaZ,
|
|
|
};
|
|
|
- var res = PosApi.X2D1_PosNoRef(cgRes, StationRes);
|
|
|
- res = PosApi.X2D1_PosNoRef_ZL(res,cgRes, StationRes);
|
|
|
+ double[] res;
|
|
|
+ if (ConfigurationManager.AppSettings["UseNewPosX2D1"] != null
|
|
|
+ && ConfigurationManager.AppSettings["UseNewPosX2D1"].ToLower() != "false"
|
|
|
+ && ConfigurationManager.AppSettings["UseNewPosX2D1"].ToLower() != "0")
|
|
|
+ {
|
|
|
+ res = PosApi.X2D1_PosNoRef_ZL(cgRes, StationRes);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ res = PosApi.X2D1_PosNoRef(cgRes, StationRes, dto.CalcConfidence);
|
|
|
+ }
|
|
|
this.txtPosRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f4},{res[1]:f4}] 镜像点:[{res[3]:f4},{res[4]:f4}]";
|
|
|
}
|
|
|
else
|