diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 909601d..191d4bb 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 909601d..191d4bb 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index 142e5e9..68ae617 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 909601d..191d4bb 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index 142e5e9..68ae617 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe diff --git a/Utility.cs b/Utility.cs index b9621cc..0756748 100644 --- a/Utility.cs +++ b/Utility.cs @@ -20,7 +20,7 @@ public static string dbdatabase; public static string userID; - public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp; @@ -38,7 +38,7 @@ public static List listPipelineType; public static string PicRootURL; public static string PicDefaultURL; - public static double dFlyAboveLine = 2; +// public static double dFlyAboveLine = 2; public static string userName; public static string projectStr; public static string userRole; @@ -85,12 +85,12 @@ public static List pipefittingLayerNames = new List();//管件图层名称 public static List sgPipeLayersNames = new List();//施工管线图层名称 -// public static Dictionary dictionaryNetLayerNameAndCaption = new Dictionary(); - public static HashSet layerNameSet = new HashSet(); + public static HashSet layerNameSet = new HashSet();//记录有哪些图层要显示 public static string roadLayerName = ""; #endregion wxl public static LayerConfig layerConfig; + public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { featureTooltip.CacheFilePath = Application.StartupPath + "/GeoScene/Globe/Temp"; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 909601d..191d4bb 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index 142e5e9..68ae617 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -18,7 +18,6 @@ using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe; -using Timer = System.Windows.Forms.Timer; using ToolTip = System.Windows.Forms.ToolTip; namespace Cyberpipe diff --git a/Utility.cs b/Utility.cs index b9621cc..0756748 100644 --- a/Utility.cs +++ b/Utility.cs @@ -20,7 +20,7 @@ public static string dbdatabase; public static string userID; - public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp; @@ -38,7 +38,7 @@ public static List listPipelineType; public static string PicRootURL; public static string PicDefaultURL; - public static double dFlyAboveLine = 2; +// public static double dFlyAboveLine = 2; public static string userName; public static string projectStr; public static string userRole; @@ -85,12 +85,12 @@ public static List pipefittingLayerNames = new List();//管件图层名称 public static List sgPipeLayersNames = new List();//施工管线图层名称 -// public static Dictionary dictionaryNetLayerNameAndCaption = new Dictionary(); - public static HashSet layerNameSet = new HashSet(); + public static HashSet layerNameSet = new HashSet();//记录有哪些图层要显示 public static string roadLayerName = ""; #endregion wxl public static LayerConfig layerConfig; + public static void SetBallons(GSOBalloon featureTooltip, GSOBalloonEx balloonEx) { featureTooltip.CacheFilePath = Application.StartupPath + "/GeoScene/Globe/Temp"; diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index cd82eca..755455e 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ