11

XdCxRhDW.App/EditForms/X2D1DTOParamEditor.cs

@@ -237,43 +237,25 @@ namespace XdCxRhDW.App.EditForms
 
                     }
                     var tsDtoLine = DrawDtoLineHelper.DtoLine2XStart(twoStartOption);
-                    mapControl1.DrawDtoLine($"[{msat},{nsat}]时差线", tsDtoLine);
+                    mapControl1.DrawDtoLine($"[{msat},{nsat}]带参时差线", tsDtoLine);
                 }
                 else
                 {
-                    string useNewGDOP = ConfigurationManager.AppSettings["UseNewGDOP"];
-                    if (useNewGDOP == null || useNewGDOP == "0")
-                    {
-                        var xdDtoLine1 = DrawDtoLineHelper.DtoLineXdNoRefEx(dtoLineXd);
-                        mapControl1.DrawDtoLineTwo($"[{msat},超短{CDBAnt[0]}°]无参时差线", xdDtoLine1);
-                    }
-                    else
-                    {
-                        var xdDtoLine = DrawDtoLineHelper.DtoLineXdNoRefNew(dtoLineXd);
-                    List<MapPolyline> polylines = new List<MapPolyline>();
-                    foreach (var dtoLine in xdDtoLine)
-                    {
-                        var mapline = mapControl1.GetLine($"[{msat},超短{CDBAnt[0]}°]无参时差线", dtoLine.dtoLinePoints);
-                        if (mapline == null)
-                        {
-                            continue;
-                        }
-                        polylines.Add(mapline);
-                    }
-                    mapControl1.DrawDtoLine(polylines);
-                    }
+                    //var xdDtoLine = DrawDtoLineHelper.DtoLineXdNoRef(dtoLineXd);
+                    //mapControl1.DrawDtoLine($"[{msat},超短{CDBAnt[0]}°]时差线", xdDtoLine);
 
-                    
+                    var xdDtoLine1 = DrawDtoLineHelper.DtoLineXdNoRefEx(dtoLineXd);
+                    mapControl1.DrawDtoLineTwo($"[{msat},超短{CDBAnt[0]}°]无参时差线", xdDtoLine1);
 
                     //var xdDtoLine2 = DrawDtoLineHelper.DtoLineXdNoRefZl(dtoLineXd);
                     //mapControl1.DrawDtoLine($"[{msat},超短{CDBAnt[0]}°]无参时差线zl", xdDtoLine2);
 
 
                     var tsDtoLine = DrawDtoLineHelper.DtoLine2XNoRefStart(twoStartOption);
-                    mapControl1.DrawDtoLine($"[{msat},{nsat}]时差线", tsDtoLine);
+                    mapControl1.DrawDtoLine($"[{msat},{nsat}]无参时差线", tsDtoLine);
 
                     //var tsDtoLine2 = DrawDtoLineHelper.DtoLine2XNoRefStartZl(twoStartOption);
-                    //mapControl1.DrawDtoLine($"[{msat},{nsat}]时差线zl", tsDtoLine2);
+                    //mapControl1.DrawDtoLine($"[{msat},{nsat}]无参时差线zl", tsDtoLine2);
                 }
             }
             catch (Exception ex)
@@ -396,9 +378,9 @@ namespace XdCxRhDW.App.EditForms
                         Adja1Z = dto.AdjaZ,
                     };
                     double[] res;
-                    if (ConfigurationManager.AppSettings["UseNewPosX2D1"] != null
-            && ConfigurationManager.AppSettings["UseNewPosX2D1"].ToLower() != "false"
-            && ConfigurationManager.AppSettings["UseNewPosX2D1"].ToLower() != "0")
+                    if (ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"] != null
+            && ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"].ToLower() != "false"
+            && ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"].ToLower() != "0")
                     {
                         res = PosApi.X2D1_PosNoRef_ZL(cgRes, StationRes);
                     }