|
|
@@ -703,7 +703,7 @@ namespace XdCxRhDW.App.UserControl
|
|
|
|
|
|
listSat = db.SatInfos.ToList();
|
|
|
cg = await db.CgRes.Where(m => m.ID == item.CgResID).FirstOrDefaultAsync();
|
|
|
- station = await db.StationRes.Where(m => m.ID == item.CgResID).FirstOrDefaultAsync();
|
|
|
+ station = await db.StationRes.Where(m => m.ID == item.StationResID).FirstOrDefaultAsync();
|
|
|
}
|
|
|
if (cg == null)
|
|
|
{
|
|
|
@@ -740,8 +740,11 @@ namespace XdCxRhDW.App.UserControl
|
|
|
dtoLineXd.RefDto = cg.YbMainDto.Value;
|
|
|
dtoLineXd.PosLon = item.PosLon;
|
|
|
dtoLineXd.PosLat = item.PosLat;
|
|
|
-
|
|
|
- var msat = listSat.FirstOrDefault(m => m.SatCode == cg.MainCode.Value)?.Sat;
|
|
|
+ string msat = string.Empty;
|
|
|
+ if (cg.MainCode.HasValue)
|
|
|
+ {
|
|
|
+ msat = listSat.FirstOrDefault(m => m.SatCode == cg.MainCode.Value)?.Sat;
|
|
|
+ }
|
|
|
var xdDtoLine = DrawDtoLineHelper.DtoLineXd(dtoLineXd);
|
|
|
mapControl1.DrawDtoPonit($"星地[{msat},[{station.CdbTxLon}°]]时差线", xdDtoLine);
|
|
|
|
|
|
@@ -758,7 +761,12 @@ namespace XdCxRhDW.App.UserControl
|
|
|
twoStartOption.PosLon = item.PosLon;
|
|
|
twoStartOption.PosLat = item.PosLat;
|
|
|
var tsDtoLine = DrawDtoLineHelper.DtoLineXDTwoStart(twoStartOption);
|
|
|
- mapControl1.DrawDtoPonit($"双星[{msat},{listSat.FirstOrDefault(m => m.SatCode == cg.Adja1Code.Value)?.Sat}]时差线", tsDtoLine);
|
|
|
+ string nsat = string.Empty;
|
|
|
+ if (cg.Adja1Code.HasValue)
|
|
|
+ {
|
|
|
+ nsat = listSat.FirstOrDefault(m => m.SatCode == cg.Adja1Code.Value)?.Sat;
|
|
|
+ }
|
|
|
+ mapControl1.DrawDtoPonit($"双星[{msat},{nsat}]时差线", tsDtoLine);
|
|
|
}
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
@@ -780,7 +788,7 @@ namespace XdCxRhDW.App.UserControl
|
|
|
|
|
|
listSat = db.SatInfos.ToList();
|
|
|
cg = await db.CgRes.Where(m => m.ID == item.CgResID).FirstOrDefaultAsync();
|
|
|
- station = await db.StationRes.Where(m => m.ID == item.CgResID).FirstOrDefaultAsync();
|
|
|
+ station = await db.StationRes.Where(m => m.ID == item.StationResID).FirstOrDefaultAsync();
|
|
|
}
|
|
|
if (cg == null)
|
|
|
{
|
|
|
@@ -856,7 +864,7 @@ namespace XdCxRhDW.App.UserControl
|
|
|
listSat = db.SatInfos.ToList();
|
|
|
cg = await db.CgRes.Where(m => m.ID == item.CgResID).FirstOrDefaultAsync();
|
|
|
|
|
|
- station = await db.StationRes.Where(m => m.ID == item.CgResID).FirstOrDefaultAsync();
|
|
|
+ station = await db.StationRes.Where(m => m.ID == item.StationResID).FirstOrDefaultAsync();
|
|
|
}
|
|
|
if (cg == null)
|
|
|
{
|
|
|
@@ -890,8 +898,9 @@ namespace XdCxRhDW.App.UserControl
|
|
|
twoStartOption.Turn1 = Math.Abs(twoStartOption.Freq - (cg.TarFreqDown.HasValue ? cg.TarFreqDown.Value : 0));
|
|
|
twoStartOption.Turn2 = Math.Abs(twoStartOption.RefFreq - (cg.RefFreqDown.HasValue ? cg.RefFreqDown.Value : 0));
|
|
|
twoStartOption.RefDfo = cg.YbMainDfo.Value - cg.YbAdja1Dfo.Value;
|
|
|
- var msat = listSat.FirstOrDefault(m => m.SatCode == cg.MainCode.Value)?.Sat;
|
|
|
var tsDtoLine = DrawDfoLineHelper.DfoLineTwoStart(twoStartOption);
|
|
|
+
|
|
|
+ var msat = listSat.FirstOrDefault(m => m.SatCode == cg.MainCode.Value)?.Sat;
|
|
|
mapControl1.DrawDtoPonit($"{item.PosResType.GetEnumDisplayName()}[{msat},{listSat.FirstOrDefault(m => m.SatCode == cg.Adja1X.Value)?.Sat}]频差线", tsDtoLine);
|
|
|
|
|
|
if (item.PosResType == EnumPosResType.X3TwoDfo)
|
|
|
@@ -923,7 +932,7 @@ namespace XdCxRhDW.App.UserControl
|
|
|
using (RHDWContext db = new RHDWContext())
|
|
|
{
|
|
|
cx = await db.CxRes.Where(m => m.ID == item.CxResID.Value).FirstOrDefaultAsync();
|
|
|
- station = await db.StationRes.Where(m => m.ID == item.CgResID).FirstOrDefaultAsync();
|
|
|
+ station = await db.StationRes.Where(m => m.ID == item.StationResID).FirstOrDefaultAsync();
|
|
|
}
|
|
|
if (cx == null)
|
|
|
{
|
wyq