diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f43fee4..3847b33 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f43fee4..3847b33 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Utility.cs b/Utility.cs index 7b8c9fb..c34bf71 100644 --- a/Utility.cs +++ b/Utility.cs @@ -264,57 +264,57 @@ { DBBackUp = XmlReader.ReadElementString(); } - else if (XmlReader.Name == "layerchild") - { - var layername = XmlReader["layer"].Trim(); - var label = XmlReader["label"].Trim(); - var type = XmlReader["type"].Trim(); - - LayerChild child = new LayerChild(); - child.attriLabel = label; - child.attriLayer =layername; - child.attriType = type; - LayerChilds.Add(child); - LayerLabels.Add(label); - LayerNames.Add(layername); - - dictionaryNetLayerNameAndCaption.Add(layername, label); - - if (layername.EndsWith("管线")) - { - LayerNamesList.Add(layername.Substring(0, layername.Length - 2)); - } - if (!type.Equals("db")) - { - if (XmlReader["isRoad"] != null) - { - roadLayerName = label; - } - }else if (XmlReader["isPipeLine"] != null) - { - m_PipelineLayerNames.Add(label); - } - else if (XmlReader["isWorkWell"] != null) - { - workwellLayerNames.Add(label); - } - else if (XmlReader["isValve"] != null) - { - valueLayerNames.Add(label); - } - else if (XmlReader["isAccess"] != null) - { - instrumenLayerNames.Add(label); - } - else if (XmlReader["isCharacter"] != null) - { - pipefittingLayerNames.Add(label); - } - else if (XmlReader["isSgData"] != null) - { - sgPipeLayersNames.Add(label); - } - } +// else if (XmlReader.Name == "layerchild") +// { +// var layername = XmlReader["layer"].Trim(); +// var label = XmlReader["label"].Trim(); +// var type = XmlReader["type"].Trim(); +// +// LayerChild child = new LayerChild(); +// child.attriLabel = label; +// child.attriLayer =layername; +// child.attriType = type; +// LayerChilds.Add(child); +// LayerLabels.Add(label); +// LayerNames.Add(layername); +// +// dictionaryNetLayerNameAndCaption.Add(layername, label); +// +// if (layername.EndsWith("管线")) +// { +// LayerNamesList.Add(layername.Substring(0, layername.Length - 2)); +// } +// if (!type.Equals("db")) +// { +// if (XmlReader["isRoad"] != null) +// { +// roadLayerName = label; +// } +// }else if (XmlReader["isPipeLine"] != null) +// { +// m_PipelineLayerNames.Add(label); +// } +// else if (XmlReader["isWorkWell"] != null) +// { +// workwellLayerNames.Add(label); +// } +// else if (XmlReader["isValve"] != null) +// { +// valueLayerNames.Add(label); +// } +// else if (XmlReader["isAccess"] != null) +// { +// instrumenLayerNames.Add(label); +// } +// else if (XmlReader["isCharacter"] != null) +// { +// pipefittingLayerNames.Add(label); +// } +// else if (XmlReader["isSgData"] != null) +// { +// sgPipeLayersNames.Add(label); +// } +// } else if (XmlReader.Name == "Terrain") { @@ -420,8 +420,9 @@ #region wxl 从layerconfig.xml中读取 - LayerConfig layerConfig = XmlTools.DeserializeFromXml("layerConfig.xml"); + layerConfig = XmlTools.DeserializeFromXml("layerConfig.xml"); List dataSrcs = layerConfig.datasrcs; + foreach (var dataSrc in dataSrcs) { List layerTypes = dataSrc.layertypes;