Merge branch 'master' of http://139.155.15.221:3000/zoulei/XdCxRhDW

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -169,19 +169,82 @@ namespace XdCxRhDW.App.UserControl
                 mapControl1.AddPosMenu<PosRes>("绘制时差线", SvgHelper.LoadFromFile("Image\\DtoLine.svg"), item =>
                 {
                     DrawDtoLine(item);
+                }, p =>
+                {
+                    switch (p.PosResType)
+                    {
+                        case EnumPosResType.X1D1CX:
+                        case EnumPosResType.X3TwoDfo:
+                        case EnumPosResType.RH:
+                        default:
+                            return false;
+                        case EnumPosResType.X2D1:
+                        case EnumPosResType.X2D1NoRef:
+                        case EnumPosResType.X3:
+                        case EnumPosResType.X3NoRef:
+                        case EnumPosResType.X2Dfo:
+                            return true;
+                    }
                 })
                 .AddPosMenu<PosRes>("绘制频差线", SvgHelper.LoadFromFile("Image\\DfoLine.svg"), item =>
                 {
                     DrawDfoLine(item);
+                }, p =>
+                {
+                    switch (p.PosResType)
+                    {
+                        case EnumPosResType.X3TwoDfo:
+                        case EnumPosResType.X2Dfo:
+                            return true;
+                        case EnumPosResType.X2D1:
+                        case EnumPosResType.X2D1NoRef:
+                        case EnumPosResType.RH:
+                        case EnumPosResType.X3:
+                        case EnumPosResType.X3NoRef:
+                        case EnumPosResType.X1D1CX:
+                        default:
+                            return false;
+                    }
                 })
-                 //.AddPosMenu<PosRes>("绘制GDOP", SvgHelper.LoadFromFile("Image\\GDOP.svg"), item =>
-                 // {
-                 //     var posType = GetPosRes(item, "绘制GDOP");
-                 //     DrawGDOP(item.SigTime, posType);
-                 // })
+                 .AddPosMenu<PosRes>("绘制GDOP", SvgHelper.LoadFromFile("Image\\GDOP.svg"), item =>
+                  {
+                      DrawGDOP(item);
+                  }, p =>
+                  {
+                      switch (p.PosResType)
+                      {
+                          case EnumPosResType.X3TwoDfo:
+                          case EnumPosResType.X2Dfo:
+                          case EnumPosResType.X2D1:
+                          case EnumPosResType.X2D1NoRef:
+                          case EnumPosResType.X3:
+                          case EnumPosResType.X3NoRef:
+                          case EnumPosResType.X1D1CX:
+                              return true;
+                          case EnumPosResType.RH:
+                          default:
+                              return false;
+                      }
+                  })
                  .AddPosMenu<PosRes>("绘制测向线", btnDrawCX.ImageOptions.SvgImage, item =>
                   {
                       DrawCXLine(item);
+                  }, p =>
+                  {
+                      switch (p.PosResType)
+                      {
+                          case EnumPosResType.X1D1CX:
+                              return true;
+                          case EnumPosResType.RH:
+                          case EnumPosResType.X3TwoDfo:
+                          case EnumPosResType.X2Dfo:
+                          case EnumPosResType.X2D1:
+                          case EnumPosResType.X2D1NoRef:
+                          case EnumPosResType.X3:
+                          case EnumPosResType.X3NoRef:
+                          default:
+                              return false;
+                      }
                   });
 
             }
@@ -309,9 +372,8 @@ namespace XdCxRhDW.App.UserControl
                     btnDrawCX.Visibility = btnDrawDfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
                     break;
                 case EnumPosResType.RH:
-                    //融合DW  时差线 测向线
-                    btnDrawDto.Visibility = btnDrawCX.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-                    btnGDOP.Visibility = btnDrawDfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+                    //融合DW=
+                    btnDrawDto.Visibility = btnDrawCX.Visibility = btnGDOP.Visibility = btnDrawDfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
                     break;
                 case EnumPosResType.X3:
                 case EnumPosResType.X3NoRef:
@@ -617,7 +679,10 @@ namespace XdCxRhDW.App.UserControl
                 return;
             }
             var item = gridView2.GetRow(ids[0]) as PosRes;
-            DrawCXLine(item);
+            if (item.PosResType == EnumPosResType.X1D1CX)
+            {
+                DrawCXLine(item);
+            }
         }
 
         private void btnGDOP_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)