diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 74517b6..f2e4d1a 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -10,64 +10,33 @@ public partial class FrmGenAndFaMenTopu : Office2007Form { private GSOGlobeControl mglobecontrol; - List pipeLayerNames; - List valueLayerNames; private GSOLayer xc_layer; private GSOLayer dx_layer; private GSOLayer currentLayer; - public FrmGenAndFaMenTopu(GSOGlobeControl globeControl, List _list, List valueList) + public FrmGenAndFaMenTopu(GSOGlobeControl globeControl) { InitializeComponent(); mglobecontrol = globeControl; - pipeLayerNames = _list; - valueLayerNames = valueList; } - private void FrmGenAndFaMenTopu_Load(object sender, EventArgs e) { - //设置线拓扑参数 - //m_layer = globeControl.Globe.Layers.GetLayerByID((int)(Utility.LayerLabel_LayerIDs[pipelineName])); - //xc_layer = mglobecontrol.Globe.Layers.GetLayerByCaption(xcpipelineName); - //if (xc_layer != null && xc_layer.Dataset != null) - //{ - // //tboxTopoName.Text = xc_layer.Dataset.Name + "Network"; - // cmbPipeLineType.Items.Add(xcpipelineName); - //} - //dx_layer = mglobecontrol.Globe.Layers.GetLayerByCaption(dxpipelineName); - //if (dx_layer != null && dx_layer.Dataset != null) - //{ - // //tboxTopoName.Text = dx_layer.Dataset.Name + "Network"; - // cmbPipeLineType.Items.Add(dxpipelineName); - //} - for (int i = 0; i < pipeLayerNames.Count; i++) + for (int i = 0; i < Utility.m_PipelineLayerNames.Count; i++) { - cmbPipeLineType.Items.Add(pipeLayerNames[i]); + cmbPipeLineType.Items.Add(Utility.m_PipelineLayerNames[i]); } if (cmbPipeLineType.Items.Count <= 0) - { return; + + for (int j = 0; j < Utility.instrumenLayerNames.Count; j++) + { + if (Utility.instrumenLayerNames[j].Contains("阀门")) + cbbPointLayers.Items.Add(Utility.instrumenLayerNames[j]); } cmbPipeLineType.SelectedIndex = 0; tboxTopoName.Text = cmbPipeLineType.SelectedItem + "Network"; tboxTolerance.Text = "0.1"; - //checkBoxIgnoreZ.Checked = true; - //阀门图层参数设置 - for (int i = 0; i < mglobecontrol.Globe.Layers.Count; i++)//获取树节点后中所有的layer图层 - { - //GSOLayer layer = mglobecontrol.Globe.Layers[i]; - //if (layer != null && layer.Dataset != null && layer.Dataset.IsFeatureDataset) - //{ - // string name = layer.Name; - // if (layer.Type == EnumLayerType.FeatureLayer && layer.Caption.Contains("附属物") && !name.Contains("\\"))//if (layer.Type == EnumLayerType.FeatureLayer && !layer.Caption.Contains("管线") && !name.Contains("\\")) - // { - // cbbPointLayers.Items.Add(layer.Caption); - // } - //} - } - cbbPointLayers.Items.Add("给水阀门"); - cbbPointLayers.Items.Add("天然气阀门"); if (cbbPointLayers .Items .Count >0) { cbbPointLayers.SelectedIndex = 0; @@ -167,7 +136,6 @@ Int32 nMatchNum = selNWDataset.GenerateValves(pointDataset, dFMTolerance, checkBoxFMIgnoreZ.Checked, bMatchNearest, dNearstDisLimit); - //MessageBox.Show("阀门匹配完成！共匹配了" + nMatchNum + "个阀门！"); MessageBox.Show("拓扑数据创建成功,阀门匹配完成！共匹配了 " + nMatchNum + " 个阀门！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Information); } else diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 74517b6..f2e4d1a 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -10,64 +10,33 @@ public partial class FrmGenAndFaMenTopu : Office2007Form { private GSOGlobeControl mglobecontrol; - List pipeLayerNames; - List valueLayerNames; private GSOLayer xc_layer; private GSOLayer dx_layer; private GSOLayer currentLayer; - public FrmGenAndFaMenTopu(GSOGlobeControl globeControl, List _list, List valueList) + public FrmGenAndFaMenTopu(GSOGlobeControl globeControl) { InitializeComponent(); mglobecontrol = globeControl; - pipeLayerNames = _list; - valueLayerNames = valueList; } - private void FrmGenAndFaMenTopu_Load(object sender, EventArgs e) { - //设置线拓扑参数 - //m_layer = globeControl.Globe.Layers.GetLayerByID((int)(Utility.LayerLabel_LayerIDs[pipelineName])); - //xc_layer = mglobecontrol.Globe.Layers.GetLayerByCaption(xcpipelineName); - //if (xc_layer != null && xc_layer.Dataset != null) - //{ - // //tboxTopoName.Text = xc_layer.Dataset.Name + "Network"; - // cmbPipeLineType.Items.Add(xcpipelineName); - //} - //dx_layer = mglobecontrol.Globe.Layers.GetLayerByCaption(dxpipelineName); - //if (dx_layer != null && dx_layer.Dataset != null) - //{ - // //tboxTopoName.Text = dx_layer.Dataset.Name + "Network"; - // cmbPipeLineType.Items.Add(dxpipelineName); - //} - for (int i = 0; i < pipeLayerNames.Count; i++) + for (int i = 0; i < Utility.m_PipelineLayerNames.Count; i++) { - cmbPipeLineType.Items.Add(pipeLayerNames[i]); + cmbPipeLineType.Items.Add(Utility.m_PipelineLayerNames[i]); } if (cmbPipeLineType.Items.Count <= 0) - { return; + + for (int j = 0; j < Utility.instrumenLayerNames.Count; j++) + { + if (Utility.instrumenLayerNames[j].Contains("阀门")) + cbbPointLayers.Items.Add(Utility.instrumenLayerNames[j]); } cmbPipeLineType.SelectedIndex = 0; tboxTopoName.Text = cmbPipeLineType.SelectedItem + "Network"; tboxTolerance.Text = "0.1"; - //checkBoxIgnoreZ.Checked = true; - //阀门图层参数设置 - for (int i = 0; i < mglobecontrol.Globe.Layers.Count; i++)//获取树节点后中所有的layer图层 - { - //GSOLayer layer = mglobecontrol.Globe.Layers[i]; - //if (layer != null && layer.Dataset != null && layer.Dataset.IsFeatureDataset) - //{ - // string name = layer.Name; - // if (layer.Type == EnumLayerType.FeatureLayer && layer.Caption.Contains("附属物") && !name.Contains("\\"))//if (layer.Type == EnumLayerType.FeatureLayer && !layer.Caption.Contains("管线") && !name.Contains("\\")) - // { - // cbbPointLayers.Items.Add(layer.Caption); - // } - //} - } - cbbPointLayers.Items.Add("给水阀门"); - cbbPointLayers.Items.Add("天然气阀门"); if (cbbPointLayers .Items .Count >0) { cbbPointLayers.SelectedIndex = 0; @@ -167,7 +136,6 @@ Int32 nMatchNum = selNWDataset.GenerateValves(pointDataset, dFMTolerance, checkBoxFMIgnoreZ.Checked, bMatchNearest, dNearstDisLimit); - //MessageBox.Show("阀门匹配完成！共匹配了" + nMatchNum + "个阀门！"); MessageBox.Show("拓扑数据创建成功,阀门匹配完成！共匹配了 " + nMatchNum + " 个阀门！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Information); } else diff --git a/MainFrm.cs b/MainFrm.cs index fa00b8f..1b6ddee 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -5736,7 +5736,7 @@ //日志记录 LogManager.saveLog(Utility.userName, "创建拓扑"); - FrmGenAndFaMenTopu frm = new FrmGenAndFaMenTopu(globeControl1, Utility.m_PipelineLayerNames, Utility.valueLayerNames); + FrmGenAndFaMenTopu frm = new FrmGenAndFaMenTopu(globeControl1); frm.Show(this); } #region Predator :拓扑分析 diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 74517b6..f2e4d1a 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -10,64 +10,33 @@ public partial class FrmGenAndFaMenTopu : Office2007Form { private GSOGlobeControl mglobecontrol; - List pipeLayerNames; - List valueLayerNames; private GSOLayer xc_layer; private GSOLayer dx_layer; private GSOLayer currentLayer; - public FrmGenAndFaMenTopu(GSOGlobeControl globeControl, List _list, List valueList) + public FrmGenAndFaMenTopu(GSOGlobeControl globeControl) { InitializeComponent(); mglobecontrol = globeControl; - pipeLayerNames = _list; - valueLayerNames = valueList; } - private void FrmGenAndFaMenTopu_Load(object sender, EventArgs e) { - //设置线拓扑参数 - //m_layer = globeControl.Globe.Layers.GetLayerByID((int)(Utility.LayerLabel_LayerIDs[pipelineName])); - //xc_layer = mglobecontrol.Globe.Layers.GetLayerByCaption(xcpipelineName); - //if (xc_layer != null && xc_layer.Dataset != null) - //{ - // //tboxTopoName.Text = xc_layer.Dataset.Name + "Network"; - // cmbPipeLineType.Items.Add(xcpipelineName); - //} - //dx_layer = mglobecontrol.Globe.Layers.GetLayerByCaption(dxpipelineName); - //if (dx_layer != null && dx_layer.Dataset != null) - //{ - // //tboxTopoName.Text = dx_layer.Dataset.Name + "Network"; - // cmbPipeLineType.Items.Add(dxpipelineName); - //} - for (int i = 0; i < pipeLayerNames.Count; i++) + for (int i = 0; i < Utility.m_PipelineLayerNames.Count; i++) { - cmbPipeLineType.Items.Add(pipeLayerNames[i]); + cmbPipeLineType.Items.Add(Utility.m_PipelineLayerNames[i]); } if (cmbPipeLineType.Items.Count <= 0) - { return; + + for (int j = 0; j < Utility.instrumenLayerNames.Count; j++) + { + if (Utility.instrumenLayerNames[j].Contains("阀门")) + cbbPointLayers.Items.Add(Utility.instrumenLayerNames[j]); } cmbPipeLineType.SelectedIndex = 0; tboxTopoName.Text = cmbPipeLineType.SelectedItem + "Network"; tboxTolerance.Text = "0.1"; - //checkBoxIgnoreZ.Checked = true; - //阀门图层参数设置 - for (int i = 0; i < mglobecontrol.Globe.Layers.Count; i++)//获取树节点后中所有的layer图层 - { - //GSOLayer layer = mglobecontrol.Globe.Layers[i]; - //if (layer != null && layer.Dataset != null && layer.Dataset.IsFeatureDataset) - //{ - // string name = layer.Name; - // if (layer.Type == EnumLayerType.FeatureLayer && layer.Caption.Contains("附属物") && !name.Contains("\\"))//if (layer.Type == EnumLayerType.FeatureLayer && !layer.Caption.Contains("管线") && !name.Contains("\\")) - // { - // cbbPointLayers.Items.Add(layer.Caption); - // } - //} - } - cbbPointLayers.Items.Add("给水阀门"); - cbbPointLayers.Items.Add("天然气阀门"); if (cbbPointLayers .Items .Count >0) { cbbPointLayers.SelectedIndex = 0; @@ -167,7 +136,6 @@ Int32 nMatchNum = selNWDataset.GenerateValves(pointDataset, dFMTolerance, checkBoxFMIgnoreZ.Checked, bMatchNearest, dNearstDisLimit); - //MessageBox.Show("阀门匹配完成！共匹配了" + nMatchNum + "个阀门！"); MessageBox.Show("拓扑数据创建成功,阀门匹配完成！共匹配了 " + nMatchNum + " 个阀门！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Information); } else diff --git a/MainFrm.cs b/MainFrm.cs index fa00b8f..1b6ddee 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -5736,7 +5736,7 @@ //日志记录 LogManager.saveLog(Utility.userName, "创建拓扑"); - FrmGenAndFaMenTopu frm = new FrmGenAndFaMenTopu(globeControl1, Utility.m_PipelineLayerNames, Utility.valueLayerNames); + FrmGenAndFaMenTopu frm = new FrmGenAndFaMenTopu(globeControl1); frm.Show(this); } #region Predator :拓扑分析 diff --git a/bin/x86/Debug/Cyberpipe.vshost.exe.manifest b/bin/x86/Debug/Cyberpipe.vshost.exe.manifest new file mode 100644 index 0000000..061c9ca --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.vshost.exe.manifest @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 74517b6..f2e4d1a 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -10,64 +10,33 @@ public partial class FrmGenAndFaMenTopu : Office2007Form { private GSOGlobeControl mglobecontrol; - List pipeLayerNames; - List valueLayerNames; private GSOLayer xc_layer; private GSOLayer dx_layer; private GSOLayer currentLayer; - public FrmGenAndFaMenTopu(GSOGlobeControl globeControl, List _list, List valueList) + public FrmGenAndFaMenTopu(GSOGlobeControl globeControl) { InitializeComponent(); mglobecontrol = globeControl; - pipeLayerNames = _list; - valueLayerNames = valueList; } - private void FrmGenAndFaMenTopu_Load(object sender, EventArgs e) { - //设置线拓扑参数 - //m_layer = globeControl.Globe.Layers.GetLayerByID((int)(Utility.LayerLabel_LayerIDs[pipelineName])); - //xc_layer = mglobecontrol.Globe.Layers.GetLayerByCaption(xcpipelineName); - //if (xc_layer != null && xc_layer.Dataset != null) - //{ - // //tboxTopoName.Text = xc_layer.Dataset.Name + "Network"; - // cmbPipeLineType.Items.Add(xcpipelineName); - //} - //dx_layer = mglobecontrol.Globe.Layers.GetLayerByCaption(dxpipelineName); - //if (dx_layer != null && dx_layer.Dataset != null) - //{ - // //tboxTopoName.Text = dx_layer.Dataset.Name + "Network"; - // cmbPipeLineType.Items.Add(dxpipelineName); - //} - for (int i = 0; i < pipeLayerNames.Count; i++) + for (int i = 0; i < Utility.m_PipelineLayerNames.Count; i++) { - cmbPipeLineType.Items.Add(pipeLayerNames[i]); + cmbPipeLineType.Items.Add(Utility.m_PipelineLayerNames[i]); } if (cmbPipeLineType.Items.Count <= 0) - { return; + + for (int j = 0; j < Utility.instrumenLayerNames.Count; j++) + { + if (Utility.instrumenLayerNames[j].Contains("阀门")) + cbbPointLayers.Items.Add(Utility.instrumenLayerNames[j]); } cmbPipeLineType.SelectedIndex = 0; tboxTopoName.Text = cmbPipeLineType.SelectedItem + "Network"; tboxTolerance.Text = "0.1"; - //checkBoxIgnoreZ.Checked = true; - //阀门图层参数设置 - for (int i = 0; i < mglobecontrol.Globe.Layers.Count; i++)//获取树节点后中所有的layer图层 - { - //GSOLayer layer = mglobecontrol.Globe.Layers[i]; - //if (layer != null && layer.Dataset != null && layer.Dataset.IsFeatureDataset) - //{ - // string name = layer.Name; - // if (layer.Type == EnumLayerType.FeatureLayer && layer.Caption.Contains("附属物") && !name.Contains("\\"))//if (layer.Type == EnumLayerType.FeatureLayer && !layer.Caption.Contains("管线") && !name.Contains("\\")) - // { - // cbbPointLayers.Items.Add(layer.Caption); - // } - //} - } - cbbPointLayers.Items.Add("给水阀门"); - cbbPointLayers.Items.Add("天然气阀门"); if (cbbPointLayers .Items .Count >0) { cbbPointLayers.SelectedIndex = 0; @@ -167,7 +136,6 @@ Int32 nMatchNum = selNWDataset.GenerateValves(pointDataset, dFMTolerance, checkBoxFMIgnoreZ.Checked, bMatchNearest, dNearstDisLimit); - //MessageBox.Show("阀门匹配完成！共匹配了" + nMatchNum + "个阀门！"); MessageBox.Show("拓扑数据创建成功,阀门匹配完成！共匹配了 " + nMatchNum + " 个阀门！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Information); } else diff --git a/MainFrm.cs b/MainFrm.cs index fa00b8f..1b6ddee 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -5736,7 +5736,7 @@ //日志记录 LogManager.saveLog(Utility.userName, "创建拓扑"); - FrmGenAndFaMenTopu frm = new FrmGenAndFaMenTopu(globeControl1, Utility.m_PipelineLayerNames, Utility.valueLayerNames); + FrmGenAndFaMenTopu frm = new FrmGenAndFaMenTopu(globeControl1); frm.Show(this); } #region Predator :拓扑分析 diff --git a/bin/x86/Debug/Cyberpipe.vshost.exe.manifest b/bin/x86/Debug/Cyberpipe.vshost.exe.manifest new file mode 100644 index 0000000..061c9ca --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.vshost.exe.manifest @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index 755455e..cd82eca 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ