diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 4f0593d..fe2b7f8 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -9,30 +9,45 @@ using GeoScene.Data; using GeoScene.Globe; using DevComponents.DotNetBar; +using System.Collections; namespace Cyberpipe { public partial class FrmAllWorkWellStatis : DevComponents.DotNetBar.Office2007Form { - Dictionary workWellLengthAndType = new Dictionary(); - List list = new List(); + + private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; + private Dictionary map = null; DataGridView dataGridViewX1; ToolStripStatusLabel toolStripNumbers; GSOGlobeControl globeControl1; PanelEx panel; - public FrmAllWorkWellStatis(Dictionary wellLen, List _list, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) + //TODOLIST：用晓伟的代理进行操作，功能拆分细化 + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) { InitializeComponent(); panel = p; - workWellLengthAndType = wellLen; - list = _list; dataGridViewX1 = dataGridViewX11; toolStripNumbers = toolStripNumbers1; - globeControl1 = ctl; + map = getAccsMap(polygon); + + } + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, MainFrm.DataGridViewDelegate InitDataGridViewX1, GSOGlobeControl ctl) + { + InitializeComponent(); + globeControl1 = ctl; + m_InitDataGridViewX1 = InitDataGridViewX1; + map = getAccsMap(polygon); + } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) { + drawChart(); + } + + public void drawChart() + { try { // Set axis title @@ -49,6 +64,11 @@ chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; + Dictionary workWellLengthAndType = new Dictionary(); + foreach (KeyValuePair kv in map) + { + workWellLengthAndType.Add(kv.Key, kv.Value.Length); + } chartAllAreaPipeline.Series["井盖"].Points.DataBindXY(workWellLengthAndType.Keys, workWellLengthAndType.Values); for (int m = 0; m < workWellLengthAndType.Values.Count; m++) { @@ -71,11 +91,11 @@ if (indexHit >= 0) { - GSOFeatures fs = list[indexHit]; + //GSOFeatures fs = list[indexHit]; string sql = ""; string pipetype = chartAllAreaPipeline.Series["井盖"].Points[indexHit].AxisLabel; - + GSOFeatures fs = map[pipetype]; string layername = ""; if (pipetype.EndsWith("窖井") || pipetype.EndsWith("表井") || (pipetype.EndsWith("窨井")) || pipetype.EndsWith("孔") || @@ -93,6 +113,23 @@ { return; } + //从图层获取datatable数据,不涉及数据库操作，速度会快一些 + //string [] fieldNames = GSOFeatureUtils.getFields(layername, globeControl1); + //DataTable dt = GSOFeatureUtils.convertGSOFeatures2DataTable(fs,fieldNames); + //if (dt.Rows.Count > 0) + //{ + // dataGridViewX1.DataSource = dt; + // panel.Visible = true; + // toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //} + //else + //{ + // panel.Visible = false; + // dataGridViewX1.DataSource = null; + // dataGridViewX1.Refresh(); + // toolStripNumbers.Text = "类型："; + //} + //数据库获取数据 if (fs.Length > 0) { sql = "select " + getpipeLineFields.getFields(layername, globeControl1) + " from " + layer.Name; @@ -120,8 +157,8 @@ { dataGridViewX1.DataSource = dt; panel.Visible = true; - //toolStripNumbers.Text = " 井盖类型：" + MainFrm.m_CurrentQueryLayer + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + string strLable = toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //m_InitDataGridViewX1(dt, strLable, "", true); } else { @@ -131,7 +168,6 @@ toolStripNumbers.Text = "类型："; } - //} } @@ -174,7 +210,7 @@ } } } - + //m_InitDataGridViewX1(null,"","" , false); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } @@ -183,5 +219,63 @@ PATM_Forms.F_PATMTitle frm = new PATM_Forms.F_PATMTitle("S", chartAllAreaPipeline); frm.Show(); } + + //获取指定layer类型的附属物名称列表 + public string[] getLayerAccNames(string layerType) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(layerType + "管线附属物"); + if (layer == null) return null; + + string sql = "select 附属物名称 from " + layerType + "管线附属物 group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layerType + "管线附属物"); + if (dataset == null) return null; + + int count = dataset.Tables[0].Rows.Count; + + + string[] result = new string[count]; + for (int i = 0; i < count; i++) + { + result[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return result; + } + + /// + /// 获取区域内各图层的井、孔、蓖的map + /// + /// 区域 + /// 要查找的附属物名称数组、如井、孔、蓖 + /// 返回值为：<图层+附属物名称,附属物列表> + + public Dictionary getAccsMap(GSOGeoPolygon3D polygon) + { + //List list = new List(); + Dictionary map = new Dictionary(); + ArrayList listpt = Utility.LayerNamesList; + if (listpt == null || listpt.Count == 0) return null; + FeatureStatisticsService service = new FeatureStatisticsService(); + for (int i = 0; i < listpt.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listpt[i] + "管线附属物"); + string[] accNames = getLayerAccNames(listpt[i] as string); + if (accNames == null || accNames.Length == 0) continue;//排除不合法的值 + for (int j = 0; j < accNames.Length; j++) + { + if (accNames[j].Contains("井") || accNames[j].Contains("孔") || accNames[j].Contains("篦")) + { + + GSOFeatures features = service.Intersect_PointLayerByType(polygon, layer, accNames[j]); + if (features == null) continue; + map.Add(listpt[i] + accNames[j], features); + } + + } + + } + return map; + + } + } } diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 4f0593d..fe2b7f8 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -9,30 +9,45 @@ using GeoScene.Data; using GeoScene.Globe; using DevComponents.DotNetBar; +using System.Collections; namespace Cyberpipe { public partial class FrmAllWorkWellStatis : DevComponents.DotNetBar.Office2007Form { - Dictionary workWellLengthAndType = new Dictionary(); - List list = new List(); + + private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; + private Dictionary map = null; DataGridView dataGridViewX1; ToolStripStatusLabel toolStripNumbers; GSOGlobeControl globeControl1; PanelEx panel; - public FrmAllWorkWellStatis(Dictionary wellLen, List _list, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) + //TODOLIST：用晓伟的代理进行操作，功能拆分细化 + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) { InitializeComponent(); panel = p; - workWellLengthAndType = wellLen; - list = _list; dataGridViewX1 = dataGridViewX11; toolStripNumbers = toolStripNumbers1; - globeControl1 = ctl; + map = getAccsMap(polygon); + + } + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, MainFrm.DataGridViewDelegate InitDataGridViewX1, GSOGlobeControl ctl) + { + InitializeComponent(); + globeControl1 = ctl; + m_InitDataGridViewX1 = InitDataGridViewX1; + map = getAccsMap(polygon); + } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) { + drawChart(); + } + + public void drawChart() + { try { // Set axis title @@ -49,6 +64,11 @@ chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; + Dictionary workWellLengthAndType = new Dictionary(); + foreach (KeyValuePair kv in map) + { + workWellLengthAndType.Add(kv.Key, kv.Value.Length); + } chartAllAreaPipeline.Series["井盖"].Points.DataBindXY(workWellLengthAndType.Keys, workWellLengthAndType.Values); for (int m = 0; m < workWellLengthAndType.Values.Count; m++) { @@ -71,11 +91,11 @@ if (indexHit >= 0) { - GSOFeatures fs = list[indexHit]; + //GSOFeatures fs = list[indexHit]; string sql = ""; string pipetype = chartAllAreaPipeline.Series["井盖"].Points[indexHit].AxisLabel; - + GSOFeatures fs = map[pipetype]; string layername = ""; if (pipetype.EndsWith("窖井") || pipetype.EndsWith("表井") || (pipetype.EndsWith("窨井")) || pipetype.EndsWith("孔") || @@ -93,6 +113,23 @@ { return; } + //从图层获取datatable数据,不涉及数据库操作，速度会快一些 + //string [] fieldNames = GSOFeatureUtils.getFields(layername, globeControl1); + //DataTable dt = GSOFeatureUtils.convertGSOFeatures2DataTable(fs,fieldNames); + //if (dt.Rows.Count > 0) + //{ + // dataGridViewX1.DataSource = dt; + // panel.Visible = true; + // toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //} + //else + //{ + // panel.Visible = false; + // dataGridViewX1.DataSource = null; + // dataGridViewX1.Refresh(); + // toolStripNumbers.Text = "类型："; + //} + //数据库获取数据 if (fs.Length > 0) { sql = "select " + getpipeLineFields.getFields(layername, globeControl1) + " from " + layer.Name; @@ -120,8 +157,8 @@ { dataGridViewX1.DataSource = dt; panel.Visible = true; - //toolStripNumbers.Text = " 井盖类型：" + MainFrm.m_CurrentQueryLayer + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + string strLable = toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //m_InitDataGridViewX1(dt, strLable, "", true); } else { @@ -131,7 +168,6 @@ toolStripNumbers.Text = "类型："; } - //} } @@ -174,7 +210,7 @@ } } } - + //m_InitDataGridViewX1(null,"","" , false); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } @@ -183,5 +219,63 @@ PATM_Forms.F_PATMTitle frm = new PATM_Forms.F_PATMTitle("S", chartAllAreaPipeline); frm.Show(); } + + //获取指定layer类型的附属物名称列表 + public string[] getLayerAccNames(string layerType) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(layerType + "管线附属物"); + if (layer == null) return null; + + string sql = "select 附属物名称 from " + layerType + "管线附属物 group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layerType + "管线附属物"); + if (dataset == null) return null; + + int count = dataset.Tables[0].Rows.Count; + + + string[] result = new string[count]; + for (int i = 0; i < count; i++) + { + result[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return result; + } + + /// + /// 获取区域内各图层的井、孔、蓖的map + /// + /// 区域 + /// 要查找的附属物名称数组、如井、孔、蓖 + /// 返回值为：<图层+附属物名称,附属物列表> + + public Dictionary getAccsMap(GSOGeoPolygon3D polygon) + { + //List list = new List(); + Dictionary map = new Dictionary(); + ArrayList listpt = Utility.LayerNamesList; + if (listpt == null || listpt.Count == 0) return null; + FeatureStatisticsService service = new FeatureStatisticsService(); + for (int i = 0; i < listpt.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listpt[i] + "管线附属物"); + string[] accNames = getLayerAccNames(listpt[i] as string); + if (accNames == null || accNames.Length == 0) continue;//排除不合法的值 + for (int j = 0; j < accNames.Length; j++) + { + if (accNames[j].Contains("井") || accNames[j].Contains("孔") || accNames[j].Contains("篦")) + { + + GSOFeatures features = service.Intersect_PointLayerByType(polygon, layer, accNames[j]); + if (features == null) continue; + map.Add(listpt[i] + accNames[j], features); + } + + } + + } + return map; + + } + } } diff --git a/MainFrm.cs b/MainFrm.cs index ac2614d..b584749 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2951,35 +2951,35 @@ break; case "workwellquery": - workWellLen.Clear(); - List listWell = new List(); - //找到所有井 - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //workWellLen.Clear(); + //List listWell = new List(); + ////找到所有井 + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - listWell.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // listWell.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(workWellLen, listWell, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(polygon, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frmWell.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -9740,37 +9740,37 @@ private void buttonItemTJ3_ALL_Click(object sender, EventArgs e) { //日志记录 - LogManager.saveLog(Utility.userName, "井盖数量统计"); + //LogManager.saveLog(Utility.userName, "井盖数量统计"); - workWellLen.Clear(); - List list = new List(); + //workWellLen.Clear(); + //List list = new List(); - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - list.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // list.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(workWellLen, list, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(null, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frm.Show(this); } /// diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 4f0593d..fe2b7f8 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -9,30 +9,45 @@ using GeoScene.Data; using GeoScene.Globe; using DevComponents.DotNetBar; +using System.Collections; namespace Cyberpipe { public partial class FrmAllWorkWellStatis : DevComponents.DotNetBar.Office2007Form { - Dictionary workWellLengthAndType = new Dictionary(); - List list = new List(); + + private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; + private Dictionary map = null; DataGridView dataGridViewX1; ToolStripStatusLabel toolStripNumbers; GSOGlobeControl globeControl1; PanelEx panel; - public FrmAllWorkWellStatis(Dictionary wellLen, List _list, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) + //TODOLIST：用晓伟的代理进行操作，功能拆分细化 + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) { InitializeComponent(); panel = p; - workWellLengthAndType = wellLen; - list = _list; dataGridViewX1 = dataGridViewX11; toolStripNumbers = toolStripNumbers1; - globeControl1 = ctl; + map = getAccsMap(polygon); + + } + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, MainFrm.DataGridViewDelegate InitDataGridViewX1, GSOGlobeControl ctl) + { + InitializeComponent(); + globeControl1 = ctl; + m_InitDataGridViewX1 = InitDataGridViewX1; + map = getAccsMap(polygon); + } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) { + drawChart(); + } + + public void drawChart() + { try { // Set axis title @@ -49,6 +64,11 @@ chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; + Dictionary workWellLengthAndType = new Dictionary(); + foreach (KeyValuePair kv in map) + { + workWellLengthAndType.Add(kv.Key, kv.Value.Length); + } chartAllAreaPipeline.Series["井盖"].Points.DataBindXY(workWellLengthAndType.Keys, workWellLengthAndType.Values); for (int m = 0; m < workWellLengthAndType.Values.Count; m++) { @@ -71,11 +91,11 @@ if (indexHit >= 0) { - GSOFeatures fs = list[indexHit]; + //GSOFeatures fs = list[indexHit]; string sql = ""; string pipetype = chartAllAreaPipeline.Series["井盖"].Points[indexHit].AxisLabel; - + GSOFeatures fs = map[pipetype]; string layername = ""; if (pipetype.EndsWith("窖井") || pipetype.EndsWith("表井") || (pipetype.EndsWith("窨井")) || pipetype.EndsWith("孔") || @@ -93,6 +113,23 @@ { return; } + //从图层获取datatable数据,不涉及数据库操作，速度会快一些 + //string [] fieldNames = GSOFeatureUtils.getFields(layername, globeControl1); + //DataTable dt = GSOFeatureUtils.convertGSOFeatures2DataTable(fs,fieldNames); + //if (dt.Rows.Count > 0) + //{ + // dataGridViewX1.DataSource = dt; + // panel.Visible = true; + // toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //} + //else + //{ + // panel.Visible = false; + // dataGridViewX1.DataSource = null; + // dataGridViewX1.Refresh(); + // toolStripNumbers.Text = "类型："; + //} + //数据库获取数据 if (fs.Length > 0) { sql = "select " + getpipeLineFields.getFields(layername, globeControl1) + " from " + layer.Name; @@ -120,8 +157,8 @@ { dataGridViewX1.DataSource = dt; panel.Visible = true; - //toolStripNumbers.Text = " 井盖类型：" + MainFrm.m_CurrentQueryLayer + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + string strLable = toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //m_InitDataGridViewX1(dt, strLable, "", true); } else { @@ -131,7 +168,6 @@ toolStripNumbers.Text = "类型："; } - //} } @@ -174,7 +210,7 @@ } } } - + //m_InitDataGridViewX1(null,"","" , false); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } @@ -183,5 +219,63 @@ PATM_Forms.F_PATMTitle frm = new PATM_Forms.F_PATMTitle("S", chartAllAreaPipeline); frm.Show(); } + + //获取指定layer类型的附属物名称列表 + public string[] getLayerAccNames(string layerType) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(layerType + "管线附属物"); + if (layer == null) return null; + + string sql = "select 附属物名称 from " + layerType + "管线附属物 group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layerType + "管线附属物"); + if (dataset == null) return null; + + int count = dataset.Tables[0].Rows.Count; + + + string[] result = new string[count]; + for (int i = 0; i < count; i++) + { + result[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return result; + } + + /// + /// 获取区域内各图层的井、孔、蓖的map + /// + /// 区域 + /// 要查找的附属物名称数组、如井、孔、蓖 + /// 返回值为：<图层+附属物名称,附属物列表> + + public Dictionary getAccsMap(GSOGeoPolygon3D polygon) + { + //List list = new List(); + Dictionary map = new Dictionary(); + ArrayList listpt = Utility.LayerNamesList; + if (listpt == null || listpt.Count == 0) return null; + FeatureStatisticsService service = new FeatureStatisticsService(); + for (int i = 0; i < listpt.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listpt[i] + "管线附属物"); + string[] accNames = getLayerAccNames(listpt[i] as string); + if (accNames == null || accNames.Length == 0) continue;//排除不合法的值 + for (int j = 0; j < accNames.Length; j++) + { + if (accNames[j].Contains("井") || accNames[j].Contains("孔") || accNames[j].Contains("篦")) + { + + GSOFeatures features = service.Intersect_PointLayerByType(polygon, layer, accNames[j]); + if (features == null) continue; + map.Add(listpt[i] + accNames[j], features); + } + + } + + } + return map; + + } + } } diff --git a/MainFrm.cs b/MainFrm.cs index ac2614d..b584749 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2951,35 +2951,35 @@ break; case "workwellquery": - workWellLen.Clear(); - List listWell = new List(); - //找到所有井 - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //workWellLen.Clear(); + //List listWell = new List(); + ////找到所有井 + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - listWell.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // listWell.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(workWellLen, listWell, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(polygon, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frmWell.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -9740,37 +9740,37 @@ private void buttonItemTJ3_ALL_Click(object sender, EventArgs e) { //日志记录 - LogManager.saveLog(Utility.userName, "井盖数量统计"); + //LogManager.saveLog(Utility.userName, "井盖数量统计"); - workWellLen.Clear(); - List list = new List(); + //workWellLen.Clear(); + //List list = new List(); - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - list.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // list.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(workWellLen, list, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(null, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frm.Show(this); } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ae24fb9..5c2bb7f 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -706,7 +706,6 @@ this.dotNetBarManager1.BottomDockSite = this.dockSite4; this.dotNetBarManager1.EnableFullSizeDock = false; this.dotNetBarManager1.LeftDockSite = this.dockSite1; - this.dotNetBarManager1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.dotNetBarManager1.ParentForm = null; this.dotNetBarManager1.RightDockSite = this.dockSite2; this.dotNetBarManager1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003; @@ -799,7 +798,6 @@ // styleManager1 // this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Office2010Blue; - this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(87)))), ((int)(((byte)(154)))))); // // sideBarPanelItem1 // @@ -848,7 +846,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -894,6 +892,7 @@ this.ribbonTabItemGroup1.Style.BorderRightWidth = 1; this.ribbonTabItemGroup1.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ribbonTabItemGroup1.Style.BorderTopWidth = 1; + this.ribbonTabItemGroup1.Style.Class = ""; this.ribbonTabItemGroup1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonTabItemGroup1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.ribbonTabItemGroup1.Style.TextColor = System.Drawing.Color.White; @@ -906,6 +905,7 @@ // // // + this.galleryContainer2.BackgroundStyle.Class = ""; this.galleryContainer2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer2.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer2.Name = "galleryContainer2"; @@ -915,10 +915,6 @@ this.buttonItem39}); this.galleryContainer2.Text = "断面分析"; // - // - // - this.galleryContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem38 // this.buttonItem38.Name = "buttonItem38"; @@ -939,16 +935,13 @@ // // // + this.galleryContainer3.BackgroundStyle.Class = ""; this.galleryContainer3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer3.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer3.Name = "galleryContainer3"; this.galleryContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem3}); // - // - // - this.galleryContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem3 // this.buttonItem3.Name = "buttonItem3"; @@ -959,6 +952,7 @@ // // // + this.galleryContainer4.BackgroundStyle.Class = ""; this.galleryContainer4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer4.MinimumSize = new System.Drawing.Size(150, 58); this.galleryContainer4.Name = "galleryContainer4"; @@ -970,10 +964,6 @@ this.buttonItem46}); this.galleryContainer4.Text = "断面分析"; // - // - // - this.galleryContainer4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem40 // this.buttonItem40.Name = "buttonItem40"; @@ -1004,6 +994,7 @@ // // // + this.galleryContainer5.BackgroundStyle.Class = ""; this.galleryContainer5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer5.MinimumSize = new System.Drawing.Size(80, 58); this.galleryContainer5.Name = "galleryContainer5"; @@ -1011,10 +1002,6 @@ this.buttonItem44, this.buttonItem43}); // - // - // - this.galleryContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem44 // this.buttonItem44.Name = "buttonItem44"; @@ -1030,16 +1017,13 @@ // // // + this.galleryContainer6.BackgroundStyle.Class = ""; this.galleryContainer6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer6.MinimumSize = new System.Drawing.Size(70, 58); this.galleryContainer6.Name = "galleryContainer6"; this.galleryContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem48}); // - // - // - this.galleryContainer6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem48 // this.buttonItem48.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right; @@ -1073,7 +1057,6 @@ this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx3.Controls.Add(this.layerSensorTree); - this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx3.Location = new System.Drawing.Point(54, 113); this.panelEx3.Name = "panelEx3"; this.panelEx3.Size = new System.Drawing.Size(200, 161); @@ -1188,6 +1171,7 @@ // // // + this.labelX25.BackgroundStyle.Class = ""; this.labelX25.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX25.Location = new System.Drawing.Point(7, 364); this.labelX25.Name = "labelX25"; @@ -1252,6 +1236,7 @@ // // // + this.labelX8.BackgroundStyle.Class = ""; this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX8.Location = new System.Drawing.Point(11, 60); this.labelX8.Name = "labelX8"; @@ -1384,6 +1369,7 @@ // // // + this.checkBoxX3.BackgroundStyle.Class = ""; this.checkBoxX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX3.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX3.Location = new System.Drawing.Point(11, 9); @@ -1401,6 +1387,7 @@ // // // + this.checkBoxX4.BackgroundStyle.Class = ""; this.checkBoxX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX4.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX4.Location = new System.Drawing.Point(110, 9); @@ -1418,6 +1405,7 @@ // // // + this.labelX13.BackgroundStyle.Class = ""; this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX13.Location = new System.Drawing.Point(11, 32); this.labelX13.Name = "labelX13"; @@ -1432,6 +1420,7 @@ // // // + this.labelX14.BackgroundStyle.Class = ""; this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX14.Location = new System.Drawing.Point(10, 204); this.labelX14.Name = "labelX14"; @@ -1509,7 +1498,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(181, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(198, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -1534,6 +1523,7 @@ // // // + this.labelX9.BackgroundStyle.Class = ""; this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX9.Location = new System.Drawing.Point(9, 85); this.labelX9.Name = "labelX9"; @@ -1592,7 +1582,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(180, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(197, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -1635,6 +1625,7 @@ // // // + this.labelX10.BackgroundStyle.Class = ""; this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX10.Location = new System.Drawing.Point(172, 54); this.labelX10.Name = "labelX10"; @@ -1665,6 +1656,7 @@ // // // + this.checkBoxX5.BackgroundStyle.Class = ""; this.checkBoxX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX5.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX5.Location = new System.Drawing.Point(19, 4); @@ -1682,6 +1674,7 @@ // // // + this.checkBoxX6.BackgroundStyle.Class = ""; this.checkBoxX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX6.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX6.Location = new System.Drawing.Point(114, 4); @@ -1699,6 +1692,7 @@ // // // + this.labelX12.BackgroundStyle.Class = ""; this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX12.Location = new System.Drawing.Point(6, 57); this.labelX12.Name = "labelX12"; @@ -1713,6 +1707,7 @@ // // // + this.labelX16.BackgroundStyle.Class = ""; this.labelX16.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX16.Location = new System.Drawing.Point(6, 28); this.labelX16.Name = "labelX16"; @@ -1727,6 +1722,7 @@ // // // + this.labelX17.BackgroundStyle.Class = ""; this.labelX17.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX17.Location = new System.Drawing.Point(8, 235); this.labelX17.Name = "labelX17"; @@ -1772,6 +1768,7 @@ // // // + this.labelX24.BackgroundStyle.Class = ""; this.labelX24.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX24.Image = ((System.Drawing.Image)(resources.GetObject("labelX24.Image"))); this.labelX24.Location = new System.Drawing.Point(7, 403); @@ -1804,7 +1801,7 @@ this.dataGridViewX8.ReadOnly = true; this.dataGridViewX8.RowHeadersVisible = false; this.dataGridViewX8.RowTemplate.Height = 23; - this.dataGridViewX8.Size = new System.Drawing.Size(176, 92); + this.dataGridViewX8.Size = new System.Drawing.Size(193, 92); this.dataGridViewX8.TabIndex = 11; // // dataGridViewTextBoxColumn12 @@ -1838,6 +1835,7 @@ // // // + this.labelX11.BackgroundStyle.Class = ""; this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX11.Location = new System.Drawing.Point(10, 93); this.labelX11.Name = "labelX11"; @@ -1898,7 +1896,7 @@ this.dataGridViewX9.ReadOnly = true; this.dataGridViewX9.RowHeadersVisible = false; this.dataGridViewX9.RowTemplate.Height = 23; - this.dataGridViewX9.Size = new System.Drawing.Size(175, 127); + this.dataGridViewX9.Size = new System.Drawing.Size(192, 127); this.dataGridViewX9.TabIndex = 5; this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick); // @@ -1973,6 +1971,7 @@ // // // + this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX15.Location = new System.Drawing.Point(174, 61); this.labelX15.Name = "labelX15"; @@ -2003,6 +2002,7 @@ // // // + this.checkBoxX7.BackgroundStyle.Class = ""; this.checkBoxX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX7.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX7.Location = new System.Drawing.Point(8, 5); @@ -2020,6 +2020,7 @@ // // // + this.checkBoxX8.BackgroundStyle.Class = ""; this.checkBoxX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX8.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX8.Location = new System.Drawing.Point(118, 5); @@ -2037,6 +2038,7 @@ // // // + this.labelX19.BackgroundStyle.Class = ""; this.labelX19.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX19.Location = new System.Drawing.Point(11, 61); this.labelX19.Name = "labelX19"; @@ -2051,6 +2053,7 @@ // // // + this.labelX21.BackgroundStyle.Class = ""; this.labelX21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX21.Location = new System.Drawing.Point(10, 29); this.labelX21.Name = "labelX21"; @@ -2062,6 +2065,7 @@ // // // + this.labelX22.BackgroundStyle.Class = ""; this.labelX22.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX22.Image = ((System.Drawing.Image)(resources.GetObject("labelX22.Image"))); this.labelX22.Location = new System.Drawing.Point(9, 245); @@ -2139,6 +2143,7 @@ // // // + this.labelX28.BackgroundStyle.Class = ""; this.labelX28.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX28.Location = new System.Drawing.Point(181, 104); this.labelX28.Name = "labelX28"; @@ -2154,6 +2159,7 @@ // // // + this.labelX29.BackgroundStyle.Class = ""; this.labelX29.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX29.Location = new System.Drawing.Point(6, 100); this.labelX29.Name = "labelX29"; @@ -2186,6 +2192,7 @@ // // // + this.labelX4.BackgroundStyle.Class = ""; this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Image = ((System.Drawing.Image)(resources.GetObject("labelX4.Image"))); this.labelX4.Location = new System.Drawing.Point(7, 432); @@ -2249,6 +2256,7 @@ // // // + this.labelX5.BackgroundStyle.Class = ""; this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Image = ((System.Drawing.Image)(resources.GetObject("labelX5.Image"))); this.labelX5.Location = new System.Drawing.Point(9, 134); @@ -2383,6 +2391,7 @@ // // // + this.labelX18.BackgroundStyle.Class = ""; this.labelX18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX18.Location = new System.Drawing.Point(181, 71); this.labelX18.Name = "labelX18"; @@ -2413,6 +2422,7 @@ // // // + this.checkBoxSelectPipeline.BackgroundStyle.Class = ""; this.checkBoxSelectPipeline.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectPipeline.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectPipeline.Location = new System.Drawing.Point(8, 9); @@ -2430,6 +2440,7 @@ // // // + this.checkBoxSelectLayer.BackgroundStyle.Class = ""; this.checkBoxSelectLayer.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectLayer.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectLayer.Location = new System.Drawing.Point(117, 9); @@ -2447,6 +2458,7 @@ // // // + this.labelX20.BackgroundStyle.Class = ""; this.labelX20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX20.Location = new System.Drawing.Point(6, 69); this.labelX20.Name = "labelX20"; @@ -2458,6 +2470,7 @@ // // // + this.labelX26.BackgroundStyle.Class = ""; this.labelX26.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX26.Image = ((System.Drawing.Image)(resources.GetObject("labelX26.Image"))); this.labelX26.Location = new System.Drawing.Point(9, 38); @@ -2470,6 +2483,7 @@ // // // + this.labelX27.BackgroundStyle.Class = ""; this.labelX27.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX27.Image = ((System.Drawing.Image)(resources.GetObject("labelX27.Image"))); this.labelX27.Location = new System.Drawing.Point(7, 287); @@ -2482,6 +2496,7 @@ // // // + this.labelX30.BackgroundStyle.Class = ""; this.labelX30.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX30.Location = new System.Drawing.Point(88, 100); this.labelX30.Name = "labelX30"; @@ -2514,6 +2529,7 @@ // // // + this.labelX23.BackgroundStyle.Class = ""; this.labelX23.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX23.Image = ((System.Drawing.Image)(resources.GetObject("labelX23.Image"))); this.labelX23.Location = new System.Drawing.Point(11, 404); @@ -2577,6 +2593,7 @@ // // // + this.labelX2.BackgroundStyle.Class = ""; this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Image = ((System.Drawing.Image)(resources.GetObject("labelX2.Image"))); this.labelX2.Location = new System.Drawing.Point(12, 100); @@ -2703,6 +2720,7 @@ // // // + this.labelX7.BackgroundStyle.Class = ""; this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX7.Location = new System.Drawing.Point(176, 67); this.labelX7.Name = "labelX7"; @@ -2733,6 +2751,7 @@ // // // + this.checkBoxX1.BackgroundStyle.Class = ""; this.checkBoxX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX1.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX1.Location = new System.Drawing.Point(11, 5); @@ -2750,6 +2769,7 @@ // // // + this.checkBoxX2.BackgroundStyle.Class = ""; this.checkBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX2.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX2.Location = new System.Drawing.Point(120, 5); @@ -2767,6 +2787,7 @@ // // // + this.labelX6.BackgroundStyle.Class = ""; this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX6.Location = new System.Drawing.Point(15, 67); this.labelX6.Name = "labelX6"; @@ -2778,6 +2799,7 @@ // // // + this.labelX1.BackgroundStyle.Class = ""; this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Image = ((System.Drawing.Image)(resources.GetObject("labelX1.Image"))); this.labelX1.Location = new System.Drawing.Point(12, 34); @@ -2790,6 +2812,7 @@ // // // + this.labelX3.BackgroundStyle.Class = ""; this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Image = ((System.Drawing.Image)(resources.GetObject("labelX3.Image"))); this.labelX3.Location = new System.Drawing.Point(11, 250); @@ -2800,11 +2823,11 @@ // expandableSplitter1 // this.expandableSplitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -2816,11 +2839,11 @@ this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -2837,7 +2860,6 @@ this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx4.Controls.Add(this.splitContainer1); this.panelEx4.Controls.Add(this.panelOfTable); - this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx4.Location = new System.Drawing.Point(203, 179); this.panelEx4.Name = "panelEx4"; @@ -2878,7 +2900,6 @@ this.panelEx5.Controls.Add(this.panel1); this.panelEx5.Controls.Add(this.panel3); this.panelEx5.Controls.Add(this.panel5); - this.panelEx5.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx5.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx5.Location = new System.Drawing.Point(0, 0); this.panelEx5.Name = "panelEx5"; @@ -2921,7 +2942,6 @@ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.Controls.Add(this.panel2); this.panelEx1.Controls.Add(this.panel4); - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; @@ -2944,7 +2964,6 @@ this.panelOfTable.Controls.Add(this.dataGridViewX1); this.panelOfTable.Controls.Add(this.statusStrip2); this.panelOfTable.Controls.Add(this.expandableSplitter2); - this.panelOfTable.DisabledBackColor = System.Drawing.Color.Empty; this.panelOfTable.Dock = System.Windows.Forms.DockStyle.Bottom; this.panelOfTable.Location = new System.Drawing.Point(0, 414); this.panelOfTable.Name = "panelOfTable"; @@ -3042,12 +3061,12 @@ // expandableSplitter2 // this.expandableSplitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter2.Dock = System.Windows.Forms.DockStyle.Top; this.expandableSplitter2.ExpandableControl = this.panelOfTable; - this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -3059,11 +3078,11 @@ this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -3183,7 +3202,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(149, 290); + this.toolRightMenu.Size = new System.Drawing.Size(153, 312); // // 量算ToolStripMenuItem // @@ -3259,7 +3278,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -4125,8 +4144,6 @@ // superTooltip1 // this.superTooltip1.DefaultFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); - this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.superTooltip1.MinimumTooltipSize = new System.Drawing.Size(150, 50); // // buttonItem16 @@ -4233,12 +4250,13 @@ // // // + this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4255,7 +4273,7 @@ this.ribbonControl1.Location = new System.Drawing.Point(0, 82); this.ribbonControl1.MdiSystemItemVisible = false; this.ribbonControl1.Name = "ribbonControl1"; - this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); this.ribbonControl1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem19}); this.ribbonControl1.Size = new System.Drawing.Size(1328, 97); @@ -4292,21 +4310,23 @@ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel1.Style.Class = ""; this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseDown.Class = ""; this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4315,14 +4335,15 @@ // // // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.BackgroundStyle.Class = ""; this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.ContainerControlProcessDialogKey = true; this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.DragDropSupport = true; this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem87, this.buttonItem88, @@ -4333,20 +4354,21 @@ this.btnlegendSet, this.buttonItem89, this.btnOutputJPG}); - this.ribbonBar21.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 58); + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; // // // + this.ribbonBar21.TitleStyle.Class = ""; this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.TitleVisible = false; // @@ -4436,14 +4458,17 @@ // // // + this.ribbonPanel12.Style.Class = ""; this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseDown.Class = ""; this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseOver.Class = ""; this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel12.TabIndex = 34; this.ribbonPanel12.Visible = false; @@ -4454,18 +4479,18 @@ // // // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.BackgroundStyle.Class = ""; this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.ContainerControlProcessDialogKey = true; this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.DragDropSupport = true; this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem133, this.buttonItem132}); - this.ribbonBar18.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; this.ribbonBar18.Size = new System.Drawing.Size(171, 59); @@ -4474,10 +4499,12 @@ // // // + this.ribbonBar18.TitleStyle.Class = ""; this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.TitleVisible = false; // @@ -4506,14 +4533,15 @@ // // // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.BackgroundStyle.Class = ""; this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.ContainerControlProcessDialogKey = true; this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.DragDropSupport = true; this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem127, this.buttonItem128, @@ -4521,7 +4549,6 @@ this.buttonItem134, this.buttonItem130, this.btn_check_history}); - this.ribbonBar13.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; this.ribbonBar13.Size = new System.Drawing.Size(505, 59); @@ -4530,10 +4557,12 @@ // // // + this.ribbonBar13.TitleStyle.Class = ""; this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.TitleVisible = false; // @@ -4604,14 +4633,17 @@ // // // + this.ribbonPanel5.Style.Class = ""; this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseDown.Class = ""; this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseOver.Class = ""; this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel5.TabIndex = 37; this.ribbonPanel5.Visible = false; @@ -4622,20 +4654,20 @@ // // // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.BackgroundStyle.Class = ""; this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.ContainerControlProcessDialogKey = true; this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.DragDropSupport = true; this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemHX1, this.buttonItemHX2, this.buttonItemDCTP, this.sliderItem3}); - this.ribbonBar2.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; this.ribbonBar2.Size = new System.Drawing.Size(350, 59); @@ -4644,10 +4676,12 @@ // // // + this.ribbonBar2.TitleStyle.Class = ""; this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.TitleVisible = false; // @@ -4701,14 +4735,17 @@ // // // + this.ribbonPanel2.Style.Class = ""; this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseDown.Class = ""; this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; this.ribbonPanel2.Visible = false; @@ -4719,14 +4756,15 @@ // // // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.BackgroundStyle.Class = ""; this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.ContainerControlProcessDialogKey = true; this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.DragDropSupport = true; this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_user_info, this.btn_role_info, @@ -4735,7 +4773,6 @@ this.btn_user_role, this.btn_password_edit, this.buttonItemPasswordReset}); - this.ribbonBar3.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; this.ribbonBar3.Size = new System.Drawing.Size(551, 59); @@ -4744,10 +4781,12 @@ // // // + this.ribbonBar3.TitleStyle.Class = ""; this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.TitleVisible = false; // @@ -4823,20 +4862,24 @@ this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel15.Style.Class = ""; this.ribbonPanel15.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseDown.Class = ""; this.ribbonPanel15.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4844,14 +4887,15 @@ // // // + this.ribbonBar20.BackgroundMouseOverStyle.Class = ""; this.ribbonBar20.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.BackgroundStyle.Class = ""; this.ribbonBar20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.ContainerControlProcessDialogKey = true; this.ribbonBar20.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar20.DragDropSupport = true; this.ribbonBar20.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSH, this.buttonItemSJGL, @@ -4865,19 +4909,20 @@ this.buttonItemBJ, this.buttonItemSearch, this.buttonItemBZ}); - this.ribbonBar20.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(814, 58); + this.ribbonBar20.Size = new System.Drawing.Size(814, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // // // + this.ribbonBar20.TitleStyle.Class = ""; this.ribbonBar20.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.TitleStyleMouseOver.Class = ""; this.ribbonBar20.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.TitleVisible = false; // @@ -5070,18 +5115,21 @@ // this.buttonItem10.Name = "buttonItem10"; this.buttonItem10.Text = "管线入库-高程"; + this.buttonItem10.Visible = false; this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // // buttonItem11 // this.buttonItem11.Name = "buttonItem11"; this.buttonItem11.Text = "附属物入库-高程"; + this.buttonItem11.Visible = false; this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // // buttonItem12 // this.buttonItem12.Name = "buttonItem12"; this.buttonItem12.Text = "特征管点入库-高程"; + this.buttonItem12.Visible = false; this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // // buttonItemSJGL5 @@ -6226,14 +6274,17 @@ // // // + this.ribbonPanel4.Style.Class = ""; this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseDown.Class = ""; this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseOver.Class = ""; this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel4.TabIndex = 36; this.ribbonPanel4.Visible = false; @@ -6244,17 +6295,17 @@ // // // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.BackgroundStyle.Class = ""; this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.ContainerControlProcessDialogKey = true; this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.DragDropSupport = true; this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_document_info}); - this.ribbonBar1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; this.ribbonBar1.Size = new System.Drawing.Size(88, 59); @@ -6263,10 +6314,12 @@ // // // + this.ribbonBar1.TitleStyle.Class = ""; this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.TitleVisible = false; // @@ -6291,14 +6344,17 @@ // // // + this.ribbonPanel6.Style.Class = ""; this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseDown.Class = ""; this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseOver.Class = ""; this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel6.TabIndex = 38; this.ribbonPanel6.Visible = false; @@ -6309,21 +6365,21 @@ // // // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.BackgroundStyle.Class = ""; this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.ContainerControlProcessDialogKey = true; this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.DragDropSupport = true; this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSPSZ, this.buttonItem8, this.buttonItemLocation, this.sliderItem2, this.buttonItemGBJC}); - this.ribbonBar6.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; this.ribbonBar6.Size = new System.Drawing.Size(427, 59); @@ -6332,10 +6388,12 @@ // // // + this.ribbonBar6.TitleStyle.Class = ""; this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.TitleVisible = false; // @@ -6388,6 +6446,7 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6438,7 +6497,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -7045,7 +7103,7 @@ private DevComponents.DotNetBar.LabelX labelX25; private DevComponents.DotNetBar.PanelEx panelEx3; private System.Windows.Forms.TreeView layerSensorTree; - // private System.Windows.Forms.TreeView layerTree; + // private System.Windows.Forms.TreeView layerTree; private MyTreeView layerTree; private DevComponents.DotNetBar.ButtonX buttonX7; private DevComponents.DotNetBar.ButtonX buttonX16; diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 4f0593d..fe2b7f8 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -9,30 +9,45 @@ using GeoScene.Data; using GeoScene.Globe; using DevComponents.DotNetBar; +using System.Collections; namespace Cyberpipe { public partial class FrmAllWorkWellStatis : DevComponents.DotNetBar.Office2007Form { - Dictionary workWellLengthAndType = new Dictionary(); - List list = new List(); + + private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; + private Dictionary map = null; DataGridView dataGridViewX1; ToolStripStatusLabel toolStripNumbers; GSOGlobeControl globeControl1; PanelEx panel; - public FrmAllWorkWellStatis(Dictionary wellLen, List _list, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) + //TODOLIST：用晓伟的代理进行操作，功能拆分细化 + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) { InitializeComponent(); panel = p; - workWellLengthAndType = wellLen; - list = _list; dataGridViewX1 = dataGridViewX11; toolStripNumbers = toolStripNumbers1; - globeControl1 = ctl; + map = getAccsMap(polygon); + + } + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, MainFrm.DataGridViewDelegate InitDataGridViewX1, GSOGlobeControl ctl) + { + InitializeComponent(); + globeControl1 = ctl; + m_InitDataGridViewX1 = InitDataGridViewX1; + map = getAccsMap(polygon); + } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) { + drawChart(); + } + + public void drawChart() + { try { // Set axis title @@ -49,6 +64,11 @@ chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; + Dictionary workWellLengthAndType = new Dictionary(); + foreach (KeyValuePair kv in map) + { + workWellLengthAndType.Add(kv.Key, kv.Value.Length); + } chartAllAreaPipeline.Series["井盖"].Points.DataBindXY(workWellLengthAndType.Keys, workWellLengthAndType.Values); for (int m = 0; m < workWellLengthAndType.Values.Count; m++) { @@ -71,11 +91,11 @@ if (indexHit >= 0) { - GSOFeatures fs = list[indexHit]; + //GSOFeatures fs = list[indexHit]; string sql = ""; string pipetype = chartAllAreaPipeline.Series["井盖"].Points[indexHit].AxisLabel; - + GSOFeatures fs = map[pipetype]; string layername = ""; if (pipetype.EndsWith("窖井") || pipetype.EndsWith("表井") || (pipetype.EndsWith("窨井")) || pipetype.EndsWith("孔") || @@ -93,6 +113,23 @@ { return; } + //从图层获取datatable数据,不涉及数据库操作，速度会快一些 + //string [] fieldNames = GSOFeatureUtils.getFields(layername, globeControl1); + //DataTable dt = GSOFeatureUtils.convertGSOFeatures2DataTable(fs,fieldNames); + //if (dt.Rows.Count > 0) + //{ + // dataGridViewX1.DataSource = dt; + // panel.Visible = true; + // toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //} + //else + //{ + // panel.Visible = false; + // dataGridViewX1.DataSource = null; + // dataGridViewX1.Refresh(); + // toolStripNumbers.Text = "类型："; + //} + //数据库获取数据 if (fs.Length > 0) { sql = "select " + getpipeLineFields.getFields(layername, globeControl1) + " from " + layer.Name; @@ -120,8 +157,8 @@ { dataGridViewX1.DataSource = dt; panel.Visible = true; - //toolStripNumbers.Text = " 井盖类型：" + MainFrm.m_CurrentQueryLayer + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + string strLable = toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //m_InitDataGridViewX1(dt, strLable, "", true); } else { @@ -131,7 +168,6 @@ toolStripNumbers.Text = "类型："; } - //} } @@ -174,7 +210,7 @@ } } } - + //m_InitDataGridViewX1(null,"","" , false); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } @@ -183,5 +219,63 @@ PATM_Forms.F_PATMTitle frm = new PATM_Forms.F_PATMTitle("S", chartAllAreaPipeline); frm.Show(); } + + //获取指定layer类型的附属物名称列表 + public string[] getLayerAccNames(string layerType) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(layerType + "管线附属物"); + if (layer == null) return null; + + string sql = "select 附属物名称 from " + layerType + "管线附属物 group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layerType + "管线附属物"); + if (dataset == null) return null; + + int count = dataset.Tables[0].Rows.Count; + + + string[] result = new string[count]; + for (int i = 0; i < count; i++) + { + result[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return result; + } + + /// + /// 获取区域内各图层的井、孔、蓖的map + /// + /// 区域 + /// 要查找的附属物名称数组、如井、孔、蓖 + /// 返回值为：<图层+附属物名称,附属物列表> + + public Dictionary getAccsMap(GSOGeoPolygon3D polygon) + { + //List list = new List(); + Dictionary map = new Dictionary(); + ArrayList listpt = Utility.LayerNamesList; + if (listpt == null || listpt.Count == 0) return null; + FeatureStatisticsService service = new FeatureStatisticsService(); + for (int i = 0; i < listpt.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listpt[i] + "管线附属物"); + string[] accNames = getLayerAccNames(listpt[i] as string); + if (accNames == null || accNames.Length == 0) continue;//排除不合法的值 + for (int j = 0; j < accNames.Length; j++) + { + if (accNames[j].Contains("井") || accNames[j].Contains("孔") || accNames[j].Contains("篦")) + { + + GSOFeatures features = service.Intersect_PointLayerByType(polygon, layer, accNames[j]); + if (features == null) continue; + map.Add(listpt[i] + accNames[j], features); + } + + } + + } + return map; + + } + } } diff --git a/MainFrm.cs b/MainFrm.cs index ac2614d..b584749 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2951,35 +2951,35 @@ break; case "workwellquery": - workWellLen.Clear(); - List listWell = new List(); - //找到所有井 - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //workWellLen.Clear(); + //List listWell = new List(); + ////找到所有井 + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - listWell.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // listWell.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(workWellLen, listWell, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(polygon, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frmWell.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -9740,37 +9740,37 @@ private void buttonItemTJ3_ALL_Click(object sender, EventArgs e) { //日志记录 - LogManager.saveLog(Utility.userName, "井盖数量统计"); + //LogManager.saveLog(Utility.userName, "井盖数量统计"); - workWellLen.Clear(); - List list = new List(); + //workWellLen.Clear(); + //List list = new List(); - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - list.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // list.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(workWellLen, list, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(null, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frm.Show(this); } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ae24fb9..5c2bb7f 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -706,7 +706,6 @@ this.dotNetBarManager1.BottomDockSite = this.dockSite4; this.dotNetBarManager1.EnableFullSizeDock = false; this.dotNetBarManager1.LeftDockSite = this.dockSite1; - this.dotNetBarManager1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.dotNetBarManager1.ParentForm = null; this.dotNetBarManager1.RightDockSite = this.dockSite2; this.dotNetBarManager1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003; @@ -799,7 +798,6 @@ // styleManager1 // this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Office2010Blue; - this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(87)))), ((int)(((byte)(154)))))); // // sideBarPanelItem1 // @@ -848,7 +846,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -894,6 +892,7 @@ this.ribbonTabItemGroup1.Style.BorderRightWidth = 1; this.ribbonTabItemGroup1.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ribbonTabItemGroup1.Style.BorderTopWidth = 1; + this.ribbonTabItemGroup1.Style.Class = ""; this.ribbonTabItemGroup1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonTabItemGroup1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.ribbonTabItemGroup1.Style.TextColor = System.Drawing.Color.White; @@ -906,6 +905,7 @@ // // // + this.galleryContainer2.BackgroundStyle.Class = ""; this.galleryContainer2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer2.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer2.Name = "galleryContainer2"; @@ -915,10 +915,6 @@ this.buttonItem39}); this.galleryContainer2.Text = "断面分析"; // - // - // - this.galleryContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem38 // this.buttonItem38.Name = "buttonItem38"; @@ -939,16 +935,13 @@ // // // + this.galleryContainer3.BackgroundStyle.Class = ""; this.galleryContainer3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer3.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer3.Name = "galleryContainer3"; this.galleryContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem3}); // - // - // - this.galleryContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem3 // this.buttonItem3.Name = "buttonItem3"; @@ -959,6 +952,7 @@ // // // + this.galleryContainer4.BackgroundStyle.Class = ""; this.galleryContainer4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer4.MinimumSize = new System.Drawing.Size(150, 58); this.galleryContainer4.Name = "galleryContainer4"; @@ -970,10 +964,6 @@ this.buttonItem46}); this.galleryContainer4.Text = "断面分析"; // - // - // - this.galleryContainer4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem40 // this.buttonItem40.Name = "buttonItem40"; @@ -1004,6 +994,7 @@ // // // + this.galleryContainer5.BackgroundStyle.Class = ""; this.galleryContainer5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer5.MinimumSize = new System.Drawing.Size(80, 58); this.galleryContainer5.Name = "galleryContainer5"; @@ -1011,10 +1002,6 @@ this.buttonItem44, this.buttonItem43}); // - // - // - this.galleryContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem44 // this.buttonItem44.Name = "buttonItem44"; @@ -1030,16 +1017,13 @@ // // // + this.galleryContainer6.BackgroundStyle.Class = ""; this.galleryContainer6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer6.MinimumSize = new System.Drawing.Size(70, 58); this.galleryContainer6.Name = "galleryContainer6"; this.galleryContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem48}); // - // - // - this.galleryContainer6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem48 // this.buttonItem48.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right; @@ -1073,7 +1057,6 @@ this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx3.Controls.Add(this.layerSensorTree); - this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx3.Location = new System.Drawing.Point(54, 113); this.panelEx3.Name = "panelEx3"; this.panelEx3.Size = new System.Drawing.Size(200, 161); @@ -1188,6 +1171,7 @@ // // // + this.labelX25.BackgroundStyle.Class = ""; this.labelX25.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX25.Location = new System.Drawing.Point(7, 364); this.labelX25.Name = "labelX25"; @@ -1252,6 +1236,7 @@ // // // + this.labelX8.BackgroundStyle.Class = ""; this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX8.Location = new System.Drawing.Point(11, 60); this.labelX8.Name = "labelX8"; @@ -1384,6 +1369,7 @@ // // // + this.checkBoxX3.BackgroundStyle.Class = ""; this.checkBoxX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX3.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX3.Location = new System.Drawing.Point(11, 9); @@ -1401,6 +1387,7 @@ // // // + this.checkBoxX4.BackgroundStyle.Class = ""; this.checkBoxX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX4.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX4.Location = new System.Drawing.Point(110, 9); @@ -1418,6 +1405,7 @@ // // // + this.labelX13.BackgroundStyle.Class = ""; this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX13.Location = new System.Drawing.Point(11, 32); this.labelX13.Name = "labelX13"; @@ -1432,6 +1420,7 @@ // // // + this.labelX14.BackgroundStyle.Class = ""; this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX14.Location = new System.Drawing.Point(10, 204); this.labelX14.Name = "labelX14"; @@ -1509,7 +1498,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(181, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(198, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -1534,6 +1523,7 @@ // // // + this.labelX9.BackgroundStyle.Class = ""; this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX9.Location = new System.Drawing.Point(9, 85); this.labelX9.Name = "labelX9"; @@ -1592,7 +1582,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(180, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(197, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -1635,6 +1625,7 @@ // // // + this.labelX10.BackgroundStyle.Class = ""; this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX10.Location = new System.Drawing.Point(172, 54); this.labelX10.Name = "labelX10"; @@ -1665,6 +1656,7 @@ // // // + this.checkBoxX5.BackgroundStyle.Class = ""; this.checkBoxX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX5.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX5.Location = new System.Drawing.Point(19, 4); @@ -1682,6 +1674,7 @@ // // // + this.checkBoxX6.BackgroundStyle.Class = ""; this.checkBoxX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX6.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX6.Location = new System.Drawing.Point(114, 4); @@ -1699,6 +1692,7 @@ // // // + this.labelX12.BackgroundStyle.Class = ""; this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX12.Location = new System.Drawing.Point(6, 57); this.labelX12.Name = "labelX12"; @@ -1713,6 +1707,7 @@ // // // + this.labelX16.BackgroundStyle.Class = ""; this.labelX16.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX16.Location = new System.Drawing.Point(6, 28); this.labelX16.Name = "labelX16"; @@ -1727,6 +1722,7 @@ // // // + this.labelX17.BackgroundStyle.Class = ""; this.labelX17.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX17.Location = new System.Drawing.Point(8, 235); this.labelX17.Name = "labelX17"; @@ -1772,6 +1768,7 @@ // // // + this.labelX24.BackgroundStyle.Class = ""; this.labelX24.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX24.Image = ((System.Drawing.Image)(resources.GetObject("labelX24.Image"))); this.labelX24.Location = new System.Drawing.Point(7, 403); @@ -1804,7 +1801,7 @@ this.dataGridViewX8.ReadOnly = true; this.dataGridViewX8.RowHeadersVisible = false; this.dataGridViewX8.RowTemplate.Height = 23; - this.dataGridViewX8.Size = new System.Drawing.Size(176, 92); + this.dataGridViewX8.Size = new System.Drawing.Size(193, 92); this.dataGridViewX8.TabIndex = 11; // // dataGridViewTextBoxColumn12 @@ -1838,6 +1835,7 @@ // // // + this.labelX11.BackgroundStyle.Class = ""; this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX11.Location = new System.Drawing.Point(10, 93); this.labelX11.Name = "labelX11"; @@ -1898,7 +1896,7 @@ this.dataGridViewX9.ReadOnly = true; this.dataGridViewX9.RowHeadersVisible = false; this.dataGridViewX9.RowTemplate.Height = 23; - this.dataGridViewX9.Size = new System.Drawing.Size(175, 127); + this.dataGridViewX9.Size = new System.Drawing.Size(192, 127); this.dataGridViewX9.TabIndex = 5; this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick); // @@ -1973,6 +1971,7 @@ // // // + this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX15.Location = new System.Drawing.Point(174, 61); this.labelX15.Name = "labelX15"; @@ -2003,6 +2002,7 @@ // // // + this.checkBoxX7.BackgroundStyle.Class = ""; this.checkBoxX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX7.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX7.Location = new System.Drawing.Point(8, 5); @@ -2020,6 +2020,7 @@ // // // + this.checkBoxX8.BackgroundStyle.Class = ""; this.checkBoxX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX8.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX8.Location = new System.Drawing.Point(118, 5); @@ -2037,6 +2038,7 @@ // // // + this.labelX19.BackgroundStyle.Class = ""; this.labelX19.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX19.Location = new System.Drawing.Point(11, 61); this.labelX19.Name = "labelX19"; @@ -2051,6 +2053,7 @@ // // // + this.labelX21.BackgroundStyle.Class = ""; this.labelX21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX21.Location = new System.Drawing.Point(10, 29); this.labelX21.Name = "labelX21"; @@ -2062,6 +2065,7 @@ // // // + this.labelX22.BackgroundStyle.Class = ""; this.labelX22.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX22.Image = ((System.Drawing.Image)(resources.GetObject("labelX22.Image"))); this.labelX22.Location = new System.Drawing.Point(9, 245); @@ -2139,6 +2143,7 @@ // // // + this.labelX28.BackgroundStyle.Class = ""; this.labelX28.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX28.Location = new System.Drawing.Point(181, 104); this.labelX28.Name = "labelX28"; @@ -2154,6 +2159,7 @@ // // // + this.labelX29.BackgroundStyle.Class = ""; this.labelX29.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX29.Location = new System.Drawing.Point(6, 100); this.labelX29.Name = "labelX29"; @@ -2186,6 +2192,7 @@ // // // + this.labelX4.BackgroundStyle.Class = ""; this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Image = ((System.Drawing.Image)(resources.GetObject("labelX4.Image"))); this.labelX4.Location = new System.Drawing.Point(7, 432); @@ -2249,6 +2256,7 @@ // // // + this.labelX5.BackgroundStyle.Class = ""; this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Image = ((System.Drawing.Image)(resources.GetObject("labelX5.Image"))); this.labelX5.Location = new System.Drawing.Point(9, 134); @@ -2383,6 +2391,7 @@ // // // + this.labelX18.BackgroundStyle.Class = ""; this.labelX18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX18.Location = new System.Drawing.Point(181, 71); this.labelX18.Name = "labelX18"; @@ -2413,6 +2422,7 @@ // // // + this.checkBoxSelectPipeline.BackgroundStyle.Class = ""; this.checkBoxSelectPipeline.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectPipeline.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectPipeline.Location = new System.Drawing.Point(8, 9); @@ -2430,6 +2440,7 @@ // // // + this.checkBoxSelectLayer.BackgroundStyle.Class = ""; this.checkBoxSelectLayer.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectLayer.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectLayer.Location = new System.Drawing.Point(117, 9); @@ -2447,6 +2458,7 @@ // // // + this.labelX20.BackgroundStyle.Class = ""; this.labelX20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX20.Location = new System.Drawing.Point(6, 69); this.labelX20.Name = "labelX20"; @@ -2458,6 +2470,7 @@ // // // + this.labelX26.BackgroundStyle.Class = ""; this.labelX26.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX26.Image = ((System.Drawing.Image)(resources.GetObject("labelX26.Image"))); this.labelX26.Location = new System.Drawing.Point(9, 38); @@ -2470,6 +2483,7 @@ // // // + this.labelX27.BackgroundStyle.Class = ""; this.labelX27.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX27.Image = ((System.Drawing.Image)(resources.GetObject("labelX27.Image"))); this.labelX27.Location = new System.Drawing.Point(7, 287); @@ -2482,6 +2496,7 @@ // // // + this.labelX30.BackgroundStyle.Class = ""; this.labelX30.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX30.Location = new System.Drawing.Point(88, 100); this.labelX30.Name = "labelX30"; @@ -2514,6 +2529,7 @@ // // // + this.labelX23.BackgroundStyle.Class = ""; this.labelX23.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX23.Image = ((System.Drawing.Image)(resources.GetObject("labelX23.Image"))); this.labelX23.Location = new System.Drawing.Point(11, 404); @@ -2577,6 +2593,7 @@ // // // + this.labelX2.BackgroundStyle.Class = ""; this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Image = ((System.Drawing.Image)(resources.GetObject("labelX2.Image"))); this.labelX2.Location = new System.Drawing.Point(12, 100); @@ -2703,6 +2720,7 @@ // // // + this.labelX7.BackgroundStyle.Class = ""; this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX7.Location = new System.Drawing.Point(176, 67); this.labelX7.Name = "labelX7"; @@ -2733,6 +2751,7 @@ // // // + this.checkBoxX1.BackgroundStyle.Class = ""; this.checkBoxX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX1.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX1.Location = new System.Drawing.Point(11, 5); @@ -2750,6 +2769,7 @@ // // // + this.checkBoxX2.BackgroundStyle.Class = ""; this.checkBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX2.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX2.Location = new System.Drawing.Point(120, 5); @@ -2767,6 +2787,7 @@ // // // + this.labelX6.BackgroundStyle.Class = ""; this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX6.Location = new System.Drawing.Point(15, 67); this.labelX6.Name = "labelX6"; @@ -2778,6 +2799,7 @@ // // // + this.labelX1.BackgroundStyle.Class = ""; this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Image = ((System.Drawing.Image)(resources.GetObject("labelX1.Image"))); this.labelX1.Location = new System.Drawing.Point(12, 34); @@ -2790,6 +2812,7 @@ // // // + this.labelX3.BackgroundStyle.Class = ""; this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Image = ((System.Drawing.Image)(resources.GetObject("labelX3.Image"))); this.labelX3.Location = new System.Drawing.Point(11, 250); @@ -2800,11 +2823,11 @@ // expandableSplitter1 // this.expandableSplitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -2816,11 +2839,11 @@ this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -2837,7 +2860,6 @@ this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx4.Controls.Add(this.splitContainer1); this.panelEx4.Controls.Add(this.panelOfTable); - this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx4.Location = new System.Drawing.Point(203, 179); this.panelEx4.Name = "panelEx4"; @@ -2878,7 +2900,6 @@ this.panelEx5.Controls.Add(this.panel1); this.panelEx5.Controls.Add(this.panel3); this.panelEx5.Controls.Add(this.panel5); - this.panelEx5.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx5.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx5.Location = new System.Drawing.Point(0, 0); this.panelEx5.Name = "panelEx5"; @@ -2921,7 +2942,6 @@ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.Controls.Add(this.panel2); this.panelEx1.Controls.Add(this.panel4); - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; @@ -2944,7 +2964,6 @@ this.panelOfTable.Controls.Add(this.dataGridViewX1); this.panelOfTable.Controls.Add(this.statusStrip2); this.panelOfTable.Controls.Add(this.expandableSplitter2); - this.panelOfTable.DisabledBackColor = System.Drawing.Color.Empty; this.panelOfTable.Dock = System.Windows.Forms.DockStyle.Bottom; this.panelOfTable.Location = new System.Drawing.Point(0, 414); this.panelOfTable.Name = "panelOfTable"; @@ -3042,12 +3061,12 @@ // expandableSplitter2 // this.expandableSplitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter2.Dock = System.Windows.Forms.DockStyle.Top; this.expandableSplitter2.ExpandableControl = this.panelOfTable; - this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -3059,11 +3078,11 @@ this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -3183,7 +3202,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(149, 290); + this.toolRightMenu.Size = new System.Drawing.Size(153, 312); // // 量算ToolStripMenuItem // @@ -3259,7 +3278,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -4125,8 +4144,6 @@ // superTooltip1 // this.superTooltip1.DefaultFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); - this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.superTooltip1.MinimumTooltipSize = new System.Drawing.Size(150, 50); // // buttonItem16 @@ -4233,12 +4250,13 @@ // // // + this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4255,7 +4273,7 @@ this.ribbonControl1.Location = new System.Drawing.Point(0, 82); this.ribbonControl1.MdiSystemItemVisible = false; this.ribbonControl1.Name = "ribbonControl1"; - this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); this.ribbonControl1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem19}); this.ribbonControl1.Size = new System.Drawing.Size(1328, 97); @@ -4292,21 +4310,23 @@ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel1.Style.Class = ""; this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseDown.Class = ""; this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4315,14 +4335,15 @@ // // // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.BackgroundStyle.Class = ""; this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.ContainerControlProcessDialogKey = true; this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.DragDropSupport = true; this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem87, this.buttonItem88, @@ -4333,20 +4354,21 @@ this.btnlegendSet, this.buttonItem89, this.btnOutputJPG}); - this.ribbonBar21.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 58); + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; // // // + this.ribbonBar21.TitleStyle.Class = ""; this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.TitleVisible = false; // @@ -4436,14 +4458,17 @@ // // // + this.ribbonPanel12.Style.Class = ""; this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseDown.Class = ""; this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseOver.Class = ""; this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel12.TabIndex = 34; this.ribbonPanel12.Visible = false; @@ -4454,18 +4479,18 @@ // // // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.BackgroundStyle.Class = ""; this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.ContainerControlProcessDialogKey = true; this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.DragDropSupport = true; this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem133, this.buttonItem132}); - this.ribbonBar18.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; this.ribbonBar18.Size = new System.Drawing.Size(171, 59); @@ -4474,10 +4499,12 @@ // // // + this.ribbonBar18.TitleStyle.Class = ""; this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.TitleVisible = false; // @@ -4506,14 +4533,15 @@ // // // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.BackgroundStyle.Class = ""; this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.ContainerControlProcessDialogKey = true; this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.DragDropSupport = true; this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem127, this.buttonItem128, @@ -4521,7 +4549,6 @@ this.buttonItem134, this.buttonItem130, this.btn_check_history}); - this.ribbonBar13.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; this.ribbonBar13.Size = new System.Drawing.Size(505, 59); @@ -4530,10 +4557,12 @@ // // // + this.ribbonBar13.TitleStyle.Class = ""; this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.TitleVisible = false; // @@ -4604,14 +4633,17 @@ // // // + this.ribbonPanel5.Style.Class = ""; this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseDown.Class = ""; this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseOver.Class = ""; this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel5.TabIndex = 37; this.ribbonPanel5.Visible = false; @@ -4622,20 +4654,20 @@ // // // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.BackgroundStyle.Class = ""; this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.ContainerControlProcessDialogKey = true; this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.DragDropSupport = true; this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemHX1, this.buttonItemHX2, this.buttonItemDCTP, this.sliderItem3}); - this.ribbonBar2.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; this.ribbonBar2.Size = new System.Drawing.Size(350, 59); @@ -4644,10 +4676,12 @@ // // // + this.ribbonBar2.TitleStyle.Class = ""; this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.TitleVisible = false; // @@ -4701,14 +4735,17 @@ // // // + this.ribbonPanel2.Style.Class = ""; this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseDown.Class = ""; this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; this.ribbonPanel2.Visible = false; @@ -4719,14 +4756,15 @@ // // // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.BackgroundStyle.Class = ""; this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.ContainerControlProcessDialogKey = true; this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.DragDropSupport = true; this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_user_info, this.btn_role_info, @@ -4735,7 +4773,6 @@ this.btn_user_role, this.btn_password_edit, this.buttonItemPasswordReset}); - this.ribbonBar3.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; this.ribbonBar3.Size = new System.Drawing.Size(551, 59); @@ -4744,10 +4781,12 @@ // // // + this.ribbonBar3.TitleStyle.Class = ""; this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.TitleVisible = false; // @@ -4823,20 +4862,24 @@ this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel15.Style.Class = ""; this.ribbonPanel15.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseDown.Class = ""; this.ribbonPanel15.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4844,14 +4887,15 @@ // // // + this.ribbonBar20.BackgroundMouseOverStyle.Class = ""; this.ribbonBar20.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.BackgroundStyle.Class = ""; this.ribbonBar20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.ContainerControlProcessDialogKey = true; this.ribbonBar20.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar20.DragDropSupport = true; this.ribbonBar20.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSH, this.buttonItemSJGL, @@ -4865,19 +4909,20 @@ this.buttonItemBJ, this.buttonItemSearch, this.buttonItemBZ}); - this.ribbonBar20.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(814, 58); + this.ribbonBar20.Size = new System.Drawing.Size(814, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // // // + this.ribbonBar20.TitleStyle.Class = ""; this.ribbonBar20.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.TitleStyleMouseOver.Class = ""; this.ribbonBar20.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.TitleVisible = false; // @@ -5070,18 +5115,21 @@ // this.buttonItem10.Name = "buttonItem10"; this.buttonItem10.Text = "管线入库-高程"; + this.buttonItem10.Visible = false; this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // // buttonItem11 // this.buttonItem11.Name = "buttonItem11"; this.buttonItem11.Text = "附属物入库-高程"; + this.buttonItem11.Visible = false; this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // // buttonItem12 // this.buttonItem12.Name = "buttonItem12"; this.buttonItem12.Text = "特征管点入库-高程"; + this.buttonItem12.Visible = false; this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // // buttonItemSJGL5 @@ -6226,14 +6274,17 @@ // // // + this.ribbonPanel4.Style.Class = ""; this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseDown.Class = ""; this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseOver.Class = ""; this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel4.TabIndex = 36; this.ribbonPanel4.Visible = false; @@ -6244,17 +6295,17 @@ // // // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.BackgroundStyle.Class = ""; this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.ContainerControlProcessDialogKey = true; this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.DragDropSupport = true; this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_document_info}); - this.ribbonBar1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; this.ribbonBar1.Size = new System.Drawing.Size(88, 59); @@ -6263,10 +6314,12 @@ // // // + this.ribbonBar1.TitleStyle.Class = ""; this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.TitleVisible = false; // @@ -6291,14 +6344,17 @@ // // // + this.ribbonPanel6.Style.Class = ""; this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseDown.Class = ""; this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseOver.Class = ""; this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel6.TabIndex = 38; this.ribbonPanel6.Visible = false; @@ -6309,21 +6365,21 @@ // // // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.BackgroundStyle.Class = ""; this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.ContainerControlProcessDialogKey = true; this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.DragDropSupport = true; this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSPSZ, this.buttonItem8, this.buttonItemLocation, this.sliderItem2, this.buttonItemGBJC}); - this.ribbonBar6.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; this.ribbonBar6.Size = new System.Drawing.Size(427, 59); @@ -6332,10 +6388,12 @@ // // // + this.ribbonBar6.TitleStyle.Class = ""; this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.TitleVisible = false; // @@ -6388,6 +6446,7 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6438,7 +6497,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -7045,7 +7103,7 @@ private DevComponents.DotNetBar.LabelX labelX25; private DevComponents.DotNetBar.PanelEx panelEx3; private System.Windows.Forms.TreeView layerSensorTree; - // private System.Windows.Forms.TreeView layerTree; + // private System.Windows.Forms.TreeView layerTree; private MyTreeView layerTree; private DevComponents.DotNetBar.ButtonX buttonX7; private DevComponents.DotNetBar.ButtonX buttonX16; diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 4f0593d..fe2b7f8 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -9,30 +9,45 @@ using GeoScene.Data; using GeoScene.Globe; using DevComponents.DotNetBar; +using System.Collections; namespace Cyberpipe { public partial class FrmAllWorkWellStatis : DevComponents.DotNetBar.Office2007Form { - Dictionary workWellLengthAndType = new Dictionary(); - List list = new List(); + + private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; + private Dictionary map = null; DataGridView dataGridViewX1; ToolStripStatusLabel toolStripNumbers; GSOGlobeControl globeControl1; PanelEx panel; - public FrmAllWorkWellStatis(Dictionary wellLen, List _list, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) + //TODOLIST：用晓伟的代理进行操作，功能拆分细化 + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) { InitializeComponent(); panel = p; - workWellLengthAndType = wellLen; - list = _list; dataGridViewX1 = dataGridViewX11; toolStripNumbers = toolStripNumbers1; - globeControl1 = ctl; + map = getAccsMap(polygon); + + } + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, MainFrm.DataGridViewDelegate InitDataGridViewX1, GSOGlobeControl ctl) + { + InitializeComponent(); + globeControl1 = ctl; + m_InitDataGridViewX1 = InitDataGridViewX1; + map = getAccsMap(polygon); + } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) { + drawChart(); + } + + public void drawChart() + { try { // Set axis title @@ -49,6 +64,11 @@ chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; + Dictionary workWellLengthAndType = new Dictionary(); + foreach (KeyValuePair kv in map) + { + workWellLengthAndType.Add(kv.Key, kv.Value.Length); + } chartAllAreaPipeline.Series["井盖"].Points.DataBindXY(workWellLengthAndType.Keys, workWellLengthAndType.Values); for (int m = 0; m < workWellLengthAndType.Values.Count; m++) { @@ -71,11 +91,11 @@ if (indexHit >= 0) { - GSOFeatures fs = list[indexHit]; + //GSOFeatures fs = list[indexHit]; string sql = ""; string pipetype = chartAllAreaPipeline.Series["井盖"].Points[indexHit].AxisLabel; - + GSOFeatures fs = map[pipetype]; string layername = ""; if (pipetype.EndsWith("窖井") || pipetype.EndsWith("表井") || (pipetype.EndsWith("窨井")) || pipetype.EndsWith("孔") || @@ -93,6 +113,23 @@ { return; } + //从图层获取datatable数据,不涉及数据库操作，速度会快一些 + //string [] fieldNames = GSOFeatureUtils.getFields(layername, globeControl1); + //DataTable dt = GSOFeatureUtils.convertGSOFeatures2DataTable(fs,fieldNames); + //if (dt.Rows.Count > 0) + //{ + // dataGridViewX1.DataSource = dt; + // panel.Visible = true; + // toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //} + //else + //{ + // panel.Visible = false; + // dataGridViewX1.DataSource = null; + // dataGridViewX1.Refresh(); + // toolStripNumbers.Text = "类型："; + //} + //数据库获取数据 if (fs.Length > 0) { sql = "select " + getpipeLineFields.getFields(layername, globeControl1) + " from " + layer.Name; @@ -120,8 +157,8 @@ { dataGridViewX1.DataSource = dt; panel.Visible = true; - //toolStripNumbers.Text = " 井盖类型：" + MainFrm.m_CurrentQueryLayer + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + string strLable = toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //m_InitDataGridViewX1(dt, strLable, "", true); } else { @@ -131,7 +168,6 @@ toolStripNumbers.Text = "类型："; } - //} } @@ -174,7 +210,7 @@ } } } - + //m_InitDataGridViewX1(null,"","" , false); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } @@ -183,5 +219,63 @@ PATM_Forms.F_PATMTitle frm = new PATM_Forms.F_PATMTitle("S", chartAllAreaPipeline); frm.Show(); } + + //获取指定layer类型的附属物名称列表 + public string[] getLayerAccNames(string layerType) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(layerType + "管线附属物"); + if (layer == null) return null; + + string sql = "select 附属物名称 from " + layerType + "管线附属物 group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layerType + "管线附属物"); + if (dataset == null) return null; + + int count = dataset.Tables[0].Rows.Count; + + + string[] result = new string[count]; + for (int i = 0; i < count; i++) + { + result[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return result; + } + + /// + /// 获取区域内各图层的井、孔、蓖的map + /// + /// 区域 + /// 要查找的附属物名称数组、如井、孔、蓖 + /// 返回值为：<图层+附属物名称,附属物列表> + + public Dictionary getAccsMap(GSOGeoPolygon3D polygon) + { + //List list = new List(); + Dictionary map = new Dictionary(); + ArrayList listpt = Utility.LayerNamesList; + if (listpt == null || listpt.Count == 0) return null; + FeatureStatisticsService service = new FeatureStatisticsService(); + for (int i = 0; i < listpt.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listpt[i] + "管线附属物"); + string[] accNames = getLayerAccNames(listpt[i] as string); + if (accNames == null || accNames.Length == 0) continue;//排除不合法的值 + for (int j = 0; j < accNames.Length; j++) + { + if (accNames[j].Contains("井") || accNames[j].Contains("孔") || accNames[j].Contains("篦")) + { + + GSOFeatures features = service.Intersect_PointLayerByType(polygon, layer, accNames[j]); + if (features == null) continue; + map.Add(listpt[i] + accNames[j], features); + } + + } + + } + return map; + + } + } } diff --git a/MainFrm.cs b/MainFrm.cs index ac2614d..b584749 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2951,35 +2951,35 @@ break; case "workwellquery": - workWellLen.Clear(); - List listWell = new List(); - //找到所有井 - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //workWellLen.Clear(); + //List listWell = new List(); + ////找到所有井 + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - listWell.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // listWell.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(workWellLen, listWell, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(polygon, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frmWell.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -9740,37 +9740,37 @@ private void buttonItemTJ3_ALL_Click(object sender, EventArgs e) { //日志记录 - LogManager.saveLog(Utility.userName, "井盖数量统计"); + //LogManager.saveLog(Utility.userName, "井盖数量统计"); - workWellLen.Clear(); - List list = new List(); + //workWellLen.Clear(); + //List list = new List(); - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - list.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // list.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(workWellLen, list, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(null, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frm.Show(this); } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ae24fb9..5c2bb7f 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -706,7 +706,6 @@ this.dotNetBarManager1.BottomDockSite = this.dockSite4; this.dotNetBarManager1.EnableFullSizeDock = false; this.dotNetBarManager1.LeftDockSite = this.dockSite1; - this.dotNetBarManager1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.dotNetBarManager1.ParentForm = null; this.dotNetBarManager1.RightDockSite = this.dockSite2; this.dotNetBarManager1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003; @@ -799,7 +798,6 @@ // styleManager1 // this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Office2010Blue; - this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(87)))), ((int)(((byte)(154)))))); // // sideBarPanelItem1 // @@ -848,7 +846,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -894,6 +892,7 @@ this.ribbonTabItemGroup1.Style.BorderRightWidth = 1; this.ribbonTabItemGroup1.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ribbonTabItemGroup1.Style.BorderTopWidth = 1; + this.ribbonTabItemGroup1.Style.Class = ""; this.ribbonTabItemGroup1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonTabItemGroup1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.ribbonTabItemGroup1.Style.TextColor = System.Drawing.Color.White; @@ -906,6 +905,7 @@ // // // + this.galleryContainer2.BackgroundStyle.Class = ""; this.galleryContainer2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer2.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer2.Name = "galleryContainer2"; @@ -915,10 +915,6 @@ this.buttonItem39}); this.galleryContainer2.Text = "断面分析"; // - // - // - this.galleryContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem38 // this.buttonItem38.Name = "buttonItem38"; @@ -939,16 +935,13 @@ // // // + this.galleryContainer3.BackgroundStyle.Class = ""; this.galleryContainer3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer3.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer3.Name = "galleryContainer3"; this.galleryContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem3}); // - // - // - this.galleryContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem3 // this.buttonItem3.Name = "buttonItem3"; @@ -959,6 +952,7 @@ // // // + this.galleryContainer4.BackgroundStyle.Class = ""; this.galleryContainer4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer4.MinimumSize = new System.Drawing.Size(150, 58); this.galleryContainer4.Name = "galleryContainer4"; @@ -970,10 +964,6 @@ this.buttonItem46}); this.galleryContainer4.Text = "断面分析"; // - // - // - this.galleryContainer4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem40 // this.buttonItem40.Name = "buttonItem40"; @@ -1004,6 +994,7 @@ // // // + this.galleryContainer5.BackgroundStyle.Class = ""; this.galleryContainer5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer5.MinimumSize = new System.Drawing.Size(80, 58); this.galleryContainer5.Name = "galleryContainer5"; @@ -1011,10 +1002,6 @@ this.buttonItem44, this.buttonItem43}); // - // - // - this.galleryContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem44 // this.buttonItem44.Name = "buttonItem44"; @@ -1030,16 +1017,13 @@ // // // + this.galleryContainer6.BackgroundStyle.Class = ""; this.galleryContainer6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer6.MinimumSize = new System.Drawing.Size(70, 58); this.galleryContainer6.Name = "galleryContainer6"; this.galleryContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem48}); // - // - // - this.galleryContainer6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem48 // this.buttonItem48.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right; @@ -1073,7 +1057,6 @@ this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx3.Controls.Add(this.layerSensorTree); - this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx3.Location = new System.Drawing.Point(54, 113); this.panelEx3.Name = "panelEx3"; this.panelEx3.Size = new System.Drawing.Size(200, 161); @@ -1188,6 +1171,7 @@ // // // + this.labelX25.BackgroundStyle.Class = ""; this.labelX25.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX25.Location = new System.Drawing.Point(7, 364); this.labelX25.Name = "labelX25"; @@ -1252,6 +1236,7 @@ // // // + this.labelX8.BackgroundStyle.Class = ""; this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX8.Location = new System.Drawing.Point(11, 60); this.labelX8.Name = "labelX8"; @@ -1384,6 +1369,7 @@ // // // + this.checkBoxX3.BackgroundStyle.Class = ""; this.checkBoxX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX3.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX3.Location = new System.Drawing.Point(11, 9); @@ -1401,6 +1387,7 @@ // // // + this.checkBoxX4.BackgroundStyle.Class = ""; this.checkBoxX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX4.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX4.Location = new System.Drawing.Point(110, 9); @@ -1418,6 +1405,7 @@ // // // + this.labelX13.BackgroundStyle.Class = ""; this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX13.Location = new System.Drawing.Point(11, 32); this.labelX13.Name = "labelX13"; @@ -1432,6 +1420,7 @@ // // // + this.labelX14.BackgroundStyle.Class = ""; this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX14.Location = new System.Drawing.Point(10, 204); this.labelX14.Name = "labelX14"; @@ -1509,7 +1498,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(181, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(198, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -1534,6 +1523,7 @@ // // // + this.labelX9.BackgroundStyle.Class = ""; this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX9.Location = new System.Drawing.Point(9, 85); this.labelX9.Name = "labelX9"; @@ -1592,7 +1582,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(180, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(197, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -1635,6 +1625,7 @@ // // // + this.labelX10.BackgroundStyle.Class = ""; this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX10.Location = new System.Drawing.Point(172, 54); this.labelX10.Name = "labelX10"; @@ -1665,6 +1656,7 @@ // // // + this.checkBoxX5.BackgroundStyle.Class = ""; this.checkBoxX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX5.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX5.Location = new System.Drawing.Point(19, 4); @@ -1682,6 +1674,7 @@ // // // + this.checkBoxX6.BackgroundStyle.Class = ""; this.checkBoxX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX6.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX6.Location = new System.Drawing.Point(114, 4); @@ -1699,6 +1692,7 @@ // // // + this.labelX12.BackgroundStyle.Class = ""; this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX12.Location = new System.Drawing.Point(6, 57); this.labelX12.Name = "labelX12"; @@ -1713,6 +1707,7 @@ // // // + this.labelX16.BackgroundStyle.Class = ""; this.labelX16.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX16.Location = new System.Drawing.Point(6, 28); this.labelX16.Name = "labelX16"; @@ -1727,6 +1722,7 @@ // // // + this.labelX17.BackgroundStyle.Class = ""; this.labelX17.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX17.Location = new System.Drawing.Point(8, 235); this.labelX17.Name = "labelX17"; @@ -1772,6 +1768,7 @@ // // // + this.labelX24.BackgroundStyle.Class = ""; this.labelX24.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX24.Image = ((System.Drawing.Image)(resources.GetObject("labelX24.Image"))); this.labelX24.Location = new System.Drawing.Point(7, 403); @@ -1804,7 +1801,7 @@ this.dataGridViewX8.ReadOnly = true; this.dataGridViewX8.RowHeadersVisible = false; this.dataGridViewX8.RowTemplate.Height = 23; - this.dataGridViewX8.Size = new System.Drawing.Size(176, 92); + this.dataGridViewX8.Size = new System.Drawing.Size(193, 92); this.dataGridViewX8.TabIndex = 11; // // dataGridViewTextBoxColumn12 @@ -1838,6 +1835,7 @@ // // // + this.labelX11.BackgroundStyle.Class = ""; this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX11.Location = new System.Drawing.Point(10, 93); this.labelX11.Name = "labelX11"; @@ -1898,7 +1896,7 @@ this.dataGridViewX9.ReadOnly = true; this.dataGridViewX9.RowHeadersVisible = false; this.dataGridViewX9.RowTemplate.Height = 23; - this.dataGridViewX9.Size = new System.Drawing.Size(175, 127); + this.dataGridViewX9.Size = new System.Drawing.Size(192, 127); this.dataGridViewX9.TabIndex = 5; this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick); // @@ -1973,6 +1971,7 @@ // // // + this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX15.Location = new System.Drawing.Point(174, 61); this.labelX15.Name = "labelX15"; @@ -2003,6 +2002,7 @@ // // // + this.checkBoxX7.BackgroundStyle.Class = ""; this.checkBoxX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX7.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX7.Location = new System.Drawing.Point(8, 5); @@ -2020,6 +2020,7 @@ // // // + this.checkBoxX8.BackgroundStyle.Class = ""; this.checkBoxX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX8.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX8.Location = new System.Drawing.Point(118, 5); @@ -2037,6 +2038,7 @@ // // // + this.labelX19.BackgroundStyle.Class = ""; this.labelX19.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX19.Location = new System.Drawing.Point(11, 61); this.labelX19.Name = "labelX19"; @@ -2051,6 +2053,7 @@ // // // + this.labelX21.BackgroundStyle.Class = ""; this.labelX21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX21.Location = new System.Drawing.Point(10, 29); this.labelX21.Name = "labelX21"; @@ -2062,6 +2065,7 @@ // // // + this.labelX22.BackgroundStyle.Class = ""; this.labelX22.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX22.Image = ((System.Drawing.Image)(resources.GetObject("labelX22.Image"))); this.labelX22.Location = new System.Drawing.Point(9, 245); @@ -2139,6 +2143,7 @@ // // // + this.labelX28.BackgroundStyle.Class = ""; this.labelX28.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX28.Location = new System.Drawing.Point(181, 104); this.labelX28.Name = "labelX28"; @@ -2154,6 +2159,7 @@ // // // + this.labelX29.BackgroundStyle.Class = ""; this.labelX29.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX29.Location = new System.Drawing.Point(6, 100); this.labelX29.Name = "labelX29"; @@ -2186,6 +2192,7 @@ // // // + this.labelX4.BackgroundStyle.Class = ""; this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Image = ((System.Drawing.Image)(resources.GetObject("labelX4.Image"))); this.labelX4.Location = new System.Drawing.Point(7, 432); @@ -2249,6 +2256,7 @@ // // // + this.labelX5.BackgroundStyle.Class = ""; this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Image = ((System.Drawing.Image)(resources.GetObject("labelX5.Image"))); this.labelX5.Location = new System.Drawing.Point(9, 134); @@ -2383,6 +2391,7 @@ // // // + this.labelX18.BackgroundStyle.Class = ""; this.labelX18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX18.Location = new System.Drawing.Point(181, 71); this.labelX18.Name = "labelX18"; @@ -2413,6 +2422,7 @@ // // // + this.checkBoxSelectPipeline.BackgroundStyle.Class = ""; this.checkBoxSelectPipeline.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectPipeline.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectPipeline.Location = new System.Drawing.Point(8, 9); @@ -2430,6 +2440,7 @@ // // // + this.checkBoxSelectLayer.BackgroundStyle.Class = ""; this.checkBoxSelectLayer.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectLayer.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectLayer.Location = new System.Drawing.Point(117, 9); @@ -2447,6 +2458,7 @@ // // // + this.labelX20.BackgroundStyle.Class = ""; this.labelX20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX20.Location = new System.Drawing.Point(6, 69); this.labelX20.Name = "labelX20"; @@ -2458,6 +2470,7 @@ // // // + this.labelX26.BackgroundStyle.Class = ""; this.labelX26.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX26.Image = ((System.Drawing.Image)(resources.GetObject("labelX26.Image"))); this.labelX26.Location = new System.Drawing.Point(9, 38); @@ -2470,6 +2483,7 @@ // // // + this.labelX27.BackgroundStyle.Class = ""; this.labelX27.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX27.Image = ((System.Drawing.Image)(resources.GetObject("labelX27.Image"))); this.labelX27.Location = new System.Drawing.Point(7, 287); @@ -2482,6 +2496,7 @@ // // // + this.labelX30.BackgroundStyle.Class = ""; this.labelX30.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX30.Location = new System.Drawing.Point(88, 100); this.labelX30.Name = "labelX30"; @@ -2514,6 +2529,7 @@ // // // + this.labelX23.BackgroundStyle.Class = ""; this.labelX23.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX23.Image = ((System.Drawing.Image)(resources.GetObject("labelX23.Image"))); this.labelX23.Location = new System.Drawing.Point(11, 404); @@ -2577,6 +2593,7 @@ // // // + this.labelX2.BackgroundStyle.Class = ""; this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Image = ((System.Drawing.Image)(resources.GetObject("labelX2.Image"))); this.labelX2.Location = new System.Drawing.Point(12, 100); @@ -2703,6 +2720,7 @@ // // // + this.labelX7.BackgroundStyle.Class = ""; this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX7.Location = new System.Drawing.Point(176, 67); this.labelX7.Name = "labelX7"; @@ -2733,6 +2751,7 @@ // // // + this.checkBoxX1.BackgroundStyle.Class = ""; this.checkBoxX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX1.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX1.Location = new System.Drawing.Point(11, 5); @@ -2750,6 +2769,7 @@ // // // + this.checkBoxX2.BackgroundStyle.Class = ""; this.checkBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX2.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX2.Location = new System.Drawing.Point(120, 5); @@ -2767,6 +2787,7 @@ // // // + this.labelX6.BackgroundStyle.Class = ""; this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX6.Location = new System.Drawing.Point(15, 67); this.labelX6.Name = "labelX6"; @@ -2778,6 +2799,7 @@ // // // + this.labelX1.BackgroundStyle.Class = ""; this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Image = ((System.Drawing.Image)(resources.GetObject("labelX1.Image"))); this.labelX1.Location = new System.Drawing.Point(12, 34); @@ -2790,6 +2812,7 @@ // // // + this.labelX3.BackgroundStyle.Class = ""; this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Image = ((System.Drawing.Image)(resources.GetObject("labelX3.Image"))); this.labelX3.Location = new System.Drawing.Point(11, 250); @@ -2800,11 +2823,11 @@ // expandableSplitter1 // this.expandableSplitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -2816,11 +2839,11 @@ this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -2837,7 +2860,6 @@ this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx4.Controls.Add(this.splitContainer1); this.panelEx4.Controls.Add(this.panelOfTable); - this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx4.Location = new System.Drawing.Point(203, 179); this.panelEx4.Name = "panelEx4"; @@ -2878,7 +2900,6 @@ this.panelEx5.Controls.Add(this.panel1); this.panelEx5.Controls.Add(this.panel3); this.panelEx5.Controls.Add(this.panel5); - this.panelEx5.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx5.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx5.Location = new System.Drawing.Point(0, 0); this.panelEx5.Name = "panelEx5"; @@ -2921,7 +2942,6 @@ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.Controls.Add(this.panel2); this.panelEx1.Controls.Add(this.panel4); - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; @@ -2944,7 +2964,6 @@ this.panelOfTable.Controls.Add(this.dataGridViewX1); this.panelOfTable.Controls.Add(this.statusStrip2); this.panelOfTable.Controls.Add(this.expandableSplitter2); - this.panelOfTable.DisabledBackColor = System.Drawing.Color.Empty; this.panelOfTable.Dock = System.Windows.Forms.DockStyle.Bottom; this.panelOfTable.Location = new System.Drawing.Point(0, 414); this.panelOfTable.Name = "panelOfTable"; @@ -3042,12 +3061,12 @@ // expandableSplitter2 // this.expandableSplitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter2.Dock = System.Windows.Forms.DockStyle.Top; this.expandableSplitter2.ExpandableControl = this.panelOfTable; - this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -3059,11 +3078,11 @@ this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -3183,7 +3202,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(149, 290); + this.toolRightMenu.Size = new System.Drawing.Size(153, 312); // // 量算ToolStripMenuItem // @@ -3259,7 +3278,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -4125,8 +4144,6 @@ // superTooltip1 // this.superTooltip1.DefaultFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); - this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.superTooltip1.MinimumTooltipSize = new System.Drawing.Size(150, 50); // // buttonItem16 @@ -4233,12 +4250,13 @@ // // // + this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4255,7 +4273,7 @@ this.ribbonControl1.Location = new System.Drawing.Point(0, 82); this.ribbonControl1.MdiSystemItemVisible = false; this.ribbonControl1.Name = "ribbonControl1"; - this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); this.ribbonControl1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem19}); this.ribbonControl1.Size = new System.Drawing.Size(1328, 97); @@ -4292,21 +4310,23 @@ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel1.Style.Class = ""; this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseDown.Class = ""; this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4315,14 +4335,15 @@ // // // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.BackgroundStyle.Class = ""; this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.ContainerControlProcessDialogKey = true; this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.DragDropSupport = true; this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem87, this.buttonItem88, @@ -4333,20 +4354,21 @@ this.btnlegendSet, this.buttonItem89, this.btnOutputJPG}); - this.ribbonBar21.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 58); + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; // // // + this.ribbonBar21.TitleStyle.Class = ""; this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.TitleVisible = false; // @@ -4436,14 +4458,17 @@ // // // + this.ribbonPanel12.Style.Class = ""; this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseDown.Class = ""; this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseOver.Class = ""; this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel12.TabIndex = 34; this.ribbonPanel12.Visible = false; @@ -4454,18 +4479,18 @@ // // // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.BackgroundStyle.Class = ""; this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.ContainerControlProcessDialogKey = true; this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.DragDropSupport = true; this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem133, this.buttonItem132}); - this.ribbonBar18.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; this.ribbonBar18.Size = new System.Drawing.Size(171, 59); @@ -4474,10 +4499,12 @@ // // // + this.ribbonBar18.TitleStyle.Class = ""; this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.TitleVisible = false; // @@ -4506,14 +4533,15 @@ // // // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.BackgroundStyle.Class = ""; this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.ContainerControlProcessDialogKey = true; this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.DragDropSupport = true; this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem127, this.buttonItem128, @@ -4521,7 +4549,6 @@ this.buttonItem134, this.buttonItem130, this.btn_check_history}); - this.ribbonBar13.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; this.ribbonBar13.Size = new System.Drawing.Size(505, 59); @@ -4530,10 +4557,12 @@ // // // + this.ribbonBar13.TitleStyle.Class = ""; this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.TitleVisible = false; // @@ -4604,14 +4633,17 @@ // // // + this.ribbonPanel5.Style.Class = ""; this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseDown.Class = ""; this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseOver.Class = ""; this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel5.TabIndex = 37; this.ribbonPanel5.Visible = false; @@ -4622,20 +4654,20 @@ // // // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.BackgroundStyle.Class = ""; this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.ContainerControlProcessDialogKey = true; this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.DragDropSupport = true; this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemHX1, this.buttonItemHX2, this.buttonItemDCTP, this.sliderItem3}); - this.ribbonBar2.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; this.ribbonBar2.Size = new System.Drawing.Size(350, 59); @@ -4644,10 +4676,12 @@ // // // + this.ribbonBar2.TitleStyle.Class = ""; this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.TitleVisible = false; // @@ -4701,14 +4735,17 @@ // // // + this.ribbonPanel2.Style.Class = ""; this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseDown.Class = ""; this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; this.ribbonPanel2.Visible = false; @@ -4719,14 +4756,15 @@ // // // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.BackgroundStyle.Class = ""; this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.ContainerControlProcessDialogKey = true; this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.DragDropSupport = true; this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_user_info, this.btn_role_info, @@ -4735,7 +4773,6 @@ this.btn_user_role, this.btn_password_edit, this.buttonItemPasswordReset}); - this.ribbonBar3.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; this.ribbonBar3.Size = new System.Drawing.Size(551, 59); @@ -4744,10 +4781,12 @@ // // // + this.ribbonBar3.TitleStyle.Class = ""; this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.TitleVisible = false; // @@ -4823,20 +4862,24 @@ this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel15.Style.Class = ""; this.ribbonPanel15.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseDown.Class = ""; this.ribbonPanel15.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4844,14 +4887,15 @@ // // // + this.ribbonBar20.BackgroundMouseOverStyle.Class = ""; this.ribbonBar20.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.BackgroundStyle.Class = ""; this.ribbonBar20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.ContainerControlProcessDialogKey = true; this.ribbonBar20.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar20.DragDropSupport = true; this.ribbonBar20.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSH, this.buttonItemSJGL, @@ -4865,19 +4909,20 @@ this.buttonItemBJ, this.buttonItemSearch, this.buttonItemBZ}); - this.ribbonBar20.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(814, 58); + this.ribbonBar20.Size = new System.Drawing.Size(814, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // // // + this.ribbonBar20.TitleStyle.Class = ""; this.ribbonBar20.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.TitleStyleMouseOver.Class = ""; this.ribbonBar20.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.TitleVisible = false; // @@ -5070,18 +5115,21 @@ // this.buttonItem10.Name = "buttonItem10"; this.buttonItem10.Text = "管线入库-高程"; + this.buttonItem10.Visible = false; this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // // buttonItem11 // this.buttonItem11.Name = "buttonItem11"; this.buttonItem11.Text = "附属物入库-高程"; + this.buttonItem11.Visible = false; this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // // buttonItem12 // this.buttonItem12.Name = "buttonItem12"; this.buttonItem12.Text = "特征管点入库-高程"; + this.buttonItem12.Visible = false; this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // // buttonItemSJGL5 @@ -6226,14 +6274,17 @@ // // // + this.ribbonPanel4.Style.Class = ""; this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseDown.Class = ""; this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseOver.Class = ""; this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel4.TabIndex = 36; this.ribbonPanel4.Visible = false; @@ -6244,17 +6295,17 @@ // // // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.BackgroundStyle.Class = ""; this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.ContainerControlProcessDialogKey = true; this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.DragDropSupport = true; this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_document_info}); - this.ribbonBar1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; this.ribbonBar1.Size = new System.Drawing.Size(88, 59); @@ -6263,10 +6314,12 @@ // // // + this.ribbonBar1.TitleStyle.Class = ""; this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.TitleVisible = false; // @@ -6291,14 +6344,17 @@ // // // + this.ribbonPanel6.Style.Class = ""; this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseDown.Class = ""; this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseOver.Class = ""; this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel6.TabIndex = 38; this.ribbonPanel6.Visible = false; @@ -6309,21 +6365,21 @@ // // // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.BackgroundStyle.Class = ""; this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.ContainerControlProcessDialogKey = true; this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.DragDropSupport = true; this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSPSZ, this.buttonItem8, this.buttonItemLocation, this.sliderItem2, this.buttonItemGBJC}); - this.ribbonBar6.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; this.ribbonBar6.Size = new System.Drawing.Size(427, 59); @@ -6332,10 +6388,12 @@ // // // + this.ribbonBar6.TitleStyle.Class = ""; this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.TitleVisible = false; // @@ -6388,6 +6446,7 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6438,7 +6497,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -7045,7 +7103,7 @@ private DevComponents.DotNetBar.LabelX labelX25; private DevComponents.DotNetBar.PanelEx panelEx3; private System.Windows.Forms.TreeView layerSensorTree; - // private System.Windows.Forms.TreeView layerTree; + // private System.Windows.Forms.TreeView layerTree; private MyTreeView layerTree; private DevComponents.DotNetBar.ButtonX buttonX7; private DevComponents.DotNetBar.ButtonX buttonX16; diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config new file mode 100644 index 0000000..f4cbe66 --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe.config @@ -0,0 +1,32 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 4f0593d..fe2b7f8 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -9,30 +9,45 @@ using GeoScene.Data; using GeoScene.Globe; using DevComponents.DotNetBar; +using System.Collections; namespace Cyberpipe { public partial class FrmAllWorkWellStatis : DevComponents.DotNetBar.Office2007Form { - Dictionary workWellLengthAndType = new Dictionary(); - List list = new List(); + + private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; + private Dictionary map = null; DataGridView dataGridViewX1; ToolStripStatusLabel toolStripNumbers; GSOGlobeControl globeControl1; PanelEx panel; - public FrmAllWorkWellStatis(Dictionary wellLen, List _list, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) + //TODOLIST：用晓伟的代理进行操作，功能拆分细化 + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) { InitializeComponent(); panel = p; - workWellLengthAndType = wellLen; - list = _list; dataGridViewX1 = dataGridViewX11; toolStripNumbers = toolStripNumbers1; - globeControl1 = ctl; + map = getAccsMap(polygon); + + } + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, MainFrm.DataGridViewDelegate InitDataGridViewX1, GSOGlobeControl ctl) + { + InitializeComponent(); + globeControl1 = ctl; + m_InitDataGridViewX1 = InitDataGridViewX1; + map = getAccsMap(polygon); + } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) { + drawChart(); + } + + public void drawChart() + { try { // Set axis title @@ -49,6 +64,11 @@ chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; + Dictionary workWellLengthAndType = new Dictionary(); + foreach (KeyValuePair kv in map) + { + workWellLengthAndType.Add(kv.Key, kv.Value.Length); + } chartAllAreaPipeline.Series["井盖"].Points.DataBindXY(workWellLengthAndType.Keys, workWellLengthAndType.Values); for (int m = 0; m < workWellLengthAndType.Values.Count; m++) { @@ -71,11 +91,11 @@ if (indexHit >= 0) { - GSOFeatures fs = list[indexHit]; + //GSOFeatures fs = list[indexHit]; string sql = ""; string pipetype = chartAllAreaPipeline.Series["井盖"].Points[indexHit].AxisLabel; - + GSOFeatures fs = map[pipetype]; string layername = ""; if (pipetype.EndsWith("窖井") || pipetype.EndsWith("表井") || (pipetype.EndsWith("窨井")) || pipetype.EndsWith("孔") || @@ -93,6 +113,23 @@ { return; } + //从图层获取datatable数据,不涉及数据库操作，速度会快一些 + //string [] fieldNames = GSOFeatureUtils.getFields(layername, globeControl1); + //DataTable dt = GSOFeatureUtils.convertGSOFeatures2DataTable(fs,fieldNames); + //if (dt.Rows.Count > 0) + //{ + // dataGridViewX1.DataSource = dt; + // panel.Visible = true; + // toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //} + //else + //{ + // panel.Visible = false; + // dataGridViewX1.DataSource = null; + // dataGridViewX1.Refresh(); + // toolStripNumbers.Text = "类型："; + //} + //数据库获取数据 if (fs.Length > 0) { sql = "select " + getpipeLineFields.getFields(layername, globeControl1) + " from " + layer.Name; @@ -120,8 +157,8 @@ { dataGridViewX1.DataSource = dt; panel.Visible = true; - //toolStripNumbers.Text = " 井盖类型：" + MainFrm.m_CurrentQueryLayer + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + string strLable = toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //m_InitDataGridViewX1(dt, strLable, "", true); } else { @@ -131,7 +168,6 @@ toolStripNumbers.Text = "类型："; } - //} } @@ -174,7 +210,7 @@ } } } - + //m_InitDataGridViewX1(null,"","" , false); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } @@ -183,5 +219,63 @@ PATM_Forms.F_PATMTitle frm = new PATM_Forms.F_PATMTitle("S", chartAllAreaPipeline); frm.Show(); } + + //获取指定layer类型的附属物名称列表 + public string[] getLayerAccNames(string layerType) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(layerType + "管线附属物"); + if (layer == null) return null; + + string sql = "select 附属物名称 from " + layerType + "管线附属物 group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layerType + "管线附属物"); + if (dataset == null) return null; + + int count = dataset.Tables[0].Rows.Count; + + + string[] result = new string[count]; + for (int i = 0; i < count; i++) + { + result[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return result; + } + + /// + /// 获取区域内各图层的井、孔、蓖的map + /// + /// 区域 + /// 要查找的附属物名称数组、如井、孔、蓖 + /// 返回值为：<图层+附属物名称,附属物列表> + + public Dictionary getAccsMap(GSOGeoPolygon3D polygon) + { + //List list = new List(); + Dictionary map = new Dictionary(); + ArrayList listpt = Utility.LayerNamesList; + if (listpt == null || listpt.Count == 0) return null; + FeatureStatisticsService service = new FeatureStatisticsService(); + for (int i = 0; i < listpt.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listpt[i] + "管线附属物"); + string[] accNames = getLayerAccNames(listpt[i] as string); + if (accNames == null || accNames.Length == 0) continue;//排除不合法的值 + for (int j = 0; j < accNames.Length; j++) + { + if (accNames[j].Contains("井") || accNames[j].Contains("孔") || accNames[j].Contains("篦")) + { + + GSOFeatures features = service.Intersect_PointLayerByType(polygon, layer, accNames[j]); + if (features == null) continue; + map.Add(listpt[i] + accNames[j], features); + } + + } + + } + return map; + + } + } } diff --git a/MainFrm.cs b/MainFrm.cs index ac2614d..b584749 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2951,35 +2951,35 @@ break; case "workwellquery": - workWellLen.Clear(); - List listWell = new List(); - //找到所有井 - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //workWellLen.Clear(); + //List listWell = new List(); + ////找到所有井 + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - listWell.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // listWell.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(workWellLen, listWell, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(polygon, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frmWell.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -9740,37 +9740,37 @@ private void buttonItemTJ3_ALL_Click(object sender, EventArgs e) { //日志记录 - LogManager.saveLog(Utility.userName, "井盖数量统计"); + //LogManager.saveLog(Utility.userName, "井盖数量统计"); - workWellLen.Clear(); - List list = new List(); + //workWellLen.Clear(); + //List list = new List(); - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - list.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // list.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(workWellLen, list, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(null, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frm.Show(this); } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ae24fb9..5c2bb7f 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -706,7 +706,6 @@ this.dotNetBarManager1.BottomDockSite = this.dockSite4; this.dotNetBarManager1.EnableFullSizeDock = false; this.dotNetBarManager1.LeftDockSite = this.dockSite1; - this.dotNetBarManager1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.dotNetBarManager1.ParentForm = null; this.dotNetBarManager1.RightDockSite = this.dockSite2; this.dotNetBarManager1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003; @@ -799,7 +798,6 @@ // styleManager1 // this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Office2010Blue; - this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(87)))), ((int)(((byte)(154)))))); // // sideBarPanelItem1 // @@ -848,7 +846,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -894,6 +892,7 @@ this.ribbonTabItemGroup1.Style.BorderRightWidth = 1; this.ribbonTabItemGroup1.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ribbonTabItemGroup1.Style.BorderTopWidth = 1; + this.ribbonTabItemGroup1.Style.Class = ""; this.ribbonTabItemGroup1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonTabItemGroup1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.ribbonTabItemGroup1.Style.TextColor = System.Drawing.Color.White; @@ -906,6 +905,7 @@ // // // + this.galleryContainer2.BackgroundStyle.Class = ""; this.galleryContainer2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer2.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer2.Name = "galleryContainer2"; @@ -915,10 +915,6 @@ this.buttonItem39}); this.galleryContainer2.Text = "断面分析"; // - // - // - this.galleryContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem38 // this.buttonItem38.Name = "buttonItem38"; @@ -939,16 +935,13 @@ // // // + this.galleryContainer3.BackgroundStyle.Class = ""; this.galleryContainer3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer3.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer3.Name = "galleryContainer3"; this.galleryContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem3}); // - // - // - this.galleryContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem3 // this.buttonItem3.Name = "buttonItem3"; @@ -959,6 +952,7 @@ // // // + this.galleryContainer4.BackgroundStyle.Class = ""; this.galleryContainer4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer4.MinimumSize = new System.Drawing.Size(150, 58); this.galleryContainer4.Name = "galleryContainer4"; @@ -970,10 +964,6 @@ this.buttonItem46}); this.galleryContainer4.Text = "断面分析"; // - // - // - this.galleryContainer4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem40 // this.buttonItem40.Name = "buttonItem40"; @@ -1004,6 +994,7 @@ // // // + this.galleryContainer5.BackgroundStyle.Class = ""; this.galleryContainer5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer5.MinimumSize = new System.Drawing.Size(80, 58); this.galleryContainer5.Name = "galleryContainer5"; @@ -1011,10 +1002,6 @@ this.buttonItem44, this.buttonItem43}); // - // - // - this.galleryContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem44 // this.buttonItem44.Name = "buttonItem44"; @@ -1030,16 +1017,13 @@ // // // + this.galleryContainer6.BackgroundStyle.Class = ""; this.galleryContainer6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer6.MinimumSize = new System.Drawing.Size(70, 58); this.galleryContainer6.Name = "galleryContainer6"; this.galleryContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem48}); // - // - // - this.galleryContainer6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem48 // this.buttonItem48.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right; @@ -1073,7 +1057,6 @@ this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx3.Controls.Add(this.layerSensorTree); - this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx3.Location = new System.Drawing.Point(54, 113); this.panelEx3.Name = "panelEx3"; this.panelEx3.Size = new System.Drawing.Size(200, 161); @@ -1188,6 +1171,7 @@ // // // + this.labelX25.BackgroundStyle.Class = ""; this.labelX25.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX25.Location = new System.Drawing.Point(7, 364); this.labelX25.Name = "labelX25"; @@ -1252,6 +1236,7 @@ // // // + this.labelX8.BackgroundStyle.Class = ""; this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX8.Location = new System.Drawing.Point(11, 60); this.labelX8.Name = "labelX8"; @@ -1384,6 +1369,7 @@ // // // + this.checkBoxX3.BackgroundStyle.Class = ""; this.checkBoxX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX3.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX3.Location = new System.Drawing.Point(11, 9); @@ -1401,6 +1387,7 @@ // // // + this.checkBoxX4.BackgroundStyle.Class = ""; this.checkBoxX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX4.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX4.Location = new System.Drawing.Point(110, 9); @@ -1418,6 +1405,7 @@ // // // + this.labelX13.BackgroundStyle.Class = ""; this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX13.Location = new System.Drawing.Point(11, 32); this.labelX13.Name = "labelX13"; @@ -1432,6 +1420,7 @@ // // // + this.labelX14.BackgroundStyle.Class = ""; this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX14.Location = new System.Drawing.Point(10, 204); this.labelX14.Name = "labelX14"; @@ -1509,7 +1498,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(181, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(198, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -1534,6 +1523,7 @@ // // // + this.labelX9.BackgroundStyle.Class = ""; this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX9.Location = new System.Drawing.Point(9, 85); this.labelX9.Name = "labelX9"; @@ -1592,7 +1582,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(180, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(197, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -1635,6 +1625,7 @@ // // // + this.labelX10.BackgroundStyle.Class = ""; this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX10.Location = new System.Drawing.Point(172, 54); this.labelX10.Name = "labelX10"; @@ -1665,6 +1656,7 @@ // // // + this.checkBoxX5.BackgroundStyle.Class = ""; this.checkBoxX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX5.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX5.Location = new System.Drawing.Point(19, 4); @@ -1682,6 +1674,7 @@ // // // + this.checkBoxX6.BackgroundStyle.Class = ""; this.checkBoxX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX6.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX6.Location = new System.Drawing.Point(114, 4); @@ -1699,6 +1692,7 @@ // // // + this.labelX12.BackgroundStyle.Class = ""; this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX12.Location = new System.Drawing.Point(6, 57); this.labelX12.Name = "labelX12"; @@ -1713,6 +1707,7 @@ // // // + this.labelX16.BackgroundStyle.Class = ""; this.labelX16.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX16.Location = new System.Drawing.Point(6, 28); this.labelX16.Name = "labelX16"; @@ -1727,6 +1722,7 @@ // // // + this.labelX17.BackgroundStyle.Class = ""; this.labelX17.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX17.Location = new System.Drawing.Point(8, 235); this.labelX17.Name = "labelX17"; @@ -1772,6 +1768,7 @@ // // // + this.labelX24.BackgroundStyle.Class = ""; this.labelX24.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX24.Image = ((System.Drawing.Image)(resources.GetObject("labelX24.Image"))); this.labelX24.Location = new System.Drawing.Point(7, 403); @@ -1804,7 +1801,7 @@ this.dataGridViewX8.ReadOnly = true; this.dataGridViewX8.RowHeadersVisible = false; this.dataGridViewX8.RowTemplate.Height = 23; - this.dataGridViewX8.Size = new System.Drawing.Size(176, 92); + this.dataGridViewX8.Size = new System.Drawing.Size(193, 92); this.dataGridViewX8.TabIndex = 11; // // dataGridViewTextBoxColumn12 @@ -1838,6 +1835,7 @@ // // // + this.labelX11.BackgroundStyle.Class = ""; this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX11.Location = new System.Drawing.Point(10, 93); this.labelX11.Name = "labelX11"; @@ -1898,7 +1896,7 @@ this.dataGridViewX9.ReadOnly = true; this.dataGridViewX9.RowHeadersVisible = false; this.dataGridViewX9.RowTemplate.Height = 23; - this.dataGridViewX9.Size = new System.Drawing.Size(175, 127); + this.dataGridViewX9.Size = new System.Drawing.Size(192, 127); this.dataGridViewX9.TabIndex = 5; this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick); // @@ -1973,6 +1971,7 @@ // // // + this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX15.Location = new System.Drawing.Point(174, 61); this.labelX15.Name = "labelX15"; @@ -2003,6 +2002,7 @@ // // // + this.checkBoxX7.BackgroundStyle.Class = ""; this.checkBoxX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX7.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX7.Location = new System.Drawing.Point(8, 5); @@ -2020,6 +2020,7 @@ // // // + this.checkBoxX8.BackgroundStyle.Class = ""; this.checkBoxX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX8.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX8.Location = new System.Drawing.Point(118, 5); @@ -2037,6 +2038,7 @@ // // // + this.labelX19.BackgroundStyle.Class = ""; this.labelX19.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX19.Location = new System.Drawing.Point(11, 61); this.labelX19.Name = "labelX19"; @@ -2051,6 +2053,7 @@ // // // + this.labelX21.BackgroundStyle.Class = ""; this.labelX21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX21.Location = new System.Drawing.Point(10, 29); this.labelX21.Name = "labelX21"; @@ -2062,6 +2065,7 @@ // // // + this.labelX22.BackgroundStyle.Class = ""; this.labelX22.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX22.Image = ((System.Drawing.Image)(resources.GetObject("labelX22.Image"))); this.labelX22.Location = new System.Drawing.Point(9, 245); @@ -2139,6 +2143,7 @@ // // // + this.labelX28.BackgroundStyle.Class = ""; this.labelX28.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX28.Location = new System.Drawing.Point(181, 104); this.labelX28.Name = "labelX28"; @@ -2154,6 +2159,7 @@ // // // + this.labelX29.BackgroundStyle.Class = ""; this.labelX29.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX29.Location = new System.Drawing.Point(6, 100); this.labelX29.Name = "labelX29"; @@ -2186,6 +2192,7 @@ // // // + this.labelX4.BackgroundStyle.Class = ""; this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Image = ((System.Drawing.Image)(resources.GetObject("labelX4.Image"))); this.labelX4.Location = new System.Drawing.Point(7, 432); @@ -2249,6 +2256,7 @@ // // // + this.labelX5.BackgroundStyle.Class = ""; this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Image = ((System.Drawing.Image)(resources.GetObject("labelX5.Image"))); this.labelX5.Location = new System.Drawing.Point(9, 134); @@ -2383,6 +2391,7 @@ // // // + this.labelX18.BackgroundStyle.Class = ""; this.labelX18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX18.Location = new System.Drawing.Point(181, 71); this.labelX18.Name = "labelX18"; @@ -2413,6 +2422,7 @@ // // // + this.checkBoxSelectPipeline.BackgroundStyle.Class = ""; this.checkBoxSelectPipeline.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectPipeline.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectPipeline.Location = new System.Drawing.Point(8, 9); @@ -2430,6 +2440,7 @@ // // // + this.checkBoxSelectLayer.BackgroundStyle.Class = ""; this.checkBoxSelectLayer.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectLayer.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectLayer.Location = new System.Drawing.Point(117, 9); @@ -2447,6 +2458,7 @@ // // // + this.labelX20.BackgroundStyle.Class = ""; this.labelX20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX20.Location = new System.Drawing.Point(6, 69); this.labelX20.Name = "labelX20"; @@ -2458,6 +2470,7 @@ // // // + this.labelX26.BackgroundStyle.Class = ""; this.labelX26.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX26.Image = ((System.Drawing.Image)(resources.GetObject("labelX26.Image"))); this.labelX26.Location = new System.Drawing.Point(9, 38); @@ -2470,6 +2483,7 @@ // // // + this.labelX27.BackgroundStyle.Class = ""; this.labelX27.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX27.Image = ((System.Drawing.Image)(resources.GetObject("labelX27.Image"))); this.labelX27.Location = new System.Drawing.Point(7, 287); @@ -2482,6 +2496,7 @@ // // // + this.labelX30.BackgroundStyle.Class = ""; this.labelX30.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX30.Location = new System.Drawing.Point(88, 100); this.labelX30.Name = "labelX30"; @@ -2514,6 +2529,7 @@ // // // + this.labelX23.BackgroundStyle.Class = ""; this.labelX23.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX23.Image = ((System.Drawing.Image)(resources.GetObject("labelX23.Image"))); this.labelX23.Location = new System.Drawing.Point(11, 404); @@ -2577,6 +2593,7 @@ // // // + this.labelX2.BackgroundStyle.Class = ""; this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Image = ((System.Drawing.Image)(resources.GetObject("labelX2.Image"))); this.labelX2.Location = new System.Drawing.Point(12, 100); @@ -2703,6 +2720,7 @@ // // // + this.labelX7.BackgroundStyle.Class = ""; this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX7.Location = new System.Drawing.Point(176, 67); this.labelX7.Name = "labelX7"; @@ -2733,6 +2751,7 @@ // // // + this.checkBoxX1.BackgroundStyle.Class = ""; this.checkBoxX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX1.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX1.Location = new System.Drawing.Point(11, 5); @@ -2750,6 +2769,7 @@ // // // + this.checkBoxX2.BackgroundStyle.Class = ""; this.checkBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX2.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX2.Location = new System.Drawing.Point(120, 5); @@ -2767,6 +2787,7 @@ // // // + this.labelX6.BackgroundStyle.Class = ""; this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX6.Location = new System.Drawing.Point(15, 67); this.labelX6.Name = "labelX6"; @@ -2778,6 +2799,7 @@ // // // + this.labelX1.BackgroundStyle.Class = ""; this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Image = ((System.Drawing.Image)(resources.GetObject("labelX1.Image"))); this.labelX1.Location = new System.Drawing.Point(12, 34); @@ -2790,6 +2812,7 @@ // // // + this.labelX3.BackgroundStyle.Class = ""; this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Image = ((System.Drawing.Image)(resources.GetObject("labelX3.Image"))); this.labelX3.Location = new System.Drawing.Point(11, 250); @@ -2800,11 +2823,11 @@ // expandableSplitter1 // this.expandableSplitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -2816,11 +2839,11 @@ this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -2837,7 +2860,6 @@ this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx4.Controls.Add(this.splitContainer1); this.panelEx4.Controls.Add(this.panelOfTable); - this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx4.Location = new System.Drawing.Point(203, 179); this.panelEx4.Name = "panelEx4"; @@ -2878,7 +2900,6 @@ this.panelEx5.Controls.Add(this.panel1); this.panelEx5.Controls.Add(this.panel3); this.panelEx5.Controls.Add(this.panel5); - this.panelEx5.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx5.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx5.Location = new System.Drawing.Point(0, 0); this.panelEx5.Name = "panelEx5"; @@ -2921,7 +2942,6 @@ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.Controls.Add(this.panel2); this.panelEx1.Controls.Add(this.panel4); - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; @@ -2944,7 +2964,6 @@ this.panelOfTable.Controls.Add(this.dataGridViewX1); this.panelOfTable.Controls.Add(this.statusStrip2); this.panelOfTable.Controls.Add(this.expandableSplitter2); - this.panelOfTable.DisabledBackColor = System.Drawing.Color.Empty; this.panelOfTable.Dock = System.Windows.Forms.DockStyle.Bottom; this.panelOfTable.Location = new System.Drawing.Point(0, 414); this.panelOfTable.Name = "panelOfTable"; @@ -3042,12 +3061,12 @@ // expandableSplitter2 // this.expandableSplitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter2.Dock = System.Windows.Forms.DockStyle.Top; this.expandableSplitter2.ExpandableControl = this.panelOfTable; - this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -3059,11 +3078,11 @@ this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -3183,7 +3202,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(149, 290); + this.toolRightMenu.Size = new System.Drawing.Size(153, 312); // // 量算ToolStripMenuItem // @@ -3259,7 +3278,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -4125,8 +4144,6 @@ // superTooltip1 // this.superTooltip1.DefaultFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); - this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.superTooltip1.MinimumTooltipSize = new System.Drawing.Size(150, 50); // // buttonItem16 @@ -4233,12 +4250,13 @@ // // // + this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4255,7 +4273,7 @@ this.ribbonControl1.Location = new System.Drawing.Point(0, 82); this.ribbonControl1.MdiSystemItemVisible = false; this.ribbonControl1.Name = "ribbonControl1"; - this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); this.ribbonControl1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem19}); this.ribbonControl1.Size = new System.Drawing.Size(1328, 97); @@ -4292,21 +4310,23 @@ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel1.Style.Class = ""; this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseDown.Class = ""; this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4315,14 +4335,15 @@ // // // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.BackgroundStyle.Class = ""; this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.ContainerControlProcessDialogKey = true; this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.DragDropSupport = true; this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem87, this.buttonItem88, @@ -4333,20 +4354,21 @@ this.btnlegendSet, this.buttonItem89, this.btnOutputJPG}); - this.ribbonBar21.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 58); + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; // // // + this.ribbonBar21.TitleStyle.Class = ""; this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.TitleVisible = false; // @@ -4436,14 +4458,17 @@ // // // + this.ribbonPanel12.Style.Class = ""; this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseDown.Class = ""; this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseOver.Class = ""; this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel12.TabIndex = 34; this.ribbonPanel12.Visible = false; @@ -4454,18 +4479,18 @@ // // // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.BackgroundStyle.Class = ""; this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.ContainerControlProcessDialogKey = true; this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.DragDropSupport = true; this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem133, this.buttonItem132}); - this.ribbonBar18.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; this.ribbonBar18.Size = new System.Drawing.Size(171, 59); @@ -4474,10 +4499,12 @@ // // // + this.ribbonBar18.TitleStyle.Class = ""; this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.TitleVisible = false; // @@ -4506,14 +4533,15 @@ // // // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.BackgroundStyle.Class = ""; this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.ContainerControlProcessDialogKey = true; this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.DragDropSupport = true; this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem127, this.buttonItem128, @@ -4521,7 +4549,6 @@ this.buttonItem134, this.buttonItem130, this.btn_check_history}); - this.ribbonBar13.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; this.ribbonBar13.Size = new System.Drawing.Size(505, 59); @@ -4530,10 +4557,12 @@ // // // + this.ribbonBar13.TitleStyle.Class = ""; this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.TitleVisible = false; // @@ -4604,14 +4633,17 @@ // // // + this.ribbonPanel5.Style.Class = ""; this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseDown.Class = ""; this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseOver.Class = ""; this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel5.TabIndex = 37; this.ribbonPanel5.Visible = false; @@ -4622,20 +4654,20 @@ // // // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.BackgroundStyle.Class = ""; this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.ContainerControlProcessDialogKey = true; this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.DragDropSupport = true; this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemHX1, this.buttonItemHX2, this.buttonItemDCTP, this.sliderItem3}); - this.ribbonBar2.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; this.ribbonBar2.Size = new System.Drawing.Size(350, 59); @@ -4644,10 +4676,12 @@ // // // + this.ribbonBar2.TitleStyle.Class = ""; this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.TitleVisible = false; // @@ -4701,14 +4735,17 @@ // // // + this.ribbonPanel2.Style.Class = ""; this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseDown.Class = ""; this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; this.ribbonPanel2.Visible = false; @@ -4719,14 +4756,15 @@ // // // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.BackgroundStyle.Class = ""; this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.ContainerControlProcessDialogKey = true; this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.DragDropSupport = true; this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_user_info, this.btn_role_info, @@ -4735,7 +4773,6 @@ this.btn_user_role, this.btn_password_edit, this.buttonItemPasswordReset}); - this.ribbonBar3.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; this.ribbonBar3.Size = new System.Drawing.Size(551, 59); @@ -4744,10 +4781,12 @@ // // // + this.ribbonBar3.TitleStyle.Class = ""; this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.TitleVisible = false; // @@ -4823,20 +4862,24 @@ this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel15.Style.Class = ""; this.ribbonPanel15.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseDown.Class = ""; this.ribbonPanel15.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4844,14 +4887,15 @@ // // // + this.ribbonBar20.BackgroundMouseOverStyle.Class = ""; this.ribbonBar20.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.BackgroundStyle.Class = ""; this.ribbonBar20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.ContainerControlProcessDialogKey = true; this.ribbonBar20.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar20.DragDropSupport = true; this.ribbonBar20.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSH, this.buttonItemSJGL, @@ -4865,19 +4909,20 @@ this.buttonItemBJ, this.buttonItemSearch, this.buttonItemBZ}); - this.ribbonBar20.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(814, 58); + this.ribbonBar20.Size = new System.Drawing.Size(814, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // // // + this.ribbonBar20.TitleStyle.Class = ""; this.ribbonBar20.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.TitleStyleMouseOver.Class = ""; this.ribbonBar20.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.TitleVisible = false; // @@ -5070,18 +5115,21 @@ // this.buttonItem10.Name = "buttonItem10"; this.buttonItem10.Text = "管线入库-高程"; + this.buttonItem10.Visible = false; this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // // buttonItem11 // this.buttonItem11.Name = "buttonItem11"; this.buttonItem11.Text = "附属物入库-高程"; + this.buttonItem11.Visible = false; this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // // buttonItem12 // this.buttonItem12.Name = "buttonItem12"; this.buttonItem12.Text = "特征管点入库-高程"; + this.buttonItem12.Visible = false; this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // // buttonItemSJGL5 @@ -6226,14 +6274,17 @@ // // // + this.ribbonPanel4.Style.Class = ""; this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseDown.Class = ""; this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseOver.Class = ""; this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel4.TabIndex = 36; this.ribbonPanel4.Visible = false; @@ -6244,17 +6295,17 @@ // // // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.BackgroundStyle.Class = ""; this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.ContainerControlProcessDialogKey = true; this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.DragDropSupport = true; this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_document_info}); - this.ribbonBar1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; this.ribbonBar1.Size = new System.Drawing.Size(88, 59); @@ -6263,10 +6314,12 @@ // // // + this.ribbonBar1.TitleStyle.Class = ""; this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.TitleVisible = false; // @@ -6291,14 +6344,17 @@ // // // + this.ribbonPanel6.Style.Class = ""; this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseDown.Class = ""; this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseOver.Class = ""; this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel6.TabIndex = 38; this.ribbonPanel6.Visible = false; @@ -6309,21 +6365,21 @@ // // // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.BackgroundStyle.Class = ""; this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.ContainerControlProcessDialogKey = true; this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.DragDropSupport = true; this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSPSZ, this.buttonItem8, this.buttonItemLocation, this.sliderItem2, this.buttonItemGBJC}); - this.ribbonBar6.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; this.ribbonBar6.Size = new System.Drawing.Size(427, 59); @@ -6332,10 +6388,12 @@ // // // + this.ribbonBar6.TitleStyle.Class = ""; this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.TitleVisible = false; // @@ -6388,6 +6446,7 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6438,7 +6497,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -7045,7 +7103,7 @@ private DevComponents.DotNetBar.LabelX labelX25; private DevComponents.DotNetBar.PanelEx panelEx3; private System.Windows.Forms.TreeView layerSensorTree; - // private System.Windows.Forms.TreeView layerTree; + // private System.Windows.Forms.TreeView layerTree; private MyTreeView layerTree; private DevComponents.DotNetBar.ButtonX buttonX7; private DevComponents.DotNetBar.ButtonX buttonX16; diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config new file mode 100644 index 0000000..f4cbe66 --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe.config @@ -0,0 +1,32 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb index c7cb8c3..c0fad4a 100644 --- a/bin/x86/Debug/Cyberpipe.pdb +++ b/bin/x86/Debug/Cyberpipe.pdb Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 4f0593d..fe2b7f8 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -9,30 +9,45 @@ using GeoScene.Data; using GeoScene.Globe; using DevComponents.DotNetBar; +using System.Collections; namespace Cyberpipe { public partial class FrmAllWorkWellStatis : DevComponents.DotNetBar.Office2007Form { - Dictionary workWellLengthAndType = new Dictionary(); - List list = new List(); + + private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; + private Dictionary map = null; DataGridView dataGridViewX1; ToolStripStatusLabel toolStripNumbers; GSOGlobeControl globeControl1; PanelEx panel; - public FrmAllWorkWellStatis(Dictionary wellLen, List _list, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) + //TODOLIST：用晓伟的代理进行操作，功能拆分细化 + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) { InitializeComponent(); panel = p; - workWellLengthAndType = wellLen; - list = _list; dataGridViewX1 = dataGridViewX11; toolStripNumbers = toolStripNumbers1; - globeControl1 = ctl; + map = getAccsMap(polygon); + + } + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, MainFrm.DataGridViewDelegate InitDataGridViewX1, GSOGlobeControl ctl) + { + InitializeComponent(); + globeControl1 = ctl; + m_InitDataGridViewX1 = InitDataGridViewX1; + map = getAccsMap(polygon); + } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) { + drawChart(); + } + + public void drawChart() + { try { // Set axis title @@ -49,6 +64,11 @@ chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; + Dictionary workWellLengthAndType = new Dictionary(); + foreach (KeyValuePair kv in map) + { + workWellLengthAndType.Add(kv.Key, kv.Value.Length); + } chartAllAreaPipeline.Series["井盖"].Points.DataBindXY(workWellLengthAndType.Keys, workWellLengthAndType.Values); for (int m = 0; m < workWellLengthAndType.Values.Count; m++) { @@ -71,11 +91,11 @@ if (indexHit >= 0) { - GSOFeatures fs = list[indexHit]; + //GSOFeatures fs = list[indexHit]; string sql = ""; string pipetype = chartAllAreaPipeline.Series["井盖"].Points[indexHit].AxisLabel; - + GSOFeatures fs = map[pipetype]; string layername = ""; if (pipetype.EndsWith("窖井") || pipetype.EndsWith("表井") || (pipetype.EndsWith("窨井")) || pipetype.EndsWith("孔") || @@ -93,6 +113,23 @@ { return; } + //从图层获取datatable数据,不涉及数据库操作，速度会快一些 + //string [] fieldNames = GSOFeatureUtils.getFields(layername, globeControl1); + //DataTable dt = GSOFeatureUtils.convertGSOFeatures2DataTable(fs,fieldNames); + //if (dt.Rows.Count > 0) + //{ + // dataGridViewX1.DataSource = dt; + // panel.Visible = true; + // toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //} + //else + //{ + // panel.Visible = false; + // dataGridViewX1.DataSource = null; + // dataGridViewX1.Refresh(); + // toolStripNumbers.Text = "类型："; + //} + //数据库获取数据 if (fs.Length > 0) { sql = "select " + getpipeLineFields.getFields(layername, globeControl1) + " from " + layer.Name; @@ -120,8 +157,8 @@ { dataGridViewX1.DataSource = dt; panel.Visible = true; - //toolStripNumbers.Text = " 井盖类型：" + MainFrm.m_CurrentQueryLayer + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + string strLable = toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //m_InitDataGridViewX1(dt, strLable, "", true); } else { @@ -131,7 +168,6 @@ toolStripNumbers.Text = "类型："; } - //} } @@ -174,7 +210,7 @@ } } } - + //m_InitDataGridViewX1(null,"","" , false); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } @@ -183,5 +219,63 @@ PATM_Forms.F_PATMTitle frm = new PATM_Forms.F_PATMTitle("S", chartAllAreaPipeline); frm.Show(); } + + //获取指定layer类型的附属物名称列表 + public string[] getLayerAccNames(string layerType) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(layerType + "管线附属物"); + if (layer == null) return null; + + string sql = "select 附属物名称 from " + layerType + "管线附属物 group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layerType + "管线附属物"); + if (dataset == null) return null; + + int count = dataset.Tables[0].Rows.Count; + + + string[] result = new string[count]; + for (int i = 0; i < count; i++) + { + result[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return result; + } + + /// + /// 获取区域内各图层的井、孔、蓖的map + /// + /// 区域 + /// 要查找的附属物名称数组、如井、孔、蓖 + /// 返回值为：<图层+附属物名称,附属物列表> + + public Dictionary getAccsMap(GSOGeoPolygon3D polygon) + { + //List list = new List(); + Dictionary map = new Dictionary(); + ArrayList listpt = Utility.LayerNamesList; + if (listpt == null || listpt.Count == 0) return null; + FeatureStatisticsService service = new FeatureStatisticsService(); + for (int i = 0; i < listpt.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listpt[i] + "管线附属物"); + string[] accNames = getLayerAccNames(listpt[i] as string); + if (accNames == null || accNames.Length == 0) continue;//排除不合法的值 + for (int j = 0; j < accNames.Length; j++) + { + if (accNames[j].Contains("井") || accNames[j].Contains("孔") || accNames[j].Contains("篦")) + { + + GSOFeatures features = service.Intersect_PointLayerByType(polygon, layer, accNames[j]); + if (features == null) continue; + map.Add(listpt[i] + accNames[j], features); + } + + } + + } + return map; + + } + } } diff --git a/MainFrm.cs b/MainFrm.cs index ac2614d..b584749 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2951,35 +2951,35 @@ break; case "workwellquery": - workWellLen.Clear(); - List listWell = new List(); - //找到所有井 - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //workWellLen.Clear(); + //List listWell = new List(); + ////找到所有井 + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - listWell.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // listWell.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(workWellLen, listWell, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(polygon, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frmWell.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -9740,37 +9740,37 @@ private void buttonItemTJ3_ALL_Click(object sender, EventArgs e) { //日志记录 - LogManager.saveLog(Utility.userName, "井盖数量统计"); + //LogManager.saveLog(Utility.userName, "井盖数量统计"); - workWellLen.Clear(); - List list = new List(); + //workWellLen.Clear(); + //List list = new List(); - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - list.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // list.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(workWellLen, list, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(null, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frm.Show(this); } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ae24fb9..5c2bb7f 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -706,7 +706,6 @@ this.dotNetBarManager1.BottomDockSite = this.dockSite4; this.dotNetBarManager1.EnableFullSizeDock = false; this.dotNetBarManager1.LeftDockSite = this.dockSite1; - this.dotNetBarManager1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.dotNetBarManager1.ParentForm = null; this.dotNetBarManager1.RightDockSite = this.dockSite2; this.dotNetBarManager1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003; @@ -799,7 +798,6 @@ // styleManager1 // this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Office2010Blue; - this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(87)))), ((int)(((byte)(154)))))); // // sideBarPanelItem1 // @@ -848,7 +846,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -894,6 +892,7 @@ this.ribbonTabItemGroup1.Style.BorderRightWidth = 1; this.ribbonTabItemGroup1.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ribbonTabItemGroup1.Style.BorderTopWidth = 1; + this.ribbonTabItemGroup1.Style.Class = ""; this.ribbonTabItemGroup1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonTabItemGroup1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.ribbonTabItemGroup1.Style.TextColor = System.Drawing.Color.White; @@ -906,6 +905,7 @@ // // // + this.galleryContainer2.BackgroundStyle.Class = ""; this.galleryContainer2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer2.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer2.Name = "galleryContainer2"; @@ -915,10 +915,6 @@ this.buttonItem39}); this.galleryContainer2.Text = "断面分析"; // - // - // - this.galleryContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem38 // this.buttonItem38.Name = "buttonItem38"; @@ -939,16 +935,13 @@ // // // + this.galleryContainer3.BackgroundStyle.Class = ""; this.galleryContainer3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer3.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer3.Name = "galleryContainer3"; this.galleryContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem3}); // - // - // - this.galleryContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem3 // this.buttonItem3.Name = "buttonItem3"; @@ -959,6 +952,7 @@ // // // + this.galleryContainer4.BackgroundStyle.Class = ""; this.galleryContainer4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer4.MinimumSize = new System.Drawing.Size(150, 58); this.galleryContainer4.Name = "galleryContainer4"; @@ -970,10 +964,6 @@ this.buttonItem46}); this.galleryContainer4.Text = "断面分析"; // - // - // - this.galleryContainer4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem40 // this.buttonItem40.Name = "buttonItem40"; @@ -1004,6 +994,7 @@ // // // + this.galleryContainer5.BackgroundStyle.Class = ""; this.galleryContainer5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer5.MinimumSize = new System.Drawing.Size(80, 58); this.galleryContainer5.Name = "galleryContainer5"; @@ -1011,10 +1002,6 @@ this.buttonItem44, this.buttonItem43}); // - // - // - this.galleryContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem44 // this.buttonItem44.Name = "buttonItem44"; @@ -1030,16 +1017,13 @@ // // // + this.galleryContainer6.BackgroundStyle.Class = ""; this.galleryContainer6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer6.MinimumSize = new System.Drawing.Size(70, 58); this.galleryContainer6.Name = "galleryContainer6"; this.galleryContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem48}); // - // - // - this.galleryContainer6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem48 // this.buttonItem48.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right; @@ -1073,7 +1057,6 @@ this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx3.Controls.Add(this.layerSensorTree); - this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx3.Location = new System.Drawing.Point(54, 113); this.panelEx3.Name = "panelEx3"; this.panelEx3.Size = new System.Drawing.Size(200, 161); @@ -1188,6 +1171,7 @@ // // // + this.labelX25.BackgroundStyle.Class = ""; this.labelX25.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX25.Location = new System.Drawing.Point(7, 364); this.labelX25.Name = "labelX25"; @@ -1252,6 +1236,7 @@ // // // + this.labelX8.BackgroundStyle.Class = ""; this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX8.Location = new System.Drawing.Point(11, 60); this.labelX8.Name = "labelX8"; @@ -1384,6 +1369,7 @@ // // // + this.checkBoxX3.BackgroundStyle.Class = ""; this.checkBoxX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX3.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX3.Location = new System.Drawing.Point(11, 9); @@ -1401,6 +1387,7 @@ // // // + this.checkBoxX4.BackgroundStyle.Class = ""; this.checkBoxX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX4.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX4.Location = new System.Drawing.Point(110, 9); @@ -1418,6 +1405,7 @@ // // // + this.labelX13.BackgroundStyle.Class = ""; this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX13.Location = new System.Drawing.Point(11, 32); this.labelX13.Name = "labelX13"; @@ -1432,6 +1420,7 @@ // // // + this.labelX14.BackgroundStyle.Class = ""; this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX14.Location = new System.Drawing.Point(10, 204); this.labelX14.Name = "labelX14"; @@ -1509,7 +1498,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(181, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(198, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -1534,6 +1523,7 @@ // // // + this.labelX9.BackgroundStyle.Class = ""; this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX9.Location = new System.Drawing.Point(9, 85); this.labelX9.Name = "labelX9"; @@ -1592,7 +1582,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(180, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(197, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -1635,6 +1625,7 @@ // // // + this.labelX10.BackgroundStyle.Class = ""; this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX10.Location = new System.Drawing.Point(172, 54); this.labelX10.Name = "labelX10"; @@ -1665,6 +1656,7 @@ // // // + this.checkBoxX5.BackgroundStyle.Class = ""; this.checkBoxX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX5.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX5.Location = new System.Drawing.Point(19, 4); @@ -1682,6 +1674,7 @@ // // // + this.checkBoxX6.BackgroundStyle.Class = ""; this.checkBoxX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX6.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX6.Location = new System.Drawing.Point(114, 4); @@ -1699,6 +1692,7 @@ // // // + this.labelX12.BackgroundStyle.Class = ""; this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX12.Location = new System.Drawing.Point(6, 57); this.labelX12.Name = "labelX12"; @@ -1713,6 +1707,7 @@ // // // + this.labelX16.BackgroundStyle.Class = ""; this.labelX16.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX16.Location = new System.Drawing.Point(6, 28); this.labelX16.Name = "labelX16"; @@ -1727,6 +1722,7 @@ // // // + this.labelX17.BackgroundStyle.Class = ""; this.labelX17.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX17.Location = new System.Drawing.Point(8, 235); this.labelX17.Name = "labelX17"; @@ -1772,6 +1768,7 @@ // // // + this.labelX24.BackgroundStyle.Class = ""; this.labelX24.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX24.Image = ((System.Drawing.Image)(resources.GetObject("labelX24.Image"))); this.labelX24.Location = new System.Drawing.Point(7, 403); @@ -1804,7 +1801,7 @@ this.dataGridViewX8.ReadOnly = true; this.dataGridViewX8.RowHeadersVisible = false; this.dataGridViewX8.RowTemplate.Height = 23; - this.dataGridViewX8.Size = new System.Drawing.Size(176, 92); + this.dataGridViewX8.Size = new System.Drawing.Size(193, 92); this.dataGridViewX8.TabIndex = 11; // // dataGridViewTextBoxColumn12 @@ -1838,6 +1835,7 @@ // // // + this.labelX11.BackgroundStyle.Class = ""; this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX11.Location = new System.Drawing.Point(10, 93); this.labelX11.Name = "labelX11"; @@ -1898,7 +1896,7 @@ this.dataGridViewX9.ReadOnly = true; this.dataGridViewX9.RowHeadersVisible = false; this.dataGridViewX9.RowTemplate.Height = 23; - this.dataGridViewX9.Size = new System.Drawing.Size(175, 127); + this.dataGridViewX9.Size = new System.Drawing.Size(192, 127); this.dataGridViewX9.TabIndex = 5; this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick); // @@ -1973,6 +1971,7 @@ // // // + this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX15.Location = new System.Drawing.Point(174, 61); this.labelX15.Name = "labelX15"; @@ -2003,6 +2002,7 @@ // // // + this.checkBoxX7.BackgroundStyle.Class = ""; this.checkBoxX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX7.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX7.Location = new System.Drawing.Point(8, 5); @@ -2020,6 +2020,7 @@ // // // + this.checkBoxX8.BackgroundStyle.Class = ""; this.checkBoxX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX8.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX8.Location = new System.Drawing.Point(118, 5); @@ -2037,6 +2038,7 @@ // // // + this.labelX19.BackgroundStyle.Class = ""; this.labelX19.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX19.Location = new System.Drawing.Point(11, 61); this.labelX19.Name = "labelX19"; @@ -2051,6 +2053,7 @@ // // // + this.labelX21.BackgroundStyle.Class = ""; this.labelX21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX21.Location = new System.Drawing.Point(10, 29); this.labelX21.Name = "labelX21"; @@ -2062,6 +2065,7 @@ // // // + this.labelX22.BackgroundStyle.Class = ""; this.labelX22.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX22.Image = ((System.Drawing.Image)(resources.GetObject("labelX22.Image"))); this.labelX22.Location = new System.Drawing.Point(9, 245); @@ -2139,6 +2143,7 @@ // // // + this.labelX28.BackgroundStyle.Class = ""; this.labelX28.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX28.Location = new System.Drawing.Point(181, 104); this.labelX28.Name = "labelX28"; @@ -2154,6 +2159,7 @@ // // // + this.labelX29.BackgroundStyle.Class = ""; this.labelX29.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX29.Location = new System.Drawing.Point(6, 100); this.labelX29.Name = "labelX29"; @@ -2186,6 +2192,7 @@ // // // + this.labelX4.BackgroundStyle.Class = ""; this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Image = ((System.Drawing.Image)(resources.GetObject("labelX4.Image"))); this.labelX4.Location = new System.Drawing.Point(7, 432); @@ -2249,6 +2256,7 @@ // // // + this.labelX5.BackgroundStyle.Class = ""; this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Image = ((System.Drawing.Image)(resources.GetObject("labelX5.Image"))); this.labelX5.Location = new System.Drawing.Point(9, 134); @@ -2383,6 +2391,7 @@ // // // + this.labelX18.BackgroundStyle.Class = ""; this.labelX18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX18.Location = new System.Drawing.Point(181, 71); this.labelX18.Name = "labelX18"; @@ -2413,6 +2422,7 @@ // // // + this.checkBoxSelectPipeline.BackgroundStyle.Class = ""; this.checkBoxSelectPipeline.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectPipeline.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectPipeline.Location = new System.Drawing.Point(8, 9); @@ -2430,6 +2440,7 @@ // // // + this.checkBoxSelectLayer.BackgroundStyle.Class = ""; this.checkBoxSelectLayer.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectLayer.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectLayer.Location = new System.Drawing.Point(117, 9); @@ -2447,6 +2458,7 @@ // // // + this.labelX20.BackgroundStyle.Class = ""; this.labelX20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX20.Location = new System.Drawing.Point(6, 69); this.labelX20.Name = "labelX20"; @@ -2458,6 +2470,7 @@ // // // + this.labelX26.BackgroundStyle.Class = ""; this.labelX26.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX26.Image = ((System.Drawing.Image)(resources.GetObject("labelX26.Image"))); this.labelX26.Location = new System.Drawing.Point(9, 38); @@ -2470,6 +2483,7 @@ // // // + this.labelX27.BackgroundStyle.Class = ""; this.labelX27.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX27.Image = ((System.Drawing.Image)(resources.GetObject("labelX27.Image"))); this.labelX27.Location = new System.Drawing.Point(7, 287); @@ -2482,6 +2496,7 @@ // // // + this.labelX30.BackgroundStyle.Class = ""; this.labelX30.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX30.Location = new System.Drawing.Point(88, 100); this.labelX30.Name = "labelX30"; @@ -2514,6 +2529,7 @@ // // // + this.labelX23.BackgroundStyle.Class = ""; this.labelX23.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX23.Image = ((System.Drawing.Image)(resources.GetObject("labelX23.Image"))); this.labelX23.Location = new System.Drawing.Point(11, 404); @@ -2577,6 +2593,7 @@ // // // + this.labelX2.BackgroundStyle.Class = ""; this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Image = ((System.Drawing.Image)(resources.GetObject("labelX2.Image"))); this.labelX2.Location = new System.Drawing.Point(12, 100); @@ -2703,6 +2720,7 @@ // // // + this.labelX7.BackgroundStyle.Class = ""; this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX7.Location = new System.Drawing.Point(176, 67); this.labelX7.Name = "labelX7"; @@ -2733,6 +2751,7 @@ // // // + this.checkBoxX1.BackgroundStyle.Class = ""; this.checkBoxX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX1.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX1.Location = new System.Drawing.Point(11, 5); @@ -2750,6 +2769,7 @@ // // // + this.checkBoxX2.BackgroundStyle.Class = ""; this.checkBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX2.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX2.Location = new System.Drawing.Point(120, 5); @@ -2767,6 +2787,7 @@ // // // + this.labelX6.BackgroundStyle.Class = ""; this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX6.Location = new System.Drawing.Point(15, 67); this.labelX6.Name = "labelX6"; @@ -2778,6 +2799,7 @@ // // // + this.labelX1.BackgroundStyle.Class = ""; this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Image = ((System.Drawing.Image)(resources.GetObject("labelX1.Image"))); this.labelX1.Location = new System.Drawing.Point(12, 34); @@ -2790,6 +2812,7 @@ // // // + this.labelX3.BackgroundStyle.Class = ""; this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Image = ((System.Drawing.Image)(resources.GetObject("labelX3.Image"))); this.labelX3.Location = new System.Drawing.Point(11, 250); @@ -2800,11 +2823,11 @@ // expandableSplitter1 // this.expandableSplitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -2816,11 +2839,11 @@ this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -2837,7 +2860,6 @@ this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx4.Controls.Add(this.splitContainer1); this.panelEx4.Controls.Add(this.panelOfTable); - this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx4.Location = new System.Drawing.Point(203, 179); this.panelEx4.Name = "panelEx4"; @@ -2878,7 +2900,6 @@ this.panelEx5.Controls.Add(this.panel1); this.panelEx5.Controls.Add(this.panel3); this.panelEx5.Controls.Add(this.panel5); - this.panelEx5.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx5.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx5.Location = new System.Drawing.Point(0, 0); this.panelEx5.Name = "panelEx5"; @@ -2921,7 +2942,6 @@ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.Controls.Add(this.panel2); this.panelEx1.Controls.Add(this.panel4); - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; @@ -2944,7 +2964,6 @@ this.panelOfTable.Controls.Add(this.dataGridViewX1); this.panelOfTable.Controls.Add(this.statusStrip2); this.panelOfTable.Controls.Add(this.expandableSplitter2); - this.panelOfTable.DisabledBackColor = System.Drawing.Color.Empty; this.panelOfTable.Dock = System.Windows.Forms.DockStyle.Bottom; this.panelOfTable.Location = new System.Drawing.Point(0, 414); this.panelOfTable.Name = "panelOfTable"; @@ -3042,12 +3061,12 @@ // expandableSplitter2 // this.expandableSplitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter2.Dock = System.Windows.Forms.DockStyle.Top; this.expandableSplitter2.ExpandableControl = this.panelOfTable; - this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -3059,11 +3078,11 @@ this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -3183,7 +3202,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(149, 290); + this.toolRightMenu.Size = new System.Drawing.Size(153, 312); // // 量算ToolStripMenuItem // @@ -3259,7 +3278,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -4125,8 +4144,6 @@ // superTooltip1 // this.superTooltip1.DefaultFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); - this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.superTooltip1.MinimumTooltipSize = new System.Drawing.Size(150, 50); // // buttonItem16 @@ -4233,12 +4250,13 @@ // // // + this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4255,7 +4273,7 @@ this.ribbonControl1.Location = new System.Drawing.Point(0, 82); this.ribbonControl1.MdiSystemItemVisible = false; this.ribbonControl1.Name = "ribbonControl1"; - this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); this.ribbonControl1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem19}); this.ribbonControl1.Size = new System.Drawing.Size(1328, 97); @@ -4292,21 +4310,23 @@ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel1.Style.Class = ""; this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseDown.Class = ""; this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4315,14 +4335,15 @@ // // // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.BackgroundStyle.Class = ""; this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.ContainerControlProcessDialogKey = true; this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.DragDropSupport = true; this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem87, this.buttonItem88, @@ -4333,20 +4354,21 @@ this.btnlegendSet, this.buttonItem89, this.btnOutputJPG}); - this.ribbonBar21.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 58); + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; // // // + this.ribbonBar21.TitleStyle.Class = ""; this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.TitleVisible = false; // @@ -4436,14 +4458,17 @@ // // // + this.ribbonPanel12.Style.Class = ""; this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseDown.Class = ""; this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseOver.Class = ""; this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel12.TabIndex = 34; this.ribbonPanel12.Visible = false; @@ -4454,18 +4479,18 @@ // // // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.BackgroundStyle.Class = ""; this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.ContainerControlProcessDialogKey = true; this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.DragDropSupport = true; this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem133, this.buttonItem132}); - this.ribbonBar18.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; this.ribbonBar18.Size = new System.Drawing.Size(171, 59); @@ -4474,10 +4499,12 @@ // // // + this.ribbonBar18.TitleStyle.Class = ""; this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.TitleVisible = false; // @@ -4506,14 +4533,15 @@ // // // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.BackgroundStyle.Class = ""; this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.ContainerControlProcessDialogKey = true; this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.DragDropSupport = true; this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem127, this.buttonItem128, @@ -4521,7 +4549,6 @@ this.buttonItem134, this.buttonItem130, this.btn_check_history}); - this.ribbonBar13.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; this.ribbonBar13.Size = new System.Drawing.Size(505, 59); @@ -4530,10 +4557,12 @@ // // // + this.ribbonBar13.TitleStyle.Class = ""; this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.TitleVisible = false; // @@ -4604,14 +4633,17 @@ // // // + this.ribbonPanel5.Style.Class = ""; this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseDown.Class = ""; this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseOver.Class = ""; this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel5.TabIndex = 37; this.ribbonPanel5.Visible = false; @@ -4622,20 +4654,20 @@ // // // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.BackgroundStyle.Class = ""; this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.ContainerControlProcessDialogKey = true; this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.DragDropSupport = true; this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemHX1, this.buttonItemHX2, this.buttonItemDCTP, this.sliderItem3}); - this.ribbonBar2.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; this.ribbonBar2.Size = new System.Drawing.Size(350, 59); @@ -4644,10 +4676,12 @@ // // // + this.ribbonBar2.TitleStyle.Class = ""; this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.TitleVisible = false; // @@ -4701,14 +4735,17 @@ // // // + this.ribbonPanel2.Style.Class = ""; this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseDown.Class = ""; this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; this.ribbonPanel2.Visible = false; @@ -4719,14 +4756,15 @@ // // // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.BackgroundStyle.Class = ""; this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.ContainerControlProcessDialogKey = true; this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.DragDropSupport = true; this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_user_info, this.btn_role_info, @@ -4735,7 +4773,6 @@ this.btn_user_role, this.btn_password_edit, this.buttonItemPasswordReset}); - this.ribbonBar3.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; this.ribbonBar3.Size = new System.Drawing.Size(551, 59); @@ -4744,10 +4781,12 @@ // // // + this.ribbonBar3.TitleStyle.Class = ""; this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.TitleVisible = false; // @@ -4823,20 +4862,24 @@ this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel15.Style.Class = ""; this.ribbonPanel15.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseDown.Class = ""; this.ribbonPanel15.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4844,14 +4887,15 @@ // // // + this.ribbonBar20.BackgroundMouseOverStyle.Class = ""; this.ribbonBar20.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.BackgroundStyle.Class = ""; this.ribbonBar20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.ContainerControlProcessDialogKey = true; this.ribbonBar20.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar20.DragDropSupport = true; this.ribbonBar20.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSH, this.buttonItemSJGL, @@ -4865,19 +4909,20 @@ this.buttonItemBJ, this.buttonItemSearch, this.buttonItemBZ}); - this.ribbonBar20.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(814, 58); + this.ribbonBar20.Size = new System.Drawing.Size(814, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // // // + this.ribbonBar20.TitleStyle.Class = ""; this.ribbonBar20.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.TitleStyleMouseOver.Class = ""; this.ribbonBar20.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.TitleVisible = false; // @@ -5070,18 +5115,21 @@ // this.buttonItem10.Name = "buttonItem10"; this.buttonItem10.Text = "管线入库-高程"; + this.buttonItem10.Visible = false; this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // // buttonItem11 // this.buttonItem11.Name = "buttonItem11"; this.buttonItem11.Text = "附属物入库-高程"; + this.buttonItem11.Visible = false; this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // // buttonItem12 // this.buttonItem12.Name = "buttonItem12"; this.buttonItem12.Text = "特征管点入库-高程"; + this.buttonItem12.Visible = false; this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // // buttonItemSJGL5 @@ -6226,14 +6274,17 @@ // // // + this.ribbonPanel4.Style.Class = ""; this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseDown.Class = ""; this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseOver.Class = ""; this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel4.TabIndex = 36; this.ribbonPanel4.Visible = false; @@ -6244,17 +6295,17 @@ // // // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.BackgroundStyle.Class = ""; this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.ContainerControlProcessDialogKey = true; this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.DragDropSupport = true; this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_document_info}); - this.ribbonBar1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; this.ribbonBar1.Size = new System.Drawing.Size(88, 59); @@ -6263,10 +6314,12 @@ // // // + this.ribbonBar1.TitleStyle.Class = ""; this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.TitleVisible = false; // @@ -6291,14 +6344,17 @@ // // // + this.ribbonPanel6.Style.Class = ""; this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseDown.Class = ""; this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseOver.Class = ""; this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel6.TabIndex = 38; this.ribbonPanel6.Visible = false; @@ -6309,21 +6365,21 @@ // // // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.BackgroundStyle.Class = ""; this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.ContainerControlProcessDialogKey = true; this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.DragDropSupport = true; this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSPSZ, this.buttonItem8, this.buttonItemLocation, this.sliderItem2, this.buttonItemGBJC}); - this.ribbonBar6.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; this.ribbonBar6.Size = new System.Drawing.Size(427, 59); @@ -6332,10 +6388,12 @@ // // // + this.ribbonBar6.TitleStyle.Class = ""; this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.TitleVisible = false; // @@ -6388,6 +6446,7 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6438,7 +6497,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -7045,7 +7103,7 @@ private DevComponents.DotNetBar.LabelX labelX25; private DevComponents.DotNetBar.PanelEx panelEx3; private System.Windows.Forms.TreeView layerSensorTree; - // private System.Windows.Forms.TreeView layerTree; + // private System.Windows.Forms.TreeView layerTree; private MyTreeView layerTree; private DevComponents.DotNetBar.ButtonX buttonX7; private DevComponents.DotNetBar.ButtonX buttonX16; diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config new file mode 100644 index 0000000..f4cbe66 --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe.config @@ -0,0 +1,32 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb index c7cb8c3..c0fad4a 100644 --- a/bin/x86/Debug/Cyberpipe.pdb +++ b/bin/x86/Debug/Cyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index 3dc3245..1fc46d0 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 4f0593d..fe2b7f8 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -9,30 +9,45 @@ using GeoScene.Data; using GeoScene.Globe; using DevComponents.DotNetBar; +using System.Collections; namespace Cyberpipe { public partial class FrmAllWorkWellStatis : DevComponents.DotNetBar.Office2007Form { - Dictionary workWellLengthAndType = new Dictionary(); - List list = new List(); + + private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; + private Dictionary map = null; DataGridView dataGridViewX1; ToolStripStatusLabel toolStripNumbers; GSOGlobeControl globeControl1; PanelEx panel; - public FrmAllWorkWellStatis(Dictionary wellLen, List _list, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) + //TODOLIST：用晓伟的代理进行操作，功能拆分细化 + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) { InitializeComponent(); panel = p; - workWellLengthAndType = wellLen; - list = _list; dataGridViewX1 = dataGridViewX11; toolStripNumbers = toolStripNumbers1; - globeControl1 = ctl; + map = getAccsMap(polygon); + + } + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, MainFrm.DataGridViewDelegate InitDataGridViewX1, GSOGlobeControl ctl) + { + InitializeComponent(); + globeControl1 = ctl; + m_InitDataGridViewX1 = InitDataGridViewX1; + map = getAccsMap(polygon); + } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) { + drawChart(); + } + + public void drawChart() + { try { // Set axis title @@ -49,6 +64,11 @@ chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; + Dictionary workWellLengthAndType = new Dictionary(); + foreach (KeyValuePair kv in map) + { + workWellLengthAndType.Add(kv.Key, kv.Value.Length); + } chartAllAreaPipeline.Series["井盖"].Points.DataBindXY(workWellLengthAndType.Keys, workWellLengthAndType.Values); for (int m = 0; m < workWellLengthAndType.Values.Count; m++) { @@ -71,11 +91,11 @@ if (indexHit >= 0) { - GSOFeatures fs = list[indexHit]; + //GSOFeatures fs = list[indexHit]; string sql = ""; string pipetype = chartAllAreaPipeline.Series["井盖"].Points[indexHit].AxisLabel; - + GSOFeatures fs = map[pipetype]; string layername = ""; if (pipetype.EndsWith("窖井") || pipetype.EndsWith("表井") || (pipetype.EndsWith("窨井")) || pipetype.EndsWith("孔") || @@ -93,6 +113,23 @@ { return; } + //从图层获取datatable数据,不涉及数据库操作，速度会快一些 + //string [] fieldNames = GSOFeatureUtils.getFields(layername, globeControl1); + //DataTable dt = GSOFeatureUtils.convertGSOFeatures2DataTable(fs,fieldNames); + //if (dt.Rows.Count > 0) + //{ + // dataGridViewX1.DataSource = dt; + // panel.Visible = true; + // toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //} + //else + //{ + // panel.Visible = false; + // dataGridViewX1.DataSource = null; + // dataGridViewX1.Refresh(); + // toolStripNumbers.Text = "类型："; + //} + //数据库获取数据 if (fs.Length > 0) { sql = "select " + getpipeLineFields.getFields(layername, globeControl1) + " from " + layer.Name; @@ -120,8 +157,8 @@ { dataGridViewX1.DataSource = dt; panel.Visible = true; - //toolStripNumbers.Text = " 井盖类型：" + MainFrm.m_CurrentQueryLayer + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + string strLable = toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //m_InitDataGridViewX1(dt, strLable, "", true); } else { @@ -131,7 +168,6 @@ toolStripNumbers.Text = "类型："; } - //} } @@ -174,7 +210,7 @@ } } } - + //m_InitDataGridViewX1(null,"","" , false); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } @@ -183,5 +219,63 @@ PATM_Forms.F_PATMTitle frm = new PATM_Forms.F_PATMTitle("S", chartAllAreaPipeline); frm.Show(); } + + //获取指定layer类型的附属物名称列表 + public string[] getLayerAccNames(string layerType) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(layerType + "管线附属物"); + if (layer == null) return null; + + string sql = "select 附属物名称 from " + layerType + "管线附属物 group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layerType + "管线附属物"); + if (dataset == null) return null; + + int count = dataset.Tables[0].Rows.Count; + + + string[] result = new string[count]; + for (int i = 0; i < count; i++) + { + result[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return result; + } + + /// + /// 获取区域内各图层的井、孔、蓖的map + /// + /// 区域 + /// 要查找的附属物名称数组、如井、孔、蓖 + /// 返回值为：<图层+附属物名称,附属物列表> + + public Dictionary getAccsMap(GSOGeoPolygon3D polygon) + { + //List list = new List(); + Dictionary map = new Dictionary(); + ArrayList listpt = Utility.LayerNamesList; + if (listpt == null || listpt.Count == 0) return null; + FeatureStatisticsService service = new FeatureStatisticsService(); + for (int i = 0; i < listpt.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listpt[i] + "管线附属物"); + string[] accNames = getLayerAccNames(listpt[i] as string); + if (accNames == null || accNames.Length == 0) continue;//排除不合法的值 + for (int j = 0; j < accNames.Length; j++) + { + if (accNames[j].Contains("井") || accNames[j].Contains("孔") || accNames[j].Contains("篦")) + { + + GSOFeatures features = service.Intersect_PointLayerByType(polygon, layer, accNames[j]); + if (features == null) continue; + map.Add(listpt[i] + accNames[j], features); + } + + } + + } + return map; + + } + } } diff --git a/MainFrm.cs b/MainFrm.cs index ac2614d..b584749 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2951,35 +2951,35 @@ break; case "workwellquery": - workWellLen.Clear(); - List listWell = new List(); - //找到所有井 - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //workWellLen.Clear(); + //List listWell = new List(); + ////找到所有井 + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - listWell.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // listWell.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(workWellLen, listWell, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(polygon, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frmWell.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -9740,37 +9740,37 @@ private void buttonItemTJ3_ALL_Click(object sender, EventArgs e) { //日志记录 - LogManager.saveLog(Utility.userName, "井盖数量统计"); + //LogManager.saveLog(Utility.userName, "井盖数量统计"); - workWellLen.Clear(); - List list = new List(); + //workWellLen.Clear(); + //List list = new List(); - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - list.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // list.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(workWellLen, list, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(null, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frm.Show(this); } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ae24fb9..5c2bb7f 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -706,7 +706,6 @@ this.dotNetBarManager1.BottomDockSite = this.dockSite4; this.dotNetBarManager1.EnableFullSizeDock = false; this.dotNetBarManager1.LeftDockSite = this.dockSite1; - this.dotNetBarManager1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.dotNetBarManager1.ParentForm = null; this.dotNetBarManager1.RightDockSite = this.dockSite2; this.dotNetBarManager1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003; @@ -799,7 +798,6 @@ // styleManager1 // this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Office2010Blue; - this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(87)))), ((int)(((byte)(154)))))); // // sideBarPanelItem1 // @@ -848,7 +846,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -894,6 +892,7 @@ this.ribbonTabItemGroup1.Style.BorderRightWidth = 1; this.ribbonTabItemGroup1.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ribbonTabItemGroup1.Style.BorderTopWidth = 1; + this.ribbonTabItemGroup1.Style.Class = ""; this.ribbonTabItemGroup1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonTabItemGroup1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.ribbonTabItemGroup1.Style.TextColor = System.Drawing.Color.White; @@ -906,6 +905,7 @@ // // // + this.galleryContainer2.BackgroundStyle.Class = ""; this.galleryContainer2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer2.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer2.Name = "galleryContainer2"; @@ -915,10 +915,6 @@ this.buttonItem39}); this.galleryContainer2.Text = "断面分析"; // - // - // - this.galleryContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem38 // this.buttonItem38.Name = "buttonItem38"; @@ -939,16 +935,13 @@ // // // + this.galleryContainer3.BackgroundStyle.Class = ""; this.galleryContainer3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer3.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer3.Name = "galleryContainer3"; this.galleryContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem3}); // - // - // - this.galleryContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem3 // this.buttonItem3.Name = "buttonItem3"; @@ -959,6 +952,7 @@ // // // + this.galleryContainer4.BackgroundStyle.Class = ""; this.galleryContainer4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer4.MinimumSize = new System.Drawing.Size(150, 58); this.galleryContainer4.Name = "galleryContainer4"; @@ -970,10 +964,6 @@ this.buttonItem46}); this.galleryContainer4.Text = "断面分析"; // - // - // - this.galleryContainer4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem40 // this.buttonItem40.Name = "buttonItem40"; @@ -1004,6 +994,7 @@ // // // + this.galleryContainer5.BackgroundStyle.Class = ""; this.galleryContainer5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer5.MinimumSize = new System.Drawing.Size(80, 58); this.galleryContainer5.Name = "galleryContainer5"; @@ -1011,10 +1002,6 @@ this.buttonItem44, this.buttonItem43}); // - // - // - this.galleryContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem44 // this.buttonItem44.Name = "buttonItem44"; @@ -1030,16 +1017,13 @@ // // // + this.galleryContainer6.BackgroundStyle.Class = ""; this.galleryContainer6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer6.MinimumSize = new System.Drawing.Size(70, 58); this.galleryContainer6.Name = "galleryContainer6"; this.galleryContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem48}); // - // - // - this.galleryContainer6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem48 // this.buttonItem48.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right; @@ -1073,7 +1057,6 @@ this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx3.Controls.Add(this.layerSensorTree); - this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx3.Location = new System.Drawing.Point(54, 113); this.panelEx3.Name = "panelEx3"; this.panelEx3.Size = new System.Drawing.Size(200, 161); @@ -1188,6 +1171,7 @@ // // // + this.labelX25.BackgroundStyle.Class = ""; this.labelX25.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX25.Location = new System.Drawing.Point(7, 364); this.labelX25.Name = "labelX25"; @@ -1252,6 +1236,7 @@ // // // + this.labelX8.BackgroundStyle.Class = ""; this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX8.Location = new System.Drawing.Point(11, 60); this.labelX8.Name = "labelX8"; @@ -1384,6 +1369,7 @@ // // // + this.checkBoxX3.BackgroundStyle.Class = ""; this.checkBoxX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX3.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX3.Location = new System.Drawing.Point(11, 9); @@ -1401,6 +1387,7 @@ // // // + this.checkBoxX4.BackgroundStyle.Class = ""; this.checkBoxX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX4.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX4.Location = new System.Drawing.Point(110, 9); @@ -1418,6 +1405,7 @@ // // // + this.labelX13.BackgroundStyle.Class = ""; this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX13.Location = new System.Drawing.Point(11, 32); this.labelX13.Name = "labelX13"; @@ -1432,6 +1420,7 @@ // // // + this.labelX14.BackgroundStyle.Class = ""; this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX14.Location = new System.Drawing.Point(10, 204); this.labelX14.Name = "labelX14"; @@ -1509,7 +1498,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(181, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(198, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -1534,6 +1523,7 @@ // // // + this.labelX9.BackgroundStyle.Class = ""; this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX9.Location = new System.Drawing.Point(9, 85); this.labelX9.Name = "labelX9"; @@ -1592,7 +1582,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(180, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(197, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -1635,6 +1625,7 @@ // // // + this.labelX10.BackgroundStyle.Class = ""; this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX10.Location = new System.Drawing.Point(172, 54); this.labelX10.Name = "labelX10"; @@ -1665,6 +1656,7 @@ // // // + this.checkBoxX5.BackgroundStyle.Class = ""; this.checkBoxX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX5.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX5.Location = new System.Drawing.Point(19, 4); @@ -1682,6 +1674,7 @@ // // // + this.checkBoxX6.BackgroundStyle.Class = ""; this.checkBoxX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX6.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX6.Location = new System.Drawing.Point(114, 4); @@ -1699,6 +1692,7 @@ // // // + this.labelX12.BackgroundStyle.Class = ""; this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX12.Location = new System.Drawing.Point(6, 57); this.labelX12.Name = "labelX12"; @@ -1713,6 +1707,7 @@ // // // + this.labelX16.BackgroundStyle.Class = ""; this.labelX16.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX16.Location = new System.Drawing.Point(6, 28); this.labelX16.Name = "labelX16"; @@ -1727,6 +1722,7 @@ // // // + this.labelX17.BackgroundStyle.Class = ""; this.labelX17.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX17.Location = new System.Drawing.Point(8, 235); this.labelX17.Name = "labelX17"; @@ -1772,6 +1768,7 @@ // // // + this.labelX24.BackgroundStyle.Class = ""; this.labelX24.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX24.Image = ((System.Drawing.Image)(resources.GetObject("labelX24.Image"))); this.labelX24.Location = new System.Drawing.Point(7, 403); @@ -1804,7 +1801,7 @@ this.dataGridViewX8.ReadOnly = true; this.dataGridViewX8.RowHeadersVisible = false; this.dataGridViewX8.RowTemplate.Height = 23; - this.dataGridViewX8.Size = new System.Drawing.Size(176, 92); + this.dataGridViewX8.Size = new System.Drawing.Size(193, 92); this.dataGridViewX8.TabIndex = 11; // // dataGridViewTextBoxColumn12 @@ -1838,6 +1835,7 @@ // // // + this.labelX11.BackgroundStyle.Class = ""; this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX11.Location = new System.Drawing.Point(10, 93); this.labelX11.Name = "labelX11"; @@ -1898,7 +1896,7 @@ this.dataGridViewX9.ReadOnly = true; this.dataGridViewX9.RowHeadersVisible = false; this.dataGridViewX9.RowTemplate.Height = 23; - this.dataGridViewX9.Size = new System.Drawing.Size(175, 127); + this.dataGridViewX9.Size = new System.Drawing.Size(192, 127); this.dataGridViewX9.TabIndex = 5; this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick); // @@ -1973,6 +1971,7 @@ // // // + this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX15.Location = new System.Drawing.Point(174, 61); this.labelX15.Name = "labelX15"; @@ -2003,6 +2002,7 @@ // // // + this.checkBoxX7.BackgroundStyle.Class = ""; this.checkBoxX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX7.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX7.Location = new System.Drawing.Point(8, 5); @@ -2020,6 +2020,7 @@ // // // + this.checkBoxX8.BackgroundStyle.Class = ""; this.checkBoxX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX8.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX8.Location = new System.Drawing.Point(118, 5); @@ -2037,6 +2038,7 @@ // // // + this.labelX19.BackgroundStyle.Class = ""; this.labelX19.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX19.Location = new System.Drawing.Point(11, 61); this.labelX19.Name = "labelX19"; @@ -2051,6 +2053,7 @@ // // // + this.labelX21.BackgroundStyle.Class = ""; this.labelX21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX21.Location = new System.Drawing.Point(10, 29); this.labelX21.Name = "labelX21"; @@ -2062,6 +2065,7 @@ // // // + this.labelX22.BackgroundStyle.Class = ""; this.labelX22.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX22.Image = ((System.Drawing.Image)(resources.GetObject("labelX22.Image"))); this.labelX22.Location = new System.Drawing.Point(9, 245); @@ -2139,6 +2143,7 @@ // // // + this.labelX28.BackgroundStyle.Class = ""; this.labelX28.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX28.Location = new System.Drawing.Point(181, 104); this.labelX28.Name = "labelX28"; @@ -2154,6 +2159,7 @@ // // // + this.labelX29.BackgroundStyle.Class = ""; this.labelX29.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX29.Location = new System.Drawing.Point(6, 100); this.labelX29.Name = "labelX29"; @@ -2186,6 +2192,7 @@ // // // + this.labelX4.BackgroundStyle.Class = ""; this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Image = ((System.Drawing.Image)(resources.GetObject("labelX4.Image"))); this.labelX4.Location = new System.Drawing.Point(7, 432); @@ -2249,6 +2256,7 @@ // // // + this.labelX5.BackgroundStyle.Class = ""; this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Image = ((System.Drawing.Image)(resources.GetObject("labelX5.Image"))); this.labelX5.Location = new System.Drawing.Point(9, 134); @@ -2383,6 +2391,7 @@ // // // + this.labelX18.BackgroundStyle.Class = ""; this.labelX18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX18.Location = new System.Drawing.Point(181, 71); this.labelX18.Name = "labelX18"; @@ -2413,6 +2422,7 @@ // // // + this.checkBoxSelectPipeline.BackgroundStyle.Class = ""; this.checkBoxSelectPipeline.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectPipeline.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectPipeline.Location = new System.Drawing.Point(8, 9); @@ -2430,6 +2440,7 @@ // // // + this.checkBoxSelectLayer.BackgroundStyle.Class = ""; this.checkBoxSelectLayer.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectLayer.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectLayer.Location = new System.Drawing.Point(117, 9); @@ -2447,6 +2458,7 @@ // // // + this.labelX20.BackgroundStyle.Class = ""; this.labelX20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX20.Location = new System.Drawing.Point(6, 69); this.labelX20.Name = "labelX20"; @@ -2458,6 +2470,7 @@ // // // + this.labelX26.BackgroundStyle.Class = ""; this.labelX26.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX26.Image = ((System.Drawing.Image)(resources.GetObject("labelX26.Image"))); this.labelX26.Location = new System.Drawing.Point(9, 38); @@ -2470,6 +2483,7 @@ // // // + this.labelX27.BackgroundStyle.Class = ""; this.labelX27.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX27.Image = ((System.Drawing.Image)(resources.GetObject("labelX27.Image"))); this.labelX27.Location = new System.Drawing.Point(7, 287); @@ -2482,6 +2496,7 @@ // // // + this.labelX30.BackgroundStyle.Class = ""; this.labelX30.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX30.Location = new System.Drawing.Point(88, 100); this.labelX30.Name = "labelX30"; @@ -2514,6 +2529,7 @@ // // // + this.labelX23.BackgroundStyle.Class = ""; this.labelX23.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX23.Image = ((System.Drawing.Image)(resources.GetObject("labelX23.Image"))); this.labelX23.Location = new System.Drawing.Point(11, 404); @@ -2577,6 +2593,7 @@ // // // + this.labelX2.BackgroundStyle.Class = ""; this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Image = ((System.Drawing.Image)(resources.GetObject("labelX2.Image"))); this.labelX2.Location = new System.Drawing.Point(12, 100); @@ -2703,6 +2720,7 @@ // // // + this.labelX7.BackgroundStyle.Class = ""; this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX7.Location = new System.Drawing.Point(176, 67); this.labelX7.Name = "labelX7"; @@ -2733,6 +2751,7 @@ // // // + this.checkBoxX1.BackgroundStyle.Class = ""; this.checkBoxX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX1.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX1.Location = new System.Drawing.Point(11, 5); @@ -2750,6 +2769,7 @@ // // // + this.checkBoxX2.BackgroundStyle.Class = ""; this.checkBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX2.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX2.Location = new System.Drawing.Point(120, 5); @@ -2767,6 +2787,7 @@ // // // + this.labelX6.BackgroundStyle.Class = ""; this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX6.Location = new System.Drawing.Point(15, 67); this.labelX6.Name = "labelX6"; @@ -2778,6 +2799,7 @@ // // // + this.labelX1.BackgroundStyle.Class = ""; this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Image = ((System.Drawing.Image)(resources.GetObject("labelX1.Image"))); this.labelX1.Location = new System.Drawing.Point(12, 34); @@ -2790,6 +2812,7 @@ // // // + this.labelX3.BackgroundStyle.Class = ""; this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Image = ((System.Drawing.Image)(resources.GetObject("labelX3.Image"))); this.labelX3.Location = new System.Drawing.Point(11, 250); @@ -2800,11 +2823,11 @@ // expandableSplitter1 // this.expandableSplitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -2816,11 +2839,11 @@ this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -2837,7 +2860,6 @@ this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx4.Controls.Add(this.splitContainer1); this.panelEx4.Controls.Add(this.panelOfTable); - this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx4.Location = new System.Drawing.Point(203, 179); this.panelEx4.Name = "panelEx4"; @@ -2878,7 +2900,6 @@ this.panelEx5.Controls.Add(this.panel1); this.panelEx5.Controls.Add(this.panel3); this.panelEx5.Controls.Add(this.panel5); - this.panelEx5.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx5.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx5.Location = new System.Drawing.Point(0, 0); this.panelEx5.Name = "panelEx5"; @@ -2921,7 +2942,6 @@ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.Controls.Add(this.panel2); this.panelEx1.Controls.Add(this.panel4); - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; @@ -2944,7 +2964,6 @@ this.panelOfTable.Controls.Add(this.dataGridViewX1); this.panelOfTable.Controls.Add(this.statusStrip2); this.panelOfTable.Controls.Add(this.expandableSplitter2); - this.panelOfTable.DisabledBackColor = System.Drawing.Color.Empty; this.panelOfTable.Dock = System.Windows.Forms.DockStyle.Bottom; this.panelOfTable.Location = new System.Drawing.Point(0, 414); this.panelOfTable.Name = "panelOfTable"; @@ -3042,12 +3061,12 @@ // expandableSplitter2 // this.expandableSplitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter2.Dock = System.Windows.Forms.DockStyle.Top; this.expandableSplitter2.ExpandableControl = this.panelOfTable; - this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -3059,11 +3078,11 @@ this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -3183,7 +3202,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(149, 290); + this.toolRightMenu.Size = new System.Drawing.Size(153, 312); // // 量算ToolStripMenuItem // @@ -3259,7 +3278,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -4125,8 +4144,6 @@ // superTooltip1 // this.superTooltip1.DefaultFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); - this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.superTooltip1.MinimumTooltipSize = new System.Drawing.Size(150, 50); // // buttonItem16 @@ -4233,12 +4250,13 @@ // // // + this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4255,7 +4273,7 @@ this.ribbonControl1.Location = new System.Drawing.Point(0, 82); this.ribbonControl1.MdiSystemItemVisible = false; this.ribbonControl1.Name = "ribbonControl1"; - this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); this.ribbonControl1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem19}); this.ribbonControl1.Size = new System.Drawing.Size(1328, 97); @@ -4292,21 +4310,23 @@ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel1.Style.Class = ""; this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseDown.Class = ""; this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4315,14 +4335,15 @@ // // // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.BackgroundStyle.Class = ""; this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.ContainerControlProcessDialogKey = true; this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.DragDropSupport = true; this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem87, this.buttonItem88, @@ -4333,20 +4354,21 @@ this.btnlegendSet, this.buttonItem89, this.btnOutputJPG}); - this.ribbonBar21.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 58); + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; // // // + this.ribbonBar21.TitleStyle.Class = ""; this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.TitleVisible = false; // @@ -4436,14 +4458,17 @@ // // // + this.ribbonPanel12.Style.Class = ""; this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseDown.Class = ""; this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseOver.Class = ""; this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel12.TabIndex = 34; this.ribbonPanel12.Visible = false; @@ -4454,18 +4479,18 @@ // // // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.BackgroundStyle.Class = ""; this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.ContainerControlProcessDialogKey = true; this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.DragDropSupport = true; this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem133, this.buttonItem132}); - this.ribbonBar18.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; this.ribbonBar18.Size = new System.Drawing.Size(171, 59); @@ -4474,10 +4499,12 @@ // // // + this.ribbonBar18.TitleStyle.Class = ""; this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.TitleVisible = false; // @@ -4506,14 +4533,15 @@ // // // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.BackgroundStyle.Class = ""; this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.ContainerControlProcessDialogKey = true; this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.DragDropSupport = true; this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem127, this.buttonItem128, @@ -4521,7 +4549,6 @@ this.buttonItem134, this.buttonItem130, this.btn_check_history}); - this.ribbonBar13.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; this.ribbonBar13.Size = new System.Drawing.Size(505, 59); @@ -4530,10 +4557,12 @@ // // // + this.ribbonBar13.TitleStyle.Class = ""; this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.TitleVisible = false; // @@ -4604,14 +4633,17 @@ // // // + this.ribbonPanel5.Style.Class = ""; this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseDown.Class = ""; this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseOver.Class = ""; this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel5.TabIndex = 37; this.ribbonPanel5.Visible = false; @@ -4622,20 +4654,20 @@ // // // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.BackgroundStyle.Class = ""; this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.ContainerControlProcessDialogKey = true; this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.DragDropSupport = true; this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemHX1, this.buttonItemHX2, this.buttonItemDCTP, this.sliderItem3}); - this.ribbonBar2.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; this.ribbonBar2.Size = new System.Drawing.Size(350, 59); @@ -4644,10 +4676,12 @@ // // // + this.ribbonBar2.TitleStyle.Class = ""; this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.TitleVisible = false; // @@ -4701,14 +4735,17 @@ // // // + this.ribbonPanel2.Style.Class = ""; this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseDown.Class = ""; this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; this.ribbonPanel2.Visible = false; @@ -4719,14 +4756,15 @@ // // // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.BackgroundStyle.Class = ""; this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.ContainerControlProcessDialogKey = true; this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.DragDropSupport = true; this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_user_info, this.btn_role_info, @@ -4735,7 +4773,6 @@ this.btn_user_role, this.btn_password_edit, this.buttonItemPasswordReset}); - this.ribbonBar3.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; this.ribbonBar3.Size = new System.Drawing.Size(551, 59); @@ -4744,10 +4781,12 @@ // // // + this.ribbonBar3.TitleStyle.Class = ""; this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.TitleVisible = false; // @@ -4823,20 +4862,24 @@ this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel15.Style.Class = ""; this.ribbonPanel15.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseDown.Class = ""; this.ribbonPanel15.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4844,14 +4887,15 @@ // // // + this.ribbonBar20.BackgroundMouseOverStyle.Class = ""; this.ribbonBar20.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.BackgroundStyle.Class = ""; this.ribbonBar20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.ContainerControlProcessDialogKey = true; this.ribbonBar20.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar20.DragDropSupport = true; this.ribbonBar20.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSH, this.buttonItemSJGL, @@ -4865,19 +4909,20 @@ this.buttonItemBJ, this.buttonItemSearch, this.buttonItemBZ}); - this.ribbonBar20.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(814, 58); + this.ribbonBar20.Size = new System.Drawing.Size(814, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // // // + this.ribbonBar20.TitleStyle.Class = ""; this.ribbonBar20.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.TitleStyleMouseOver.Class = ""; this.ribbonBar20.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.TitleVisible = false; // @@ -5070,18 +5115,21 @@ // this.buttonItem10.Name = "buttonItem10"; this.buttonItem10.Text = "管线入库-高程"; + this.buttonItem10.Visible = false; this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // // buttonItem11 // this.buttonItem11.Name = "buttonItem11"; this.buttonItem11.Text = "附属物入库-高程"; + this.buttonItem11.Visible = false; this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // // buttonItem12 // this.buttonItem12.Name = "buttonItem12"; this.buttonItem12.Text = "特征管点入库-高程"; + this.buttonItem12.Visible = false; this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // // buttonItemSJGL5 @@ -6226,14 +6274,17 @@ // // // + this.ribbonPanel4.Style.Class = ""; this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseDown.Class = ""; this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseOver.Class = ""; this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel4.TabIndex = 36; this.ribbonPanel4.Visible = false; @@ -6244,17 +6295,17 @@ // // // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.BackgroundStyle.Class = ""; this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.ContainerControlProcessDialogKey = true; this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.DragDropSupport = true; this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_document_info}); - this.ribbonBar1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; this.ribbonBar1.Size = new System.Drawing.Size(88, 59); @@ -6263,10 +6314,12 @@ // // // + this.ribbonBar1.TitleStyle.Class = ""; this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.TitleVisible = false; // @@ -6291,14 +6344,17 @@ // // // + this.ribbonPanel6.Style.Class = ""; this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseDown.Class = ""; this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseOver.Class = ""; this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel6.TabIndex = 38; this.ribbonPanel6.Visible = false; @@ -6309,21 +6365,21 @@ // // // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.BackgroundStyle.Class = ""; this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.ContainerControlProcessDialogKey = true; this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.DragDropSupport = true; this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSPSZ, this.buttonItem8, this.buttonItemLocation, this.sliderItem2, this.buttonItemGBJC}); - this.ribbonBar6.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; this.ribbonBar6.Size = new System.Drawing.Size(427, 59); @@ -6332,10 +6388,12 @@ // // // + this.ribbonBar6.TitleStyle.Class = ""; this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.TitleVisible = false; // @@ -6388,6 +6446,7 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6438,7 +6497,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -7045,7 +7103,7 @@ private DevComponents.DotNetBar.LabelX labelX25; private DevComponents.DotNetBar.PanelEx panelEx3; private System.Windows.Forms.TreeView layerSensorTree; - // private System.Windows.Forms.TreeView layerTree; + // private System.Windows.Forms.TreeView layerTree; private MyTreeView layerTree; private DevComponents.DotNetBar.ButtonX buttonX7; private DevComponents.DotNetBar.ButtonX buttonX16; diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config new file mode 100644 index 0000000..f4cbe66 --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe.config @@ -0,0 +1,32 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb index c7cb8c3..c0fad4a 100644 --- a/bin/x86/Debug/Cyberpipe.pdb +++ b/bin/x86/Debug/Cyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index 3dc3245..1fc46d0 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5f45ee7..9615fbf 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 4f0593d..fe2b7f8 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -9,30 +9,45 @@ using GeoScene.Data; using GeoScene.Globe; using DevComponents.DotNetBar; +using System.Collections; namespace Cyberpipe { public partial class FrmAllWorkWellStatis : DevComponents.DotNetBar.Office2007Form { - Dictionary workWellLengthAndType = new Dictionary(); - List list = new List(); + + private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; + private Dictionary map = null; DataGridView dataGridViewX1; ToolStripStatusLabel toolStripNumbers; GSOGlobeControl globeControl1; PanelEx panel; - public FrmAllWorkWellStatis(Dictionary wellLen, List _list, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) + //TODOLIST：用晓伟的代理进行操作，功能拆分细化 + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) { InitializeComponent(); panel = p; - workWellLengthAndType = wellLen; - list = _list; dataGridViewX1 = dataGridViewX11; toolStripNumbers = toolStripNumbers1; - globeControl1 = ctl; + map = getAccsMap(polygon); + + } + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, MainFrm.DataGridViewDelegate InitDataGridViewX1, GSOGlobeControl ctl) + { + InitializeComponent(); + globeControl1 = ctl; + m_InitDataGridViewX1 = InitDataGridViewX1; + map = getAccsMap(polygon); + } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) { + drawChart(); + } + + public void drawChart() + { try { // Set axis title @@ -49,6 +64,11 @@ chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; + Dictionary workWellLengthAndType = new Dictionary(); + foreach (KeyValuePair kv in map) + { + workWellLengthAndType.Add(kv.Key, kv.Value.Length); + } chartAllAreaPipeline.Series["井盖"].Points.DataBindXY(workWellLengthAndType.Keys, workWellLengthAndType.Values); for (int m = 0; m < workWellLengthAndType.Values.Count; m++) { @@ -71,11 +91,11 @@ if (indexHit >= 0) { - GSOFeatures fs = list[indexHit]; + //GSOFeatures fs = list[indexHit]; string sql = ""; string pipetype = chartAllAreaPipeline.Series["井盖"].Points[indexHit].AxisLabel; - + GSOFeatures fs = map[pipetype]; string layername = ""; if (pipetype.EndsWith("窖井") || pipetype.EndsWith("表井") || (pipetype.EndsWith("窨井")) || pipetype.EndsWith("孔") || @@ -93,6 +113,23 @@ { return; } + //从图层获取datatable数据,不涉及数据库操作，速度会快一些 + //string [] fieldNames = GSOFeatureUtils.getFields(layername, globeControl1); + //DataTable dt = GSOFeatureUtils.convertGSOFeatures2DataTable(fs,fieldNames); + //if (dt.Rows.Count > 0) + //{ + // dataGridViewX1.DataSource = dt; + // panel.Visible = true; + // toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //} + //else + //{ + // panel.Visible = false; + // dataGridViewX1.DataSource = null; + // dataGridViewX1.Refresh(); + // toolStripNumbers.Text = "类型："; + //} + //数据库获取数据 if (fs.Length > 0) { sql = "select " + getpipeLineFields.getFields(layername, globeControl1) + " from " + layer.Name; @@ -120,8 +157,8 @@ { dataGridViewX1.DataSource = dt; panel.Visible = true; - //toolStripNumbers.Text = " 井盖类型：" + MainFrm.m_CurrentQueryLayer + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + string strLable = toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //m_InitDataGridViewX1(dt, strLable, "", true); } else { @@ -131,7 +168,6 @@ toolStripNumbers.Text = "类型："; } - //} } @@ -174,7 +210,7 @@ } } } - + //m_InitDataGridViewX1(null,"","" , false); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } @@ -183,5 +219,63 @@ PATM_Forms.F_PATMTitle frm = new PATM_Forms.F_PATMTitle("S", chartAllAreaPipeline); frm.Show(); } + + //获取指定layer类型的附属物名称列表 + public string[] getLayerAccNames(string layerType) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(layerType + "管线附属物"); + if (layer == null) return null; + + string sql = "select 附属物名称 from " + layerType + "管线附属物 group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layerType + "管线附属物"); + if (dataset == null) return null; + + int count = dataset.Tables[0].Rows.Count; + + + string[] result = new string[count]; + for (int i = 0; i < count; i++) + { + result[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return result; + } + + /// + /// 获取区域内各图层的井、孔、蓖的map + /// + /// 区域 + /// 要查找的附属物名称数组、如井、孔、蓖 + /// 返回值为：<图层+附属物名称,附属物列表> + + public Dictionary getAccsMap(GSOGeoPolygon3D polygon) + { + //List list = new List(); + Dictionary map = new Dictionary(); + ArrayList listpt = Utility.LayerNamesList; + if (listpt == null || listpt.Count == 0) return null; + FeatureStatisticsService service = new FeatureStatisticsService(); + for (int i = 0; i < listpt.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listpt[i] + "管线附属物"); + string[] accNames = getLayerAccNames(listpt[i] as string); + if (accNames == null || accNames.Length == 0) continue;//排除不合法的值 + for (int j = 0; j < accNames.Length; j++) + { + if (accNames[j].Contains("井") || accNames[j].Contains("孔") || accNames[j].Contains("篦")) + { + + GSOFeatures features = service.Intersect_PointLayerByType(polygon, layer, accNames[j]); + if (features == null) continue; + map.Add(listpt[i] + accNames[j], features); + } + + } + + } + return map; + + } + } } diff --git a/MainFrm.cs b/MainFrm.cs index ac2614d..b584749 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2951,35 +2951,35 @@ break; case "workwellquery": - workWellLen.Clear(); - List listWell = new List(); - //找到所有井 - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //workWellLen.Clear(); + //List listWell = new List(); + ////找到所有井 + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - listWell.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // listWell.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(workWellLen, listWell, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(polygon, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frmWell.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -9740,37 +9740,37 @@ private void buttonItemTJ3_ALL_Click(object sender, EventArgs e) { //日志记录 - LogManager.saveLog(Utility.userName, "井盖数量统计"); + //LogManager.saveLog(Utility.userName, "井盖数量统计"); - workWellLen.Clear(); - List list = new List(); + //workWellLen.Clear(); + //List list = new List(); - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - list.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // list.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(workWellLen, list, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(null, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frm.Show(this); } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ae24fb9..5c2bb7f 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -706,7 +706,6 @@ this.dotNetBarManager1.BottomDockSite = this.dockSite4; this.dotNetBarManager1.EnableFullSizeDock = false; this.dotNetBarManager1.LeftDockSite = this.dockSite1; - this.dotNetBarManager1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.dotNetBarManager1.ParentForm = null; this.dotNetBarManager1.RightDockSite = this.dockSite2; this.dotNetBarManager1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003; @@ -799,7 +798,6 @@ // styleManager1 // this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Office2010Blue; - this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(87)))), ((int)(((byte)(154)))))); // // sideBarPanelItem1 // @@ -848,7 +846,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -894,6 +892,7 @@ this.ribbonTabItemGroup1.Style.BorderRightWidth = 1; this.ribbonTabItemGroup1.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ribbonTabItemGroup1.Style.BorderTopWidth = 1; + this.ribbonTabItemGroup1.Style.Class = ""; this.ribbonTabItemGroup1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonTabItemGroup1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.ribbonTabItemGroup1.Style.TextColor = System.Drawing.Color.White; @@ -906,6 +905,7 @@ // // // + this.galleryContainer2.BackgroundStyle.Class = ""; this.galleryContainer2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer2.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer2.Name = "galleryContainer2"; @@ -915,10 +915,6 @@ this.buttonItem39}); this.galleryContainer2.Text = "断面分析"; // - // - // - this.galleryContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem38 // this.buttonItem38.Name = "buttonItem38"; @@ -939,16 +935,13 @@ // // // + this.galleryContainer3.BackgroundStyle.Class = ""; this.galleryContainer3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer3.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer3.Name = "galleryContainer3"; this.galleryContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem3}); // - // - // - this.galleryContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem3 // this.buttonItem3.Name = "buttonItem3"; @@ -959,6 +952,7 @@ // // // + this.galleryContainer4.BackgroundStyle.Class = ""; this.galleryContainer4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer4.MinimumSize = new System.Drawing.Size(150, 58); this.galleryContainer4.Name = "galleryContainer4"; @@ -970,10 +964,6 @@ this.buttonItem46}); this.galleryContainer4.Text = "断面分析"; // - // - // - this.galleryContainer4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem40 // this.buttonItem40.Name = "buttonItem40"; @@ -1004,6 +994,7 @@ // // // + this.galleryContainer5.BackgroundStyle.Class = ""; this.galleryContainer5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer5.MinimumSize = new System.Drawing.Size(80, 58); this.galleryContainer5.Name = "galleryContainer5"; @@ -1011,10 +1002,6 @@ this.buttonItem44, this.buttonItem43}); // - // - // - this.galleryContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem44 // this.buttonItem44.Name = "buttonItem44"; @@ -1030,16 +1017,13 @@ // // // + this.galleryContainer6.BackgroundStyle.Class = ""; this.galleryContainer6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer6.MinimumSize = new System.Drawing.Size(70, 58); this.galleryContainer6.Name = "galleryContainer6"; this.galleryContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem48}); // - // - // - this.galleryContainer6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem48 // this.buttonItem48.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right; @@ -1073,7 +1057,6 @@ this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx3.Controls.Add(this.layerSensorTree); - this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx3.Location = new System.Drawing.Point(54, 113); this.panelEx3.Name = "panelEx3"; this.panelEx3.Size = new System.Drawing.Size(200, 161); @@ -1188,6 +1171,7 @@ // // // + this.labelX25.BackgroundStyle.Class = ""; this.labelX25.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX25.Location = new System.Drawing.Point(7, 364); this.labelX25.Name = "labelX25"; @@ -1252,6 +1236,7 @@ // // // + this.labelX8.BackgroundStyle.Class = ""; this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX8.Location = new System.Drawing.Point(11, 60); this.labelX8.Name = "labelX8"; @@ -1384,6 +1369,7 @@ // // // + this.checkBoxX3.BackgroundStyle.Class = ""; this.checkBoxX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX3.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX3.Location = new System.Drawing.Point(11, 9); @@ -1401,6 +1387,7 @@ // // // + this.checkBoxX4.BackgroundStyle.Class = ""; this.checkBoxX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX4.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX4.Location = new System.Drawing.Point(110, 9); @@ -1418,6 +1405,7 @@ // // // + this.labelX13.BackgroundStyle.Class = ""; this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX13.Location = new System.Drawing.Point(11, 32); this.labelX13.Name = "labelX13"; @@ -1432,6 +1420,7 @@ // // // + this.labelX14.BackgroundStyle.Class = ""; this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX14.Location = new System.Drawing.Point(10, 204); this.labelX14.Name = "labelX14"; @@ -1509,7 +1498,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(181, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(198, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -1534,6 +1523,7 @@ // // // + this.labelX9.BackgroundStyle.Class = ""; this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX9.Location = new System.Drawing.Point(9, 85); this.labelX9.Name = "labelX9"; @@ -1592,7 +1582,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(180, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(197, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -1635,6 +1625,7 @@ // // // + this.labelX10.BackgroundStyle.Class = ""; this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX10.Location = new System.Drawing.Point(172, 54); this.labelX10.Name = "labelX10"; @@ -1665,6 +1656,7 @@ // // // + this.checkBoxX5.BackgroundStyle.Class = ""; this.checkBoxX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX5.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX5.Location = new System.Drawing.Point(19, 4); @@ -1682,6 +1674,7 @@ // // // + this.checkBoxX6.BackgroundStyle.Class = ""; this.checkBoxX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX6.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX6.Location = new System.Drawing.Point(114, 4); @@ -1699,6 +1692,7 @@ // // // + this.labelX12.BackgroundStyle.Class = ""; this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX12.Location = new System.Drawing.Point(6, 57); this.labelX12.Name = "labelX12"; @@ -1713,6 +1707,7 @@ // // // + this.labelX16.BackgroundStyle.Class = ""; this.labelX16.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX16.Location = new System.Drawing.Point(6, 28); this.labelX16.Name = "labelX16"; @@ -1727,6 +1722,7 @@ // // // + this.labelX17.BackgroundStyle.Class = ""; this.labelX17.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX17.Location = new System.Drawing.Point(8, 235); this.labelX17.Name = "labelX17"; @@ -1772,6 +1768,7 @@ // // // + this.labelX24.BackgroundStyle.Class = ""; this.labelX24.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX24.Image = ((System.Drawing.Image)(resources.GetObject("labelX24.Image"))); this.labelX24.Location = new System.Drawing.Point(7, 403); @@ -1804,7 +1801,7 @@ this.dataGridViewX8.ReadOnly = true; this.dataGridViewX8.RowHeadersVisible = false; this.dataGridViewX8.RowTemplate.Height = 23; - this.dataGridViewX8.Size = new System.Drawing.Size(176, 92); + this.dataGridViewX8.Size = new System.Drawing.Size(193, 92); this.dataGridViewX8.TabIndex = 11; // // dataGridViewTextBoxColumn12 @@ -1838,6 +1835,7 @@ // // // + this.labelX11.BackgroundStyle.Class = ""; this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX11.Location = new System.Drawing.Point(10, 93); this.labelX11.Name = "labelX11"; @@ -1898,7 +1896,7 @@ this.dataGridViewX9.ReadOnly = true; this.dataGridViewX9.RowHeadersVisible = false; this.dataGridViewX9.RowTemplate.Height = 23; - this.dataGridViewX9.Size = new System.Drawing.Size(175, 127); + this.dataGridViewX9.Size = new System.Drawing.Size(192, 127); this.dataGridViewX9.TabIndex = 5; this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick); // @@ -1973,6 +1971,7 @@ // // // + this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX15.Location = new System.Drawing.Point(174, 61); this.labelX15.Name = "labelX15"; @@ -2003,6 +2002,7 @@ // // // + this.checkBoxX7.BackgroundStyle.Class = ""; this.checkBoxX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX7.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX7.Location = new System.Drawing.Point(8, 5); @@ -2020,6 +2020,7 @@ // // // + this.checkBoxX8.BackgroundStyle.Class = ""; this.checkBoxX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX8.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX8.Location = new System.Drawing.Point(118, 5); @@ -2037,6 +2038,7 @@ // // // + this.labelX19.BackgroundStyle.Class = ""; this.labelX19.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX19.Location = new System.Drawing.Point(11, 61); this.labelX19.Name = "labelX19"; @@ -2051,6 +2053,7 @@ // // // + this.labelX21.BackgroundStyle.Class = ""; this.labelX21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX21.Location = new System.Drawing.Point(10, 29); this.labelX21.Name = "labelX21"; @@ -2062,6 +2065,7 @@ // // // + this.labelX22.BackgroundStyle.Class = ""; this.labelX22.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX22.Image = ((System.Drawing.Image)(resources.GetObject("labelX22.Image"))); this.labelX22.Location = new System.Drawing.Point(9, 245); @@ -2139,6 +2143,7 @@ // // // + this.labelX28.BackgroundStyle.Class = ""; this.labelX28.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX28.Location = new System.Drawing.Point(181, 104); this.labelX28.Name = "labelX28"; @@ -2154,6 +2159,7 @@ // // // + this.labelX29.BackgroundStyle.Class = ""; this.labelX29.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX29.Location = new System.Drawing.Point(6, 100); this.labelX29.Name = "labelX29"; @@ -2186,6 +2192,7 @@ // // // + this.labelX4.BackgroundStyle.Class = ""; this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Image = ((System.Drawing.Image)(resources.GetObject("labelX4.Image"))); this.labelX4.Location = new System.Drawing.Point(7, 432); @@ -2249,6 +2256,7 @@ // // // + this.labelX5.BackgroundStyle.Class = ""; this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Image = ((System.Drawing.Image)(resources.GetObject("labelX5.Image"))); this.labelX5.Location = new System.Drawing.Point(9, 134); @@ -2383,6 +2391,7 @@ // // // + this.labelX18.BackgroundStyle.Class = ""; this.labelX18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX18.Location = new System.Drawing.Point(181, 71); this.labelX18.Name = "labelX18"; @@ -2413,6 +2422,7 @@ // // // + this.checkBoxSelectPipeline.BackgroundStyle.Class = ""; this.checkBoxSelectPipeline.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectPipeline.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectPipeline.Location = new System.Drawing.Point(8, 9); @@ -2430,6 +2440,7 @@ // // // + this.checkBoxSelectLayer.BackgroundStyle.Class = ""; this.checkBoxSelectLayer.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectLayer.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectLayer.Location = new System.Drawing.Point(117, 9); @@ -2447,6 +2458,7 @@ // // // + this.labelX20.BackgroundStyle.Class = ""; this.labelX20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX20.Location = new System.Drawing.Point(6, 69); this.labelX20.Name = "labelX20"; @@ -2458,6 +2470,7 @@ // // // + this.labelX26.BackgroundStyle.Class = ""; this.labelX26.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX26.Image = ((System.Drawing.Image)(resources.GetObject("labelX26.Image"))); this.labelX26.Location = new System.Drawing.Point(9, 38); @@ -2470,6 +2483,7 @@ // // // + this.labelX27.BackgroundStyle.Class = ""; this.labelX27.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX27.Image = ((System.Drawing.Image)(resources.GetObject("labelX27.Image"))); this.labelX27.Location = new System.Drawing.Point(7, 287); @@ -2482,6 +2496,7 @@ // // // + this.labelX30.BackgroundStyle.Class = ""; this.labelX30.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX30.Location = new System.Drawing.Point(88, 100); this.labelX30.Name = "labelX30"; @@ -2514,6 +2529,7 @@ // // // + this.labelX23.BackgroundStyle.Class = ""; this.labelX23.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX23.Image = ((System.Drawing.Image)(resources.GetObject("labelX23.Image"))); this.labelX23.Location = new System.Drawing.Point(11, 404); @@ -2577,6 +2593,7 @@ // // // + this.labelX2.BackgroundStyle.Class = ""; this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Image = ((System.Drawing.Image)(resources.GetObject("labelX2.Image"))); this.labelX2.Location = new System.Drawing.Point(12, 100); @@ -2703,6 +2720,7 @@ // // // + this.labelX7.BackgroundStyle.Class = ""; this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX7.Location = new System.Drawing.Point(176, 67); this.labelX7.Name = "labelX7"; @@ -2733,6 +2751,7 @@ // // // + this.checkBoxX1.BackgroundStyle.Class = ""; this.checkBoxX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX1.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX1.Location = new System.Drawing.Point(11, 5); @@ -2750,6 +2769,7 @@ // // // + this.checkBoxX2.BackgroundStyle.Class = ""; this.checkBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX2.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX2.Location = new System.Drawing.Point(120, 5); @@ -2767,6 +2787,7 @@ // // // + this.labelX6.BackgroundStyle.Class = ""; this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX6.Location = new System.Drawing.Point(15, 67); this.labelX6.Name = "labelX6"; @@ -2778,6 +2799,7 @@ // // // + this.labelX1.BackgroundStyle.Class = ""; this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Image = ((System.Drawing.Image)(resources.GetObject("labelX1.Image"))); this.labelX1.Location = new System.Drawing.Point(12, 34); @@ -2790,6 +2812,7 @@ // // // + this.labelX3.BackgroundStyle.Class = ""; this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Image = ((System.Drawing.Image)(resources.GetObject("labelX3.Image"))); this.labelX3.Location = new System.Drawing.Point(11, 250); @@ -2800,11 +2823,11 @@ // expandableSplitter1 // this.expandableSplitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -2816,11 +2839,11 @@ this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -2837,7 +2860,6 @@ this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx4.Controls.Add(this.splitContainer1); this.panelEx4.Controls.Add(this.panelOfTable); - this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx4.Location = new System.Drawing.Point(203, 179); this.panelEx4.Name = "panelEx4"; @@ -2878,7 +2900,6 @@ this.panelEx5.Controls.Add(this.panel1); this.panelEx5.Controls.Add(this.panel3); this.panelEx5.Controls.Add(this.panel5); - this.panelEx5.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx5.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx5.Location = new System.Drawing.Point(0, 0); this.panelEx5.Name = "panelEx5"; @@ -2921,7 +2942,6 @@ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.Controls.Add(this.panel2); this.panelEx1.Controls.Add(this.panel4); - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; @@ -2944,7 +2964,6 @@ this.panelOfTable.Controls.Add(this.dataGridViewX1); this.panelOfTable.Controls.Add(this.statusStrip2); this.panelOfTable.Controls.Add(this.expandableSplitter2); - this.panelOfTable.DisabledBackColor = System.Drawing.Color.Empty; this.panelOfTable.Dock = System.Windows.Forms.DockStyle.Bottom; this.panelOfTable.Location = new System.Drawing.Point(0, 414); this.panelOfTable.Name = "panelOfTable"; @@ -3042,12 +3061,12 @@ // expandableSplitter2 // this.expandableSplitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter2.Dock = System.Windows.Forms.DockStyle.Top; this.expandableSplitter2.ExpandableControl = this.panelOfTable; - this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -3059,11 +3078,11 @@ this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -3183,7 +3202,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(149, 290); + this.toolRightMenu.Size = new System.Drawing.Size(153, 312); // // 量算ToolStripMenuItem // @@ -3259,7 +3278,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -4125,8 +4144,6 @@ // superTooltip1 // this.superTooltip1.DefaultFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); - this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.superTooltip1.MinimumTooltipSize = new System.Drawing.Size(150, 50); // // buttonItem16 @@ -4233,12 +4250,13 @@ // // // + this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4255,7 +4273,7 @@ this.ribbonControl1.Location = new System.Drawing.Point(0, 82); this.ribbonControl1.MdiSystemItemVisible = false; this.ribbonControl1.Name = "ribbonControl1"; - this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); this.ribbonControl1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem19}); this.ribbonControl1.Size = new System.Drawing.Size(1328, 97); @@ -4292,21 +4310,23 @@ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel1.Style.Class = ""; this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseDown.Class = ""; this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4315,14 +4335,15 @@ // // // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.BackgroundStyle.Class = ""; this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.ContainerControlProcessDialogKey = true; this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.DragDropSupport = true; this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem87, this.buttonItem88, @@ -4333,20 +4354,21 @@ this.btnlegendSet, this.buttonItem89, this.btnOutputJPG}); - this.ribbonBar21.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 58); + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; // // // + this.ribbonBar21.TitleStyle.Class = ""; this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.TitleVisible = false; // @@ -4436,14 +4458,17 @@ // // // + this.ribbonPanel12.Style.Class = ""; this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseDown.Class = ""; this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseOver.Class = ""; this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel12.TabIndex = 34; this.ribbonPanel12.Visible = false; @@ -4454,18 +4479,18 @@ // // // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.BackgroundStyle.Class = ""; this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.ContainerControlProcessDialogKey = true; this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.DragDropSupport = true; this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem133, this.buttonItem132}); - this.ribbonBar18.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; this.ribbonBar18.Size = new System.Drawing.Size(171, 59); @@ -4474,10 +4499,12 @@ // // // + this.ribbonBar18.TitleStyle.Class = ""; this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.TitleVisible = false; // @@ -4506,14 +4533,15 @@ // // // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.BackgroundStyle.Class = ""; this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.ContainerControlProcessDialogKey = true; this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.DragDropSupport = true; this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem127, this.buttonItem128, @@ -4521,7 +4549,6 @@ this.buttonItem134, this.buttonItem130, this.btn_check_history}); - this.ribbonBar13.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; this.ribbonBar13.Size = new System.Drawing.Size(505, 59); @@ -4530,10 +4557,12 @@ // // // + this.ribbonBar13.TitleStyle.Class = ""; this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.TitleVisible = false; // @@ -4604,14 +4633,17 @@ // // // + this.ribbonPanel5.Style.Class = ""; this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseDown.Class = ""; this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseOver.Class = ""; this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel5.TabIndex = 37; this.ribbonPanel5.Visible = false; @@ -4622,20 +4654,20 @@ // // // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.BackgroundStyle.Class = ""; this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.ContainerControlProcessDialogKey = true; this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.DragDropSupport = true; this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemHX1, this.buttonItemHX2, this.buttonItemDCTP, this.sliderItem3}); - this.ribbonBar2.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; this.ribbonBar2.Size = new System.Drawing.Size(350, 59); @@ -4644,10 +4676,12 @@ // // // + this.ribbonBar2.TitleStyle.Class = ""; this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.TitleVisible = false; // @@ -4701,14 +4735,17 @@ // // // + this.ribbonPanel2.Style.Class = ""; this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseDown.Class = ""; this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; this.ribbonPanel2.Visible = false; @@ -4719,14 +4756,15 @@ // // // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.BackgroundStyle.Class = ""; this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.ContainerControlProcessDialogKey = true; this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.DragDropSupport = true; this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_user_info, this.btn_role_info, @@ -4735,7 +4773,6 @@ this.btn_user_role, this.btn_password_edit, this.buttonItemPasswordReset}); - this.ribbonBar3.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; this.ribbonBar3.Size = new System.Drawing.Size(551, 59); @@ -4744,10 +4781,12 @@ // // // + this.ribbonBar3.TitleStyle.Class = ""; this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.TitleVisible = false; // @@ -4823,20 +4862,24 @@ this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel15.Style.Class = ""; this.ribbonPanel15.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseDown.Class = ""; this.ribbonPanel15.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4844,14 +4887,15 @@ // // // + this.ribbonBar20.BackgroundMouseOverStyle.Class = ""; this.ribbonBar20.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.BackgroundStyle.Class = ""; this.ribbonBar20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.ContainerControlProcessDialogKey = true; this.ribbonBar20.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar20.DragDropSupport = true; this.ribbonBar20.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSH, this.buttonItemSJGL, @@ -4865,19 +4909,20 @@ this.buttonItemBJ, this.buttonItemSearch, this.buttonItemBZ}); - this.ribbonBar20.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(814, 58); + this.ribbonBar20.Size = new System.Drawing.Size(814, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // // // + this.ribbonBar20.TitleStyle.Class = ""; this.ribbonBar20.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.TitleStyleMouseOver.Class = ""; this.ribbonBar20.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.TitleVisible = false; // @@ -5070,18 +5115,21 @@ // this.buttonItem10.Name = "buttonItem10"; this.buttonItem10.Text = "管线入库-高程"; + this.buttonItem10.Visible = false; this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // // buttonItem11 // this.buttonItem11.Name = "buttonItem11"; this.buttonItem11.Text = "附属物入库-高程"; + this.buttonItem11.Visible = false; this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // // buttonItem12 // this.buttonItem12.Name = "buttonItem12"; this.buttonItem12.Text = "特征管点入库-高程"; + this.buttonItem12.Visible = false; this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // // buttonItemSJGL5 @@ -6226,14 +6274,17 @@ // // // + this.ribbonPanel4.Style.Class = ""; this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseDown.Class = ""; this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseOver.Class = ""; this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel4.TabIndex = 36; this.ribbonPanel4.Visible = false; @@ -6244,17 +6295,17 @@ // // // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.BackgroundStyle.Class = ""; this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.ContainerControlProcessDialogKey = true; this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.DragDropSupport = true; this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_document_info}); - this.ribbonBar1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; this.ribbonBar1.Size = new System.Drawing.Size(88, 59); @@ -6263,10 +6314,12 @@ // // // + this.ribbonBar1.TitleStyle.Class = ""; this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.TitleVisible = false; // @@ -6291,14 +6344,17 @@ // // // + this.ribbonPanel6.Style.Class = ""; this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseDown.Class = ""; this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseOver.Class = ""; this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel6.TabIndex = 38; this.ribbonPanel6.Visible = false; @@ -6309,21 +6365,21 @@ // // // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.BackgroundStyle.Class = ""; this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.ContainerControlProcessDialogKey = true; this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.DragDropSupport = true; this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSPSZ, this.buttonItem8, this.buttonItemLocation, this.sliderItem2, this.buttonItemGBJC}); - this.ribbonBar6.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; this.ribbonBar6.Size = new System.Drawing.Size(427, 59); @@ -6332,10 +6388,12 @@ // // // + this.ribbonBar6.TitleStyle.Class = ""; this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.TitleVisible = false; // @@ -6388,6 +6446,7 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6438,7 +6497,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -7045,7 +7103,7 @@ private DevComponents.DotNetBar.LabelX labelX25; private DevComponents.DotNetBar.PanelEx panelEx3; private System.Windows.Forms.TreeView layerSensorTree; - // private System.Windows.Forms.TreeView layerTree; + // private System.Windows.Forms.TreeView layerTree; private MyTreeView layerTree; private DevComponents.DotNetBar.ButtonX buttonX7; private DevComponents.DotNetBar.ButtonX buttonX16; diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config new file mode 100644 index 0000000..f4cbe66 --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe.config @@ -0,0 +1,32 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb index c7cb8c3..c0fad4a 100644 --- a/bin/x86/Debug/Cyberpipe.pdb +++ b/bin/x86/Debug/Cyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index 3dc3245..1fc46d0 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5f45ee7..9615fbf 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt index b8d8198..c6fbef0 100644 --- a/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -342,8 +342,186 @@ F:\predator\codeReview\GHFX_SZ_64\obj\x64\Debug\Cyberpipe.pdb F:\predator\codeReview\GHFX_SZ_64\bin\x86\Debug\office.dll F:\predator\codeReview\GHFX_SZ_64\bin\x86\Debug\office.xml -D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe.config +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.csproj.ResolveComReference.cache +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.pdb +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\office.dll +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\office.xml +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FormDocumentManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmAddYuBiZiShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGBJCresult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmWait.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\PipeLine.Forms.FrmAddPipelineCoordinate.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGongShuiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmMnModify.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPipelineModelDataOneStep.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmShLayers.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmShRK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmTongXunAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmAddWellShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccess.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoriesgather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoryAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddValve.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddWellShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddYuBiZiShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAllWorkWellStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAnalysisGuiHuaResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPP.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPAuditor.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPFORASK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPFORASKReason.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPregion.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAppUSER.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAppUSERRESET.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBACKORACLE.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBSQDuoBianXingStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBSQStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBufferAnalysisBSQ.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmChangePassword.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCheckHistory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCodingQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCompareFeature.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCreateUser.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCustomLabel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDataBaseOpt.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDatabaseParaSetting2.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDbManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDocumentEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDownloadProgress.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmExportCADS.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlySetDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBasicQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBoosterValvers.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBufferAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDatabaseParaSetting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DigFillAnalysisDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBaseLineProfillAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGenAndFaMenTopu.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGenTopo.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCloseValves.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDigPitSetting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFittingQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlow.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlyToPosition.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFolderSelecter.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFTAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGBJC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGenAndFaMenTopu.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGHRK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHotFuncStat.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHotFuncStatTitle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmKeywordQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLayerControl.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogDescription.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogin.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogOper.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMDDictory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadata.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadataOutput.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadataStat.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMultiPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmOperMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPerm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPermMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeDeepstatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeDiametergather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Frmpipediameterstatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeMaterialGather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPaiShuiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmProject.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmRanQiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddPipeFitting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAllPipelineStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDiameterQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFWPipeLineStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRedlineResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleInfoManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleRescManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmShResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoManger.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoPassword.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmThreeOracle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRole.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValveStatistics.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMaterialSel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.frmPipeSetEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmProfileAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPropertiesMarker.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmOper.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQueryHistory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQueryMessage.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQuerySensorAlarm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegion.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionType.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionTypeMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRESC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRESCMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRole.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetGoalLayer.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmTackPolygonDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHDMAnalysis3.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLineCoordinate.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQuerySQL.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserAdd.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRepo.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRepoMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValiData.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmYJSHTC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Frm_password_reset.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSfiles.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSinout.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSProjedits.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.MainFrm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCreateTunnel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCitySevenLineType.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile_AddField.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile_DeleteField.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmExportVector.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFloodAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCityServerLineAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMarker.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPipelineIndented.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMFiles.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMInout.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMTitle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMProjedit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Properties.Resources.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetLatLonPos.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSceneLightSet.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetFlytoPos.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoriesSensor.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValiDataShowErrorMessage.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddInstrument.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.SysRescInfoManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.read.1.tlog +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.write.1.tlog +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.exe +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.pdb +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe.config D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.csproj.ResolveComReference.cache +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.exe +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.pdb +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\office.dll +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\office.xml +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources @@ -507,3 +685,4 @@ D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.SysRescInfoManager.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.read.1.tlog D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.write.1.tlog +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.pdb diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 4f0593d..fe2b7f8 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -9,30 +9,45 @@ using GeoScene.Data; using GeoScene.Globe; using DevComponents.DotNetBar; +using System.Collections; namespace Cyberpipe { public partial class FrmAllWorkWellStatis : DevComponents.DotNetBar.Office2007Form { - Dictionary workWellLengthAndType = new Dictionary(); - List list = new List(); + + private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; + private Dictionary map = null; DataGridView dataGridViewX1; ToolStripStatusLabel toolStripNumbers; GSOGlobeControl globeControl1; PanelEx panel; - public FrmAllWorkWellStatis(Dictionary wellLen, List _list, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) + //TODOLIST：用晓伟的代理进行操作，功能拆分细化 + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) { InitializeComponent(); panel = p; - workWellLengthAndType = wellLen; - list = _list; dataGridViewX1 = dataGridViewX11; toolStripNumbers = toolStripNumbers1; - globeControl1 = ctl; + map = getAccsMap(polygon); + + } + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, MainFrm.DataGridViewDelegate InitDataGridViewX1, GSOGlobeControl ctl) + { + InitializeComponent(); + globeControl1 = ctl; + m_InitDataGridViewX1 = InitDataGridViewX1; + map = getAccsMap(polygon); + } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) { + drawChart(); + } + + public void drawChart() + { try { // Set axis title @@ -49,6 +64,11 @@ chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; + Dictionary workWellLengthAndType = new Dictionary(); + foreach (KeyValuePair kv in map) + { + workWellLengthAndType.Add(kv.Key, kv.Value.Length); + } chartAllAreaPipeline.Series["井盖"].Points.DataBindXY(workWellLengthAndType.Keys, workWellLengthAndType.Values); for (int m = 0; m < workWellLengthAndType.Values.Count; m++) { @@ -71,11 +91,11 @@ if (indexHit >= 0) { - GSOFeatures fs = list[indexHit]; + //GSOFeatures fs = list[indexHit]; string sql = ""; string pipetype = chartAllAreaPipeline.Series["井盖"].Points[indexHit].AxisLabel; - + GSOFeatures fs = map[pipetype]; string layername = ""; if (pipetype.EndsWith("窖井") || pipetype.EndsWith("表井") || (pipetype.EndsWith("窨井")) || pipetype.EndsWith("孔") || @@ -93,6 +113,23 @@ { return; } + //从图层获取datatable数据,不涉及数据库操作，速度会快一些 + //string [] fieldNames = GSOFeatureUtils.getFields(layername, globeControl1); + //DataTable dt = GSOFeatureUtils.convertGSOFeatures2DataTable(fs,fieldNames); + //if (dt.Rows.Count > 0) + //{ + // dataGridViewX1.DataSource = dt; + // panel.Visible = true; + // toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //} + //else + //{ + // panel.Visible = false; + // dataGridViewX1.DataSource = null; + // dataGridViewX1.Refresh(); + // toolStripNumbers.Text = "类型："; + //} + //数据库获取数据 if (fs.Length > 0) { sql = "select " + getpipeLineFields.getFields(layername, globeControl1) + " from " + layer.Name; @@ -120,8 +157,8 @@ { dataGridViewX1.DataSource = dt; panel.Visible = true; - //toolStripNumbers.Text = " 井盖类型：" + MainFrm.m_CurrentQueryLayer + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + string strLable = toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //m_InitDataGridViewX1(dt, strLable, "", true); } else { @@ -131,7 +168,6 @@ toolStripNumbers.Text = "类型："; } - //} } @@ -174,7 +210,7 @@ } } } - + //m_InitDataGridViewX1(null,"","" , false); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } @@ -183,5 +219,63 @@ PATM_Forms.F_PATMTitle frm = new PATM_Forms.F_PATMTitle("S", chartAllAreaPipeline); frm.Show(); } + + //获取指定layer类型的附属物名称列表 + public string[] getLayerAccNames(string layerType) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(layerType + "管线附属物"); + if (layer == null) return null; + + string sql = "select 附属物名称 from " + layerType + "管线附属物 group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layerType + "管线附属物"); + if (dataset == null) return null; + + int count = dataset.Tables[0].Rows.Count; + + + string[] result = new string[count]; + for (int i = 0; i < count; i++) + { + result[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return result; + } + + /// + /// 获取区域内各图层的井、孔、蓖的map + /// + /// 区域 + /// 要查找的附属物名称数组、如井、孔、蓖 + /// 返回值为：<图层+附属物名称,附属物列表> + + public Dictionary getAccsMap(GSOGeoPolygon3D polygon) + { + //List list = new List(); + Dictionary map = new Dictionary(); + ArrayList listpt = Utility.LayerNamesList; + if (listpt == null || listpt.Count == 0) return null; + FeatureStatisticsService service = new FeatureStatisticsService(); + for (int i = 0; i < listpt.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listpt[i] + "管线附属物"); + string[] accNames = getLayerAccNames(listpt[i] as string); + if (accNames == null || accNames.Length == 0) continue;//排除不合法的值 + for (int j = 0; j < accNames.Length; j++) + { + if (accNames[j].Contains("井") || accNames[j].Contains("孔") || accNames[j].Contains("篦")) + { + + GSOFeatures features = service.Intersect_PointLayerByType(polygon, layer, accNames[j]); + if (features == null) continue; + map.Add(listpt[i] + accNames[j], features); + } + + } + + } + return map; + + } + } } diff --git a/MainFrm.cs b/MainFrm.cs index ac2614d..b584749 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2951,35 +2951,35 @@ break; case "workwellquery": - workWellLen.Clear(); - List listWell = new List(); - //找到所有井 - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //workWellLen.Clear(); + //List listWell = new List(); + ////找到所有井 + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - listWell.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // listWell.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(workWellLen, listWell, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(polygon, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frmWell.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -9740,37 +9740,37 @@ private void buttonItemTJ3_ALL_Click(object sender, EventArgs e) { //日志记录 - LogManager.saveLog(Utility.userName, "井盖数量统计"); + //LogManager.saveLog(Utility.userName, "井盖数量统计"); - workWellLen.Clear(); - List list = new List(); + //workWellLen.Clear(); + //List list = new List(); - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - list.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // list.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(workWellLen, list, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(null, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frm.Show(this); } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ae24fb9..5c2bb7f 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -706,7 +706,6 @@ this.dotNetBarManager1.BottomDockSite = this.dockSite4; this.dotNetBarManager1.EnableFullSizeDock = false; this.dotNetBarManager1.LeftDockSite = this.dockSite1; - this.dotNetBarManager1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.dotNetBarManager1.ParentForm = null; this.dotNetBarManager1.RightDockSite = this.dockSite2; this.dotNetBarManager1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003; @@ -799,7 +798,6 @@ // styleManager1 // this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Office2010Blue; - this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(87)))), ((int)(((byte)(154)))))); // // sideBarPanelItem1 // @@ -848,7 +846,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -894,6 +892,7 @@ this.ribbonTabItemGroup1.Style.BorderRightWidth = 1; this.ribbonTabItemGroup1.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ribbonTabItemGroup1.Style.BorderTopWidth = 1; + this.ribbonTabItemGroup1.Style.Class = ""; this.ribbonTabItemGroup1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonTabItemGroup1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.ribbonTabItemGroup1.Style.TextColor = System.Drawing.Color.White; @@ -906,6 +905,7 @@ // // // + this.galleryContainer2.BackgroundStyle.Class = ""; this.galleryContainer2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer2.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer2.Name = "galleryContainer2"; @@ -915,10 +915,6 @@ this.buttonItem39}); this.galleryContainer2.Text = "断面分析"; // - // - // - this.galleryContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem38 // this.buttonItem38.Name = "buttonItem38"; @@ -939,16 +935,13 @@ // // // + this.galleryContainer3.BackgroundStyle.Class = ""; this.galleryContainer3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer3.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer3.Name = "galleryContainer3"; this.galleryContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem3}); // - // - // - this.galleryContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem3 // this.buttonItem3.Name = "buttonItem3"; @@ -959,6 +952,7 @@ // // // + this.galleryContainer4.BackgroundStyle.Class = ""; this.galleryContainer4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer4.MinimumSize = new System.Drawing.Size(150, 58); this.galleryContainer4.Name = "galleryContainer4"; @@ -970,10 +964,6 @@ this.buttonItem46}); this.galleryContainer4.Text = "断面分析"; // - // - // - this.galleryContainer4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem40 // this.buttonItem40.Name = "buttonItem40"; @@ -1004,6 +994,7 @@ // // // + this.galleryContainer5.BackgroundStyle.Class = ""; this.galleryContainer5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer5.MinimumSize = new System.Drawing.Size(80, 58); this.galleryContainer5.Name = "galleryContainer5"; @@ -1011,10 +1002,6 @@ this.buttonItem44, this.buttonItem43}); // - // - // - this.galleryContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem44 // this.buttonItem44.Name = "buttonItem44"; @@ -1030,16 +1017,13 @@ // // // + this.galleryContainer6.BackgroundStyle.Class = ""; this.galleryContainer6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer6.MinimumSize = new System.Drawing.Size(70, 58); this.galleryContainer6.Name = "galleryContainer6"; this.galleryContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem48}); // - // - // - this.galleryContainer6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem48 // this.buttonItem48.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right; @@ -1073,7 +1057,6 @@ this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx3.Controls.Add(this.layerSensorTree); - this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx3.Location = new System.Drawing.Point(54, 113); this.panelEx3.Name = "panelEx3"; this.panelEx3.Size = new System.Drawing.Size(200, 161); @@ -1188,6 +1171,7 @@ // // // + this.labelX25.BackgroundStyle.Class = ""; this.labelX25.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX25.Location = new System.Drawing.Point(7, 364); this.labelX25.Name = "labelX25"; @@ -1252,6 +1236,7 @@ // // // + this.labelX8.BackgroundStyle.Class = ""; this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX8.Location = new System.Drawing.Point(11, 60); this.labelX8.Name = "labelX8"; @@ -1384,6 +1369,7 @@ // // // + this.checkBoxX3.BackgroundStyle.Class = ""; this.checkBoxX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX3.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX3.Location = new System.Drawing.Point(11, 9); @@ -1401,6 +1387,7 @@ // // // + this.checkBoxX4.BackgroundStyle.Class = ""; this.checkBoxX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX4.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX4.Location = new System.Drawing.Point(110, 9); @@ -1418,6 +1405,7 @@ // // // + this.labelX13.BackgroundStyle.Class = ""; this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX13.Location = new System.Drawing.Point(11, 32); this.labelX13.Name = "labelX13"; @@ -1432,6 +1420,7 @@ // // // + this.labelX14.BackgroundStyle.Class = ""; this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX14.Location = new System.Drawing.Point(10, 204); this.labelX14.Name = "labelX14"; @@ -1509,7 +1498,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(181, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(198, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -1534,6 +1523,7 @@ // // // + this.labelX9.BackgroundStyle.Class = ""; this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX9.Location = new System.Drawing.Point(9, 85); this.labelX9.Name = "labelX9"; @@ -1592,7 +1582,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(180, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(197, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -1635,6 +1625,7 @@ // // // + this.labelX10.BackgroundStyle.Class = ""; this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX10.Location = new System.Drawing.Point(172, 54); this.labelX10.Name = "labelX10"; @@ -1665,6 +1656,7 @@ // // // + this.checkBoxX5.BackgroundStyle.Class = ""; this.checkBoxX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX5.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX5.Location = new System.Drawing.Point(19, 4); @@ -1682,6 +1674,7 @@ // // // + this.checkBoxX6.BackgroundStyle.Class = ""; this.checkBoxX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX6.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX6.Location = new System.Drawing.Point(114, 4); @@ -1699,6 +1692,7 @@ // // // + this.labelX12.BackgroundStyle.Class = ""; this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX12.Location = new System.Drawing.Point(6, 57); this.labelX12.Name = "labelX12"; @@ -1713,6 +1707,7 @@ // // // + this.labelX16.BackgroundStyle.Class = ""; this.labelX16.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX16.Location = new System.Drawing.Point(6, 28); this.labelX16.Name = "labelX16"; @@ -1727,6 +1722,7 @@ // // // + this.labelX17.BackgroundStyle.Class = ""; this.labelX17.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX17.Location = new System.Drawing.Point(8, 235); this.labelX17.Name = "labelX17"; @@ -1772,6 +1768,7 @@ // // // + this.labelX24.BackgroundStyle.Class = ""; this.labelX24.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX24.Image = ((System.Drawing.Image)(resources.GetObject("labelX24.Image"))); this.labelX24.Location = new System.Drawing.Point(7, 403); @@ -1804,7 +1801,7 @@ this.dataGridViewX8.ReadOnly = true; this.dataGridViewX8.RowHeadersVisible = false; this.dataGridViewX8.RowTemplate.Height = 23; - this.dataGridViewX8.Size = new System.Drawing.Size(176, 92); + this.dataGridViewX8.Size = new System.Drawing.Size(193, 92); this.dataGridViewX8.TabIndex = 11; // // dataGridViewTextBoxColumn12 @@ -1838,6 +1835,7 @@ // // // + this.labelX11.BackgroundStyle.Class = ""; this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX11.Location = new System.Drawing.Point(10, 93); this.labelX11.Name = "labelX11"; @@ -1898,7 +1896,7 @@ this.dataGridViewX9.ReadOnly = true; this.dataGridViewX9.RowHeadersVisible = false; this.dataGridViewX9.RowTemplate.Height = 23; - this.dataGridViewX9.Size = new System.Drawing.Size(175, 127); + this.dataGridViewX9.Size = new System.Drawing.Size(192, 127); this.dataGridViewX9.TabIndex = 5; this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick); // @@ -1973,6 +1971,7 @@ // // // + this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX15.Location = new System.Drawing.Point(174, 61); this.labelX15.Name = "labelX15"; @@ -2003,6 +2002,7 @@ // // // + this.checkBoxX7.BackgroundStyle.Class = ""; this.checkBoxX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX7.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX7.Location = new System.Drawing.Point(8, 5); @@ -2020,6 +2020,7 @@ // // // + this.checkBoxX8.BackgroundStyle.Class = ""; this.checkBoxX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX8.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX8.Location = new System.Drawing.Point(118, 5); @@ -2037,6 +2038,7 @@ // // // + this.labelX19.BackgroundStyle.Class = ""; this.labelX19.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX19.Location = new System.Drawing.Point(11, 61); this.labelX19.Name = "labelX19"; @@ -2051,6 +2053,7 @@ // // // + this.labelX21.BackgroundStyle.Class = ""; this.labelX21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX21.Location = new System.Drawing.Point(10, 29); this.labelX21.Name = "labelX21"; @@ -2062,6 +2065,7 @@ // // // + this.labelX22.BackgroundStyle.Class = ""; this.labelX22.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX22.Image = ((System.Drawing.Image)(resources.GetObject("labelX22.Image"))); this.labelX22.Location = new System.Drawing.Point(9, 245); @@ -2139,6 +2143,7 @@ // // // + this.labelX28.BackgroundStyle.Class = ""; this.labelX28.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX28.Location = new System.Drawing.Point(181, 104); this.labelX28.Name = "labelX28"; @@ -2154,6 +2159,7 @@ // // // + this.labelX29.BackgroundStyle.Class = ""; this.labelX29.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX29.Location = new System.Drawing.Point(6, 100); this.labelX29.Name = "labelX29"; @@ -2186,6 +2192,7 @@ // // // + this.labelX4.BackgroundStyle.Class = ""; this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Image = ((System.Drawing.Image)(resources.GetObject("labelX4.Image"))); this.labelX4.Location = new System.Drawing.Point(7, 432); @@ -2249,6 +2256,7 @@ // // // + this.labelX5.BackgroundStyle.Class = ""; this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Image = ((System.Drawing.Image)(resources.GetObject("labelX5.Image"))); this.labelX5.Location = new System.Drawing.Point(9, 134); @@ -2383,6 +2391,7 @@ // // // + this.labelX18.BackgroundStyle.Class = ""; this.labelX18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX18.Location = new System.Drawing.Point(181, 71); this.labelX18.Name = "labelX18"; @@ -2413,6 +2422,7 @@ // // // + this.checkBoxSelectPipeline.BackgroundStyle.Class = ""; this.checkBoxSelectPipeline.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectPipeline.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectPipeline.Location = new System.Drawing.Point(8, 9); @@ -2430,6 +2440,7 @@ // // // + this.checkBoxSelectLayer.BackgroundStyle.Class = ""; this.checkBoxSelectLayer.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectLayer.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectLayer.Location = new System.Drawing.Point(117, 9); @@ -2447,6 +2458,7 @@ // // // + this.labelX20.BackgroundStyle.Class = ""; this.labelX20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX20.Location = new System.Drawing.Point(6, 69); this.labelX20.Name = "labelX20"; @@ -2458,6 +2470,7 @@ // // // + this.labelX26.BackgroundStyle.Class = ""; this.labelX26.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX26.Image = ((System.Drawing.Image)(resources.GetObject("labelX26.Image"))); this.labelX26.Location = new System.Drawing.Point(9, 38); @@ -2470,6 +2483,7 @@ // // // + this.labelX27.BackgroundStyle.Class = ""; this.labelX27.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX27.Image = ((System.Drawing.Image)(resources.GetObject("labelX27.Image"))); this.labelX27.Location = new System.Drawing.Point(7, 287); @@ -2482,6 +2496,7 @@ // // // + this.labelX30.BackgroundStyle.Class = ""; this.labelX30.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX30.Location = new System.Drawing.Point(88, 100); this.labelX30.Name = "labelX30"; @@ -2514,6 +2529,7 @@ // // // + this.labelX23.BackgroundStyle.Class = ""; this.labelX23.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX23.Image = ((System.Drawing.Image)(resources.GetObject("labelX23.Image"))); this.labelX23.Location = new System.Drawing.Point(11, 404); @@ -2577,6 +2593,7 @@ // // // + this.labelX2.BackgroundStyle.Class = ""; this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Image = ((System.Drawing.Image)(resources.GetObject("labelX2.Image"))); this.labelX2.Location = new System.Drawing.Point(12, 100); @@ -2703,6 +2720,7 @@ // // // + this.labelX7.BackgroundStyle.Class = ""; this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX7.Location = new System.Drawing.Point(176, 67); this.labelX7.Name = "labelX7"; @@ -2733,6 +2751,7 @@ // // // + this.checkBoxX1.BackgroundStyle.Class = ""; this.checkBoxX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX1.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX1.Location = new System.Drawing.Point(11, 5); @@ -2750,6 +2769,7 @@ // // // + this.checkBoxX2.BackgroundStyle.Class = ""; this.checkBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX2.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX2.Location = new System.Drawing.Point(120, 5); @@ -2767,6 +2787,7 @@ // // // + this.labelX6.BackgroundStyle.Class = ""; this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX6.Location = new System.Drawing.Point(15, 67); this.labelX6.Name = "labelX6"; @@ -2778,6 +2799,7 @@ // // // + this.labelX1.BackgroundStyle.Class = ""; this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Image = ((System.Drawing.Image)(resources.GetObject("labelX1.Image"))); this.labelX1.Location = new System.Drawing.Point(12, 34); @@ -2790,6 +2812,7 @@ // // // + this.labelX3.BackgroundStyle.Class = ""; this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Image = ((System.Drawing.Image)(resources.GetObject("labelX3.Image"))); this.labelX3.Location = new System.Drawing.Point(11, 250); @@ -2800,11 +2823,11 @@ // expandableSplitter1 // this.expandableSplitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -2816,11 +2839,11 @@ this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -2837,7 +2860,6 @@ this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx4.Controls.Add(this.splitContainer1); this.panelEx4.Controls.Add(this.panelOfTable); - this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx4.Location = new System.Drawing.Point(203, 179); this.panelEx4.Name = "panelEx4"; @@ -2878,7 +2900,6 @@ this.panelEx5.Controls.Add(this.panel1); this.panelEx5.Controls.Add(this.panel3); this.panelEx5.Controls.Add(this.panel5); - this.panelEx5.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx5.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx5.Location = new System.Drawing.Point(0, 0); this.panelEx5.Name = "panelEx5"; @@ -2921,7 +2942,6 @@ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.Controls.Add(this.panel2); this.panelEx1.Controls.Add(this.panel4); - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; @@ -2944,7 +2964,6 @@ this.panelOfTable.Controls.Add(this.dataGridViewX1); this.panelOfTable.Controls.Add(this.statusStrip2); this.panelOfTable.Controls.Add(this.expandableSplitter2); - this.panelOfTable.DisabledBackColor = System.Drawing.Color.Empty; this.panelOfTable.Dock = System.Windows.Forms.DockStyle.Bottom; this.panelOfTable.Location = new System.Drawing.Point(0, 414); this.panelOfTable.Name = "panelOfTable"; @@ -3042,12 +3061,12 @@ // expandableSplitter2 // this.expandableSplitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter2.Dock = System.Windows.Forms.DockStyle.Top; this.expandableSplitter2.ExpandableControl = this.panelOfTable; - this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -3059,11 +3078,11 @@ this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -3183,7 +3202,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(149, 290); + this.toolRightMenu.Size = new System.Drawing.Size(153, 312); // // 量算ToolStripMenuItem // @@ -3259,7 +3278,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -4125,8 +4144,6 @@ // superTooltip1 // this.superTooltip1.DefaultFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); - this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.superTooltip1.MinimumTooltipSize = new System.Drawing.Size(150, 50); // // buttonItem16 @@ -4233,12 +4250,13 @@ // // // + this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4255,7 +4273,7 @@ this.ribbonControl1.Location = new System.Drawing.Point(0, 82); this.ribbonControl1.MdiSystemItemVisible = false; this.ribbonControl1.Name = "ribbonControl1"; - this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); this.ribbonControl1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem19}); this.ribbonControl1.Size = new System.Drawing.Size(1328, 97); @@ -4292,21 +4310,23 @@ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel1.Style.Class = ""; this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseDown.Class = ""; this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4315,14 +4335,15 @@ // // // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.BackgroundStyle.Class = ""; this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.ContainerControlProcessDialogKey = true; this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.DragDropSupport = true; this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem87, this.buttonItem88, @@ -4333,20 +4354,21 @@ this.btnlegendSet, this.buttonItem89, this.btnOutputJPG}); - this.ribbonBar21.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 58); + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; // // // + this.ribbonBar21.TitleStyle.Class = ""; this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.TitleVisible = false; // @@ -4436,14 +4458,17 @@ // // // + this.ribbonPanel12.Style.Class = ""; this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseDown.Class = ""; this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseOver.Class = ""; this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel12.TabIndex = 34; this.ribbonPanel12.Visible = false; @@ -4454,18 +4479,18 @@ // // // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.BackgroundStyle.Class = ""; this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.ContainerControlProcessDialogKey = true; this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.DragDropSupport = true; this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem133, this.buttonItem132}); - this.ribbonBar18.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; this.ribbonBar18.Size = new System.Drawing.Size(171, 59); @@ -4474,10 +4499,12 @@ // // // + this.ribbonBar18.TitleStyle.Class = ""; this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.TitleVisible = false; // @@ -4506,14 +4533,15 @@ // // // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.BackgroundStyle.Class = ""; this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.ContainerControlProcessDialogKey = true; this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.DragDropSupport = true; this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem127, this.buttonItem128, @@ -4521,7 +4549,6 @@ this.buttonItem134, this.buttonItem130, this.btn_check_history}); - this.ribbonBar13.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; this.ribbonBar13.Size = new System.Drawing.Size(505, 59); @@ -4530,10 +4557,12 @@ // // // + this.ribbonBar13.TitleStyle.Class = ""; this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.TitleVisible = false; // @@ -4604,14 +4633,17 @@ // // // + this.ribbonPanel5.Style.Class = ""; this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseDown.Class = ""; this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseOver.Class = ""; this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel5.TabIndex = 37; this.ribbonPanel5.Visible = false; @@ -4622,20 +4654,20 @@ // // // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.BackgroundStyle.Class = ""; this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.ContainerControlProcessDialogKey = true; this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.DragDropSupport = true; this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemHX1, this.buttonItemHX2, this.buttonItemDCTP, this.sliderItem3}); - this.ribbonBar2.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; this.ribbonBar2.Size = new System.Drawing.Size(350, 59); @@ -4644,10 +4676,12 @@ // // // + this.ribbonBar2.TitleStyle.Class = ""; this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.TitleVisible = false; // @@ -4701,14 +4735,17 @@ // // // + this.ribbonPanel2.Style.Class = ""; this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseDown.Class = ""; this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; this.ribbonPanel2.Visible = false; @@ -4719,14 +4756,15 @@ // // // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.BackgroundStyle.Class = ""; this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.ContainerControlProcessDialogKey = true; this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.DragDropSupport = true; this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_user_info, this.btn_role_info, @@ -4735,7 +4773,6 @@ this.btn_user_role, this.btn_password_edit, this.buttonItemPasswordReset}); - this.ribbonBar3.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; this.ribbonBar3.Size = new System.Drawing.Size(551, 59); @@ -4744,10 +4781,12 @@ // // // + this.ribbonBar3.TitleStyle.Class = ""; this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.TitleVisible = false; // @@ -4823,20 +4862,24 @@ this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel15.Style.Class = ""; this.ribbonPanel15.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseDown.Class = ""; this.ribbonPanel15.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4844,14 +4887,15 @@ // // // + this.ribbonBar20.BackgroundMouseOverStyle.Class = ""; this.ribbonBar20.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.BackgroundStyle.Class = ""; this.ribbonBar20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.ContainerControlProcessDialogKey = true; this.ribbonBar20.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar20.DragDropSupport = true; this.ribbonBar20.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSH, this.buttonItemSJGL, @@ -4865,19 +4909,20 @@ this.buttonItemBJ, this.buttonItemSearch, this.buttonItemBZ}); - this.ribbonBar20.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(814, 58); + this.ribbonBar20.Size = new System.Drawing.Size(814, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // // // + this.ribbonBar20.TitleStyle.Class = ""; this.ribbonBar20.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.TitleStyleMouseOver.Class = ""; this.ribbonBar20.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.TitleVisible = false; // @@ -5070,18 +5115,21 @@ // this.buttonItem10.Name = "buttonItem10"; this.buttonItem10.Text = "管线入库-高程"; + this.buttonItem10.Visible = false; this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // // buttonItem11 // this.buttonItem11.Name = "buttonItem11"; this.buttonItem11.Text = "附属物入库-高程"; + this.buttonItem11.Visible = false; this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // // buttonItem12 // this.buttonItem12.Name = "buttonItem12"; this.buttonItem12.Text = "特征管点入库-高程"; + this.buttonItem12.Visible = false; this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // // buttonItemSJGL5 @@ -6226,14 +6274,17 @@ // // // + this.ribbonPanel4.Style.Class = ""; this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseDown.Class = ""; this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseOver.Class = ""; this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel4.TabIndex = 36; this.ribbonPanel4.Visible = false; @@ -6244,17 +6295,17 @@ // // // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.BackgroundStyle.Class = ""; this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.ContainerControlProcessDialogKey = true; this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.DragDropSupport = true; this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_document_info}); - this.ribbonBar1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; this.ribbonBar1.Size = new System.Drawing.Size(88, 59); @@ -6263,10 +6314,12 @@ // // // + this.ribbonBar1.TitleStyle.Class = ""; this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.TitleVisible = false; // @@ -6291,14 +6344,17 @@ // // // + this.ribbonPanel6.Style.Class = ""; this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseDown.Class = ""; this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseOver.Class = ""; this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel6.TabIndex = 38; this.ribbonPanel6.Visible = false; @@ -6309,21 +6365,21 @@ // // // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.BackgroundStyle.Class = ""; this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.ContainerControlProcessDialogKey = true; this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.DragDropSupport = true; this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSPSZ, this.buttonItem8, this.buttonItemLocation, this.sliderItem2, this.buttonItemGBJC}); - this.ribbonBar6.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; this.ribbonBar6.Size = new System.Drawing.Size(427, 59); @@ -6332,10 +6388,12 @@ // // // + this.ribbonBar6.TitleStyle.Class = ""; this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.TitleVisible = false; // @@ -6388,6 +6446,7 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6438,7 +6497,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -7045,7 +7103,7 @@ private DevComponents.DotNetBar.LabelX labelX25; private DevComponents.DotNetBar.PanelEx panelEx3; private System.Windows.Forms.TreeView layerSensorTree; - // private System.Windows.Forms.TreeView layerTree; + // private System.Windows.Forms.TreeView layerTree; private MyTreeView layerTree; private DevComponents.DotNetBar.ButtonX buttonX7; private DevComponents.DotNetBar.ButtonX buttonX16; diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config new file mode 100644 index 0000000..f4cbe66 --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe.config @@ -0,0 +1,32 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb index c7cb8c3..c0fad4a 100644 --- a/bin/x86/Debug/Cyberpipe.pdb +++ b/bin/x86/Debug/Cyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index 3dc3245..1fc46d0 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5f45ee7..9615fbf 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt index b8d8198..c6fbef0 100644 --- a/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -342,8 +342,186 @@ F:\predator\codeReview\GHFX_SZ_64\obj\x64\Debug\Cyberpipe.pdb F:\predator\codeReview\GHFX_SZ_64\bin\x86\Debug\office.dll F:\predator\codeReview\GHFX_SZ_64\bin\x86\Debug\office.xml -D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe.config +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.csproj.ResolveComReference.cache +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.pdb +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\office.dll +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\office.xml +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FormDocumentManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmAddYuBiZiShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGBJCresult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmWait.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\PipeLine.Forms.FrmAddPipelineCoordinate.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGongShuiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmMnModify.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPipelineModelDataOneStep.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmShLayers.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmShRK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmTongXunAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmAddWellShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccess.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoriesgather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoryAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddValve.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddWellShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddYuBiZiShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAllWorkWellStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAnalysisGuiHuaResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPP.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPAuditor.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPFORASK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPFORASKReason.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPregion.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAppUSER.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAppUSERRESET.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBACKORACLE.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBSQDuoBianXingStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBSQStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBufferAnalysisBSQ.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmChangePassword.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCheckHistory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCodingQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCompareFeature.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCreateUser.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCustomLabel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDataBaseOpt.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDatabaseParaSetting2.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDbManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDocumentEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDownloadProgress.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmExportCADS.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlySetDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBasicQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBoosterValvers.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBufferAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDatabaseParaSetting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DigFillAnalysisDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBaseLineProfillAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGenAndFaMenTopu.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGenTopo.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCloseValves.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDigPitSetting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFittingQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlow.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlyToPosition.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFolderSelecter.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFTAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGBJC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGenAndFaMenTopu.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGHRK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHotFuncStat.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHotFuncStatTitle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmKeywordQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLayerControl.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogDescription.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogin.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogOper.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMDDictory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadata.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadataOutput.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadataStat.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMultiPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmOperMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPerm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPermMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeDeepstatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeDiametergather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Frmpipediameterstatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeMaterialGather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPaiShuiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmProject.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmRanQiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddPipeFitting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAllPipelineStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDiameterQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFWPipeLineStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRedlineResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleInfoManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleRescManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmShResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoManger.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoPassword.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmThreeOracle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRole.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValveStatistics.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMaterialSel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.frmPipeSetEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmProfileAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPropertiesMarker.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmOper.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQueryHistory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQueryMessage.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQuerySensorAlarm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegion.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionType.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionTypeMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRESC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRESCMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRole.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetGoalLayer.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmTackPolygonDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHDMAnalysis3.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLineCoordinate.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQuerySQL.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserAdd.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRepo.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRepoMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValiData.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmYJSHTC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Frm_password_reset.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSfiles.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSinout.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSProjedits.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.MainFrm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCreateTunnel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCitySevenLineType.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile_AddField.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile_DeleteField.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmExportVector.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFloodAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCityServerLineAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMarker.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPipelineIndented.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMFiles.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMInout.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMTitle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMProjedit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Properties.Resources.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetLatLonPos.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSceneLightSet.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetFlytoPos.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoriesSensor.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValiDataShowErrorMessage.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddInstrument.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.SysRescInfoManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.read.1.tlog +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.write.1.tlog +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.exe +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.pdb +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe.config D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.csproj.ResolveComReference.cache +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.exe +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.pdb +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\office.dll +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\office.xml +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources @@ -507,3 +685,4 @@ D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.SysRescInfoManager.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.read.1.tlog D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.write.1.tlog +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.pdb diff --git a/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache b/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache index b4283e0..b05ca27 100644 --- a/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache +++ b/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 4f0593d..fe2b7f8 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -9,30 +9,45 @@ using GeoScene.Data; using GeoScene.Globe; using DevComponents.DotNetBar; +using System.Collections; namespace Cyberpipe { public partial class FrmAllWorkWellStatis : DevComponents.DotNetBar.Office2007Form { - Dictionary workWellLengthAndType = new Dictionary(); - List list = new List(); + + private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; + private Dictionary map = null; DataGridView dataGridViewX1; ToolStripStatusLabel toolStripNumbers; GSOGlobeControl globeControl1; PanelEx panel; - public FrmAllWorkWellStatis(Dictionary wellLen, List _list, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) + //TODOLIST：用晓伟的代理进行操作，功能拆分细化 + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) { InitializeComponent(); panel = p; - workWellLengthAndType = wellLen; - list = _list; dataGridViewX1 = dataGridViewX11; toolStripNumbers = toolStripNumbers1; - globeControl1 = ctl; + map = getAccsMap(polygon); + + } + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, MainFrm.DataGridViewDelegate InitDataGridViewX1, GSOGlobeControl ctl) + { + InitializeComponent(); + globeControl1 = ctl; + m_InitDataGridViewX1 = InitDataGridViewX1; + map = getAccsMap(polygon); + } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) { + drawChart(); + } + + public void drawChart() + { try { // Set axis title @@ -49,6 +64,11 @@ chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; + Dictionary workWellLengthAndType = new Dictionary(); + foreach (KeyValuePair kv in map) + { + workWellLengthAndType.Add(kv.Key, kv.Value.Length); + } chartAllAreaPipeline.Series["井盖"].Points.DataBindXY(workWellLengthAndType.Keys, workWellLengthAndType.Values); for (int m = 0; m < workWellLengthAndType.Values.Count; m++) { @@ -71,11 +91,11 @@ if (indexHit >= 0) { - GSOFeatures fs = list[indexHit]; + //GSOFeatures fs = list[indexHit]; string sql = ""; string pipetype = chartAllAreaPipeline.Series["井盖"].Points[indexHit].AxisLabel; - + GSOFeatures fs = map[pipetype]; string layername = ""; if (pipetype.EndsWith("窖井") || pipetype.EndsWith("表井") || (pipetype.EndsWith("窨井")) || pipetype.EndsWith("孔") || @@ -93,6 +113,23 @@ { return; } + //从图层获取datatable数据,不涉及数据库操作，速度会快一些 + //string [] fieldNames = GSOFeatureUtils.getFields(layername, globeControl1); + //DataTable dt = GSOFeatureUtils.convertGSOFeatures2DataTable(fs,fieldNames); + //if (dt.Rows.Count > 0) + //{ + // dataGridViewX1.DataSource = dt; + // panel.Visible = true; + // toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //} + //else + //{ + // panel.Visible = false; + // dataGridViewX1.DataSource = null; + // dataGridViewX1.Refresh(); + // toolStripNumbers.Text = "类型："; + //} + //数据库获取数据 if (fs.Length > 0) { sql = "select " + getpipeLineFields.getFields(layername, globeControl1) + " from " + layer.Name; @@ -120,8 +157,8 @@ { dataGridViewX1.DataSource = dt; panel.Visible = true; - //toolStripNumbers.Text = " 井盖类型：" + MainFrm.m_CurrentQueryLayer + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + string strLable = toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //m_InitDataGridViewX1(dt, strLable, "", true); } else { @@ -131,7 +168,6 @@ toolStripNumbers.Text = "类型："; } - //} } @@ -174,7 +210,7 @@ } } } - + //m_InitDataGridViewX1(null,"","" , false); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } @@ -183,5 +219,63 @@ PATM_Forms.F_PATMTitle frm = new PATM_Forms.F_PATMTitle("S", chartAllAreaPipeline); frm.Show(); } + + //获取指定layer类型的附属物名称列表 + public string[] getLayerAccNames(string layerType) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(layerType + "管线附属物"); + if (layer == null) return null; + + string sql = "select 附属物名称 from " + layerType + "管线附属物 group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layerType + "管线附属物"); + if (dataset == null) return null; + + int count = dataset.Tables[0].Rows.Count; + + + string[] result = new string[count]; + for (int i = 0; i < count; i++) + { + result[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return result; + } + + /// + /// 获取区域内各图层的井、孔、蓖的map + /// + /// 区域 + /// 要查找的附属物名称数组、如井、孔、蓖 + /// 返回值为：<图层+附属物名称,附属物列表> + + public Dictionary getAccsMap(GSOGeoPolygon3D polygon) + { + //List list = new List(); + Dictionary map = new Dictionary(); + ArrayList listpt = Utility.LayerNamesList; + if (listpt == null || listpt.Count == 0) return null; + FeatureStatisticsService service = new FeatureStatisticsService(); + for (int i = 0; i < listpt.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listpt[i] + "管线附属物"); + string[] accNames = getLayerAccNames(listpt[i] as string); + if (accNames == null || accNames.Length == 0) continue;//排除不合法的值 + for (int j = 0; j < accNames.Length; j++) + { + if (accNames[j].Contains("井") || accNames[j].Contains("孔") || accNames[j].Contains("篦")) + { + + GSOFeatures features = service.Intersect_PointLayerByType(polygon, layer, accNames[j]); + if (features == null) continue; + map.Add(listpt[i] + accNames[j], features); + } + + } + + } + return map; + + } + } } diff --git a/MainFrm.cs b/MainFrm.cs index ac2614d..b584749 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2951,35 +2951,35 @@ break; case "workwellquery": - workWellLen.Clear(); - List listWell = new List(); - //找到所有井 - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //workWellLen.Clear(); + //List listWell = new List(); + ////找到所有井 + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - listWell.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // listWell.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(workWellLen, listWell, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(polygon, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frmWell.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -9740,37 +9740,37 @@ private void buttonItemTJ3_ALL_Click(object sender, EventArgs e) { //日志记录 - LogManager.saveLog(Utility.userName, "井盖数量统计"); + //LogManager.saveLog(Utility.userName, "井盖数量统计"); - workWellLen.Clear(); - List list = new List(); + //workWellLen.Clear(); + //List list = new List(); - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - list.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // list.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(workWellLen, list, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(null, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frm.Show(this); } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ae24fb9..5c2bb7f 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -706,7 +706,6 @@ this.dotNetBarManager1.BottomDockSite = this.dockSite4; this.dotNetBarManager1.EnableFullSizeDock = false; this.dotNetBarManager1.LeftDockSite = this.dockSite1; - this.dotNetBarManager1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.dotNetBarManager1.ParentForm = null; this.dotNetBarManager1.RightDockSite = this.dockSite2; this.dotNetBarManager1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003; @@ -799,7 +798,6 @@ // styleManager1 // this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Office2010Blue; - this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(87)))), ((int)(((byte)(154)))))); // // sideBarPanelItem1 // @@ -848,7 +846,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -894,6 +892,7 @@ this.ribbonTabItemGroup1.Style.BorderRightWidth = 1; this.ribbonTabItemGroup1.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ribbonTabItemGroup1.Style.BorderTopWidth = 1; + this.ribbonTabItemGroup1.Style.Class = ""; this.ribbonTabItemGroup1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonTabItemGroup1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.ribbonTabItemGroup1.Style.TextColor = System.Drawing.Color.White; @@ -906,6 +905,7 @@ // // // + this.galleryContainer2.BackgroundStyle.Class = ""; this.galleryContainer2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer2.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer2.Name = "galleryContainer2"; @@ -915,10 +915,6 @@ this.buttonItem39}); this.galleryContainer2.Text = "断面分析"; // - // - // - this.galleryContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem38 // this.buttonItem38.Name = "buttonItem38"; @@ -939,16 +935,13 @@ // // // + this.galleryContainer3.BackgroundStyle.Class = ""; this.galleryContainer3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer3.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer3.Name = "galleryContainer3"; this.galleryContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem3}); // - // - // - this.galleryContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem3 // this.buttonItem3.Name = "buttonItem3"; @@ -959,6 +952,7 @@ // // // + this.galleryContainer4.BackgroundStyle.Class = ""; this.galleryContainer4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer4.MinimumSize = new System.Drawing.Size(150, 58); this.galleryContainer4.Name = "galleryContainer4"; @@ -970,10 +964,6 @@ this.buttonItem46}); this.galleryContainer4.Text = "断面分析"; // - // - // - this.galleryContainer4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem40 // this.buttonItem40.Name = "buttonItem40"; @@ -1004,6 +994,7 @@ // // // + this.galleryContainer5.BackgroundStyle.Class = ""; this.galleryContainer5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer5.MinimumSize = new System.Drawing.Size(80, 58); this.galleryContainer5.Name = "galleryContainer5"; @@ -1011,10 +1002,6 @@ this.buttonItem44, this.buttonItem43}); // - // - // - this.galleryContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem44 // this.buttonItem44.Name = "buttonItem44"; @@ -1030,16 +1017,13 @@ // // // + this.galleryContainer6.BackgroundStyle.Class = ""; this.galleryContainer6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer6.MinimumSize = new System.Drawing.Size(70, 58); this.galleryContainer6.Name = "galleryContainer6"; this.galleryContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem48}); // - // - // - this.galleryContainer6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem48 // this.buttonItem48.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right; @@ -1073,7 +1057,6 @@ this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx3.Controls.Add(this.layerSensorTree); - this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx3.Location = new System.Drawing.Point(54, 113); this.panelEx3.Name = "panelEx3"; this.panelEx3.Size = new System.Drawing.Size(200, 161); @@ -1188,6 +1171,7 @@ // // // + this.labelX25.BackgroundStyle.Class = ""; this.labelX25.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX25.Location = new System.Drawing.Point(7, 364); this.labelX25.Name = "labelX25"; @@ -1252,6 +1236,7 @@ // // // + this.labelX8.BackgroundStyle.Class = ""; this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX8.Location = new System.Drawing.Point(11, 60); this.labelX8.Name = "labelX8"; @@ -1384,6 +1369,7 @@ // // // + this.checkBoxX3.BackgroundStyle.Class = ""; this.checkBoxX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX3.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX3.Location = new System.Drawing.Point(11, 9); @@ -1401,6 +1387,7 @@ // // // + this.checkBoxX4.BackgroundStyle.Class = ""; this.checkBoxX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX4.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX4.Location = new System.Drawing.Point(110, 9); @@ -1418,6 +1405,7 @@ // // // + this.labelX13.BackgroundStyle.Class = ""; this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX13.Location = new System.Drawing.Point(11, 32); this.labelX13.Name = "labelX13"; @@ -1432,6 +1420,7 @@ // // // + this.labelX14.BackgroundStyle.Class = ""; this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX14.Location = new System.Drawing.Point(10, 204); this.labelX14.Name = "labelX14"; @@ -1509,7 +1498,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(181, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(198, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -1534,6 +1523,7 @@ // // // + this.labelX9.BackgroundStyle.Class = ""; this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX9.Location = new System.Drawing.Point(9, 85); this.labelX9.Name = "labelX9"; @@ -1592,7 +1582,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(180, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(197, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -1635,6 +1625,7 @@ // // // + this.labelX10.BackgroundStyle.Class = ""; this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX10.Location = new System.Drawing.Point(172, 54); this.labelX10.Name = "labelX10"; @@ -1665,6 +1656,7 @@ // // // + this.checkBoxX5.BackgroundStyle.Class = ""; this.checkBoxX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX5.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX5.Location = new System.Drawing.Point(19, 4); @@ -1682,6 +1674,7 @@ // // // + this.checkBoxX6.BackgroundStyle.Class = ""; this.checkBoxX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX6.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX6.Location = new System.Drawing.Point(114, 4); @@ -1699,6 +1692,7 @@ // // // + this.labelX12.BackgroundStyle.Class = ""; this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX12.Location = new System.Drawing.Point(6, 57); this.labelX12.Name = "labelX12"; @@ -1713,6 +1707,7 @@ // // // + this.labelX16.BackgroundStyle.Class = ""; this.labelX16.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX16.Location = new System.Drawing.Point(6, 28); this.labelX16.Name = "labelX16"; @@ -1727,6 +1722,7 @@ // // // + this.labelX17.BackgroundStyle.Class = ""; this.labelX17.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX17.Location = new System.Drawing.Point(8, 235); this.labelX17.Name = "labelX17"; @@ -1772,6 +1768,7 @@ // // // + this.labelX24.BackgroundStyle.Class = ""; this.labelX24.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX24.Image = ((System.Drawing.Image)(resources.GetObject("labelX24.Image"))); this.labelX24.Location = new System.Drawing.Point(7, 403); @@ -1804,7 +1801,7 @@ this.dataGridViewX8.ReadOnly = true; this.dataGridViewX8.RowHeadersVisible = false; this.dataGridViewX8.RowTemplate.Height = 23; - this.dataGridViewX8.Size = new System.Drawing.Size(176, 92); + this.dataGridViewX8.Size = new System.Drawing.Size(193, 92); this.dataGridViewX8.TabIndex = 11; // // dataGridViewTextBoxColumn12 @@ -1838,6 +1835,7 @@ // // // + this.labelX11.BackgroundStyle.Class = ""; this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX11.Location = new System.Drawing.Point(10, 93); this.labelX11.Name = "labelX11"; @@ -1898,7 +1896,7 @@ this.dataGridViewX9.ReadOnly = true; this.dataGridViewX9.RowHeadersVisible = false; this.dataGridViewX9.RowTemplate.Height = 23; - this.dataGridViewX9.Size = new System.Drawing.Size(175, 127); + this.dataGridViewX9.Size = new System.Drawing.Size(192, 127); this.dataGridViewX9.TabIndex = 5; this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick); // @@ -1973,6 +1971,7 @@ // // // + this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX15.Location = new System.Drawing.Point(174, 61); this.labelX15.Name = "labelX15"; @@ -2003,6 +2002,7 @@ // // // + this.checkBoxX7.BackgroundStyle.Class = ""; this.checkBoxX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX7.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX7.Location = new System.Drawing.Point(8, 5); @@ -2020,6 +2020,7 @@ // // // + this.checkBoxX8.BackgroundStyle.Class = ""; this.checkBoxX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX8.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX8.Location = new System.Drawing.Point(118, 5); @@ -2037,6 +2038,7 @@ // // // + this.labelX19.BackgroundStyle.Class = ""; this.labelX19.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX19.Location = new System.Drawing.Point(11, 61); this.labelX19.Name = "labelX19"; @@ -2051,6 +2053,7 @@ // // // + this.labelX21.BackgroundStyle.Class = ""; this.labelX21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX21.Location = new System.Drawing.Point(10, 29); this.labelX21.Name = "labelX21"; @@ -2062,6 +2065,7 @@ // // // + this.labelX22.BackgroundStyle.Class = ""; this.labelX22.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX22.Image = ((System.Drawing.Image)(resources.GetObject("labelX22.Image"))); this.labelX22.Location = new System.Drawing.Point(9, 245); @@ -2139,6 +2143,7 @@ // // // + this.labelX28.BackgroundStyle.Class = ""; this.labelX28.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX28.Location = new System.Drawing.Point(181, 104); this.labelX28.Name = "labelX28"; @@ -2154,6 +2159,7 @@ // // // + this.labelX29.BackgroundStyle.Class = ""; this.labelX29.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX29.Location = new System.Drawing.Point(6, 100); this.labelX29.Name = "labelX29"; @@ -2186,6 +2192,7 @@ // // // + this.labelX4.BackgroundStyle.Class = ""; this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Image = ((System.Drawing.Image)(resources.GetObject("labelX4.Image"))); this.labelX4.Location = new System.Drawing.Point(7, 432); @@ -2249,6 +2256,7 @@ // // // + this.labelX5.BackgroundStyle.Class = ""; this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Image = ((System.Drawing.Image)(resources.GetObject("labelX5.Image"))); this.labelX5.Location = new System.Drawing.Point(9, 134); @@ -2383,6 +2391,7 @@ // // // + this.labelX18.BackgroundStyle.Class = ""; this.labelX18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX18.Location = new System.Drawing.Point(181, 71); this.labelX18.Name = "labelX18"; @@ -2413,6 +2422,7 @@ // // // + this.checkBoxSelectPipeline.BackgroundStyle.Class = ""; this.checkBoxSelectPipeline.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectPipeline.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectPipeline.Location = new System.Drawing.Point(8, 9); @@ -2430,6 +2440,7 @@ // // // + this.checkBoxSelectLayer.BackgroundStyle.Class = ""; this.checkBoxSelectLayer.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectLayer.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectLayer.Location = new System.Drawing.Point(117, 9); @@ -2447,6 +2458,7 @@ // // // + this.labelX20.BackgroundStyle.Class = ""; this.labelX20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX20.Location = new System.Drawing.Point(6, 69); this.labelX20.Name = "labelX20"; @@ -2458,6 +2470,7 @@ // // // + this.labelX26.BackgroundStyle.Class = ""; this.labelX26.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX26.Image = ((System.Drawing.Image)(resources.GetObject("labelX26.Image"))); this.labelX26.Location = new System.Drawing.Point(9, 38); @@ -2470,6 +2483,7 @@ // // // + this.labelX27.BackgroundStyle.Class = ""; this.labelX27.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX27.Image = ((System.Drawing.Image)(resources.GetObject("labelX27.Image"))); this.labelX27.Location = new System.Drawing.Point(7, 287); @@ -2482,6 +2496,7 @@ // // // + this.labelX30.BackgroundStyle.Class = ""; this.labelX30.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX30.Location = new System.Drawing.Point(88, 100); this.labelX30.Name = "labelX30"; @@ -2514,6 +2529,7 @@ // // // + this.labelX23.BackgroundStyle.Class = ""; this.labelX23.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX23.Image = ((System.Drawing.Image)(resources.GetObject("labelX23.Image"))); this.labelX23.Location = new System.Drawing.Point(11, 404); @@ -2577,6 +2593,7 @@ // // // + this.labelX2.BackgroundStyle.Class = ""; this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Image = ((System.Drawing.Image)(resources.GetObject("labelX2.Image"))); this.labelX2.Location = new System.Drawing.Point(12, 100); @@ -2703,6 +2720,7 @@ // // // + this.labelX7.BackgroundStyle.Class = ""; this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX7.Location = new System.Drawing.Point(176, 67); this.labelX7.Name = "labelX7"; @@ -2733,6 +2751,7 @@ // // // + this.checkBoxX1.BackgroundStyle.Class = ""; this.checkBoxX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX1.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX1.Location = new System.Drawing.Point(11, 5); @@ -2750,6 +2769,7 @@ // // // + this.checkBoxX2.BackgroundStyle.Class = ""; this.checkBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX2.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX2.Location = new System.Drawing.Point(120, 5); @@ -2767,6 +2787,7 @@ // // // + this.labelX6.BackgroundStyle.Class = ""; this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX6.Location = new System.Drawing.Point(15, 67); this.labelX6.Name = "labelX6"; @@ -2778,6 +2799,7 @@ // // // + this.labelX1.BackgroundStyle.Class = ""; this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Image = ((System.Drawing.Image)(resources.GetObject("labelX1.Image"))); this.labelX1.Location = new System.Drawing.Point(12, 34); @@ -2790,6 +2812,7 @@ // // // + this.labelX3.BackgroundStyle.Class = ""; this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Image = ((System.Drawing.Image)(resources.GetObject("labelX3.Image"))); this.labelX3.Location = new System.Drawing.Point(11, 250); @@ -2800,11 +2823,11 @@ // expandableSplitter1 // this.expandableSplitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -2816,11 +2839,11 @@ this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -2837,7 +2860,6 @@ this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx4.Controls.Add(this.splitContainer1); this.panelEx4.Controls.Add(this.panelOfTable); - this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx4.Location = new System.Drawing.Point(203, 179); this.panelEx4.Name = "panelEx4"; @@ -2878,7 +2900,6 @@ this.panelEx5.Controls.Add(this.panel1); this.panelEx5.Controls.Add(this.panel3); this.panelEx5.Controls.Add(this.panel5); - this.panelEx5.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx5.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx5.Location = new System.Drawing.Point(0, 0); this.panelEx5.Name = "panelEx5"; @@ -2921,7 +2942,6 @@ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.Controls.Add(this.panel2); this.panelEx1.Controls.Add(this.panel4); - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; @@ -2944,7 +2964,6 @@ this.panelOfTable.Controls.Add(this.dataGridViewX1); this.panelOfTable.Controls.Add(this.statusStrip2); this.panelOfTable.Controls.Add(this.expandableSplitter2); - this.panelOfTable.DisabledBackColor = System.Drawing.Color.Empty; this.panelOfTable.Dock = System.Windows.Forms.DockStyle.Bottom; this.panelOfTable.Location = new System.Drawing.Point(0, 414); this.panelOfTable.Name = "panelOfTable"; @@ -3042,12 +3061,12 @@ // expandableSplitter2 // this.expandableSplitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter2.Dock = System.Windows.Forms.DockStyle.Top; this.expandableSplitter2.ExpandableControl = this.panelOfTable; - this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -3059,11 +3078,11 @@ this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -3183,7 +3202,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(149, 290); + this.toolRightMenu.Size = new System.Drawing.Size(153, 312); // // 量算ToolStripMenuItem // @@ -3259,7 +3278,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -4125,8 +4144,6 @@ // superTooltip1 // this.superTooltip1.DefaultFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); - this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.superTooltip1.MinimumTooltipSize = new System.Drawing.Size(150, 50); // // buttonItem16 @@ -4233,12 +4250,13 @@ // // // + this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4255,7 +4273,7 @@ this.ribbonControl1.Location = new System.Drawing.Point(0, 82); this.ribbonControl1.MdiSystemItemVisible = false; this.ribbonControl1.Name = "ribbonControl1"; - this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); this.ribbonControl1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem19}); this.ribbonControl1.Size = new System.Drawing.Size(1328, 97); @@ -4292,21 +4310,23 @@ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel1.Style.Class = ""; this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseDown.Class = ""; this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4315,14 +4335,15 @@ // // // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.BackgroundStyle.Class = ""; this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.ContainerControlProcessDialogKey = true; this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.DragDropSupport = true; this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem87, this.buttonItem88, @@ -4333,20 +4354,21 @@ this.btnlegendSet, this.buttonItem89, this.btnOutputJPG}); - this.ribbonBar21.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 58); + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; // // // + this.ribbonBar21.TitleStyle.Class = ""; this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.TitleVisible = false; // @@ -4436,14 +4458,17 @@ // // // + this.ribbonPanel12.Style.Class = ""; this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseDown.Class = ""; this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseOver.Class = ""; this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel12.TabIndex = 34; this.ribbonPanel12.Visible = false; @@ -4454,18 +4479,18 @@ // // // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.BackgroundStyle.Class = ""; this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.ContainerControlProcessDialogKey = true; this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.DragDropSupport = true; this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem133, this.buttonItem132}); - this.ribbonBar18.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; this.ribbonBar18.Size = new System.Drawing.Size(171, 59); @@ -4474,10 +4499,12 @@ // // // + this.ribbonBar18.TitleStyle.Class = ""; this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.TitleVisible = false; // @@ -4506,14 +4533,15 @@ // // // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.BackgroundStyle.Class = ""; this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.ContainerControlProcessDialogKey = true; this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.DragDropSupport = true; this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem127, this.buttonItem128, @@ -4521,7 +4549,6 @@ this.buttonItem134, this.buttonItem130, this.btn_check_history}); - this.ribbonBar13.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; this.ribbonBar13.Size = new System.Drawing.Size(505, 59); @@ -4530,10 +4557,12 @@ // // // + this.ribbonBar13.TitleStyle.Class = ""; this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.TitleVisible = false; // @@ -4604,14 +4633,17 @@ // // // + this.ribbonPanel5.Style.Class = ""; this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseDown.Class = ""; this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseOver.Class = ""; this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel5.TabIndex = 37; this.ribbonPanel5.Visible = false; @@ -4622,20 +4654,20 @@ // // // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.BackgroundStyle.Class = ""; this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.ContainerControlProcessDialogKey = true; this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.DragDropSupport = true; this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemHX1, this.buttonItemHX2, this.buttonItemDCTP, this.sliderItem3}); - this.ribbonBar2.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; this.ribbonBar2.Size = new System.Drawing.Size(350, 59); @@ -4644,10 +4676,12 @@ // // // + this.ribbonBar2.TitleStyle.Class = ""; this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.TitleVisible = false; // @@ -4701,14 +4735,17 @@ // // // + this.ribbonPanel2.Style.Class = ""; this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseDown.Class = ""; this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; this.ribbonPanel2.Visible = false; @@ -4719,14 +4756,15 @@ // // // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.BackgroundStyle.Class = ""; this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.ContainerControlProcessDialogKey = true; this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.DragDropSupport = true; this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_user_info, this.btn_role_info, @@ -4735,7 +4773,6 @@ this.btn_user_role, this.btn_password_edit, this.buttonItemPasswordReset}); - this.ribbonBar3.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; this.ribbonBar3.Size = new System.Drawing.Size(551, 59); @@ -4744,10 +4781,12 @@ // // // + this.ribbonBar3.TitleStyle.Class = ""; this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.TitleVisible = false; // @@ -4823,20 +4862,24 @@ this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel15.Style.Class = ""; this.ribbonPanel15.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseDown.Class = ""; this.ribbonPanel15.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4844,14 +4887,15 @@ // // // + this.ribbonBar20.BackgroundMouseOverStyle.Class = ""; this.ribbonBar20.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.BackgroundStyle.Class = ""; this.ribbonBar20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.ContainerControlProcessDialogKey = true; this.ribbonBar20.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar20.DragDropSupport = true; this.ribbonBar20.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSH, this.buttonItemSJGL, @@ -4865,19 +4909,20 @@ this.buttonItemBJ, this.buttonItemSearch, this.buttonItemBZ}); - this.ribbonBar20.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(814, 58); + this.ribbonBar20.Size = new System.Drawing.Size(814, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // // // + this.ribbonBar20.TitleStyle.Class = ""; this.ribbonBar20.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.TitleStyleMouseOver.Class = ""; this.ribbonBar20.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.TitleVisible = false; // @@ -5070,18 +5115,21 @@ // this.buttonItem10.Name = "buttonItem10"; this.buttonItem10.Text = "管线入库-高程"; + this.buttonItem10.Visible = false; this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // // buttonItem11 // this.buttonItem11.Name = "buttonItem11"; this.buttonItem11.Text = "附属物入库-高程"; + this.buttonItem11.Visible = false; this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // // buttonItem12 // this.buttonItem12.Name = "buttonItem12"; this.buttonItem12.Text = "特征管点入库-高程"; + this.buttonItem12.Visible = false; this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // // buttonItemSJGL5 @@ -6226,14 +6274,17 @@ // // // + this.ribbonPanel4.Style.Class = ""; this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseDown.Class = ""; this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseOver.Class = ""; this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel4.TabIndex = 36; this.ribbonPanel4.Visible = false; @@ -6244,17 +6295,17 @@ // // // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.BackgroundStyle.Class = ""; this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.ContainerControlProcessDialogKey = true; this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.DragDropSupport = true; this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_document_info}); - this.ribbonBar1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; this.ribbonBar1.Size = new System.Drawing.Size(88, 59); @@ -6263,10 +6314,12 @@ // // // + this.ribbonBar1.TitleStyle.Class = ""; this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.TitleVisible = false; // @@ -6291,14 +6344,17 @@ // // // + this.ribbonPanel6.Style.Class = ""; this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseDown.Class = ""; this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseOver.Class = ""; this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel6.TabIndex = 38; this.ribbonPanel6.Visible = false; @@ -6309,21 +6365,21 @@ // // // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.BackgroundStyle.Class = ""; this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.ContainerControlProcessDialogKey = true; this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.DragDropSupport = true; this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSPSZ, this.buttonItem8, this.buttonItemLocation, this.sliderItem2, this.buttonItemGBJC}); - this.ribbonBar6.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; this.ribbonBar6.Size = new System.Drawing.Size(427, 59); @@ -6332,10 +6388,12 @@ // // // + this.ribbonBar6.TitleStyle.Class = ""; this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.TitleVisible = false; // @@ -6388,6 +6446,7 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6438,7 +6497,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -7045,7 +7103,7 @@ private DevComponents.DotNetBar.LabelX labelX25; private DevComponents.DotNetBar.PanelEx panelEx3; private System.Windows.Forms.TreeView layerSensorTree; - // private System.Windows.Forms.TreeView layerTree; + // private System.Windows.Forms.TreeView layerTree; private MyTreeView layerTree; private DevComponents.DotNetBar.ButtonX buttonX7; private DevComponents.DotNetBar.ButtonX buttonX16; diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config new file mode 100644 index 0000000..f4cbe66 --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe.config @@ -0,0 +1,32 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb index c7cb8c3..c0fad4a 100644 --- a/bin/x86/Debug/Cyberpipe.pdb +++ b/bin/x86/Debug/Cyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index 3dc3245..1fc46d0 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5f45ee7..9615fbf 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt index b8d8198..c6fbef0 100644 --- a/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -342,8 +342,186 @@ F:\predator\codeReview\GHFX_SZ_64\obj\x64\Debug\Cyberpipe.pdb F:\predator\codeReview\GHFX_SZ_64\bin\x86\Debug\office.dll F:\predator\codeReview\GHFX_SZ_64\bin\x86\Debug\office.xml -D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe.config +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.csproj.ResolveComReference.cache +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.pdb +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\office.dll +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\office.xml +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FormDocumentManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmAddYuBiZiShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGBJCresult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmWait.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\PipeLine.Forms.FrmAddPipelineCoordinate.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGongShuiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmMnModify.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPipelineModelDataOneStep.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmShLayers.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmShRK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmTongXunAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmAddWellShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccess.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoriesgather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoryAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddValve.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddWellShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddYuBiZiShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAllWorkWellStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAnalysisGuiHuaResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPP.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPAuditor.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPFORASK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPFORASKReason.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPregion.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAppUSER.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAppUSERRESET.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBACKORACLE.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBSQDuoBianXingStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBSQStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBufferAnalysisBSQ.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmChangePassword.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCheckHistory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCodingQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCompareFeature.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCreateUser.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCustomLabel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDataBaseOpt.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDatabaseParaSetting2.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDbManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDocumentEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDownloadProgress.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmExportCADS.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlySetDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBasicQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBoosterValvers.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBufferAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDatabaseParaSetting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DigFillAnalysisDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBaseLineProfillAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGenAndFaMenTopu.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGenTopo.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCloseValves.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDigPitSetting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFittingQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlow.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlyToPosition.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFolderSelecter.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFTAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGBJC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGenAndFaMenTopu.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGHRK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHotFuncStat.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHotFuncStatTitle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmKeywordQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLayerControl.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogDescription.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogin.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogOper.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMDDictory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadata.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadataOutput.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadataStat.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMultiPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmOperMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPerm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPermMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeDeepstatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeDiametergather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Frmpipediameterstatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeMaterialGather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPaiShuiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmProject.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmRanQiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddPipeFitting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAllPipelineStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDiameterQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFWPipeLineStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRedlineResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleInfoManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleRescManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmShResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoManger.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoPassword.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmThreeOracle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRole.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValveStatistics.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMaterialSel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.frmPipeSetEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmProfileAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPropertiesMarker.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmOper.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQueryHistory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQueryMessage.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQuerySensorAlarm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegion.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionType.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionTypeMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRESC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRESCMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRole.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetGoalLayer.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmTackPolygonDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHDMAnalysis3.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLineCoordinate.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQuerySQL.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserAdd.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRepo.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRepoMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValiData.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmYJSHTC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Frm_password_reset.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSfiles.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSinout.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSProjedits.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.MainFrm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCreateTunnel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCitySevenLineType.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile_AddField.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile_DeleteField.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmExportVector.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFloodAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCityServerLineAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMarker.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPipelineIndented.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMFiles.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMInout.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMTitle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMProjedit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Properties.Resources.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetLatLonPos.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSceneLightSet.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetFlytoPos.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoriesSensor.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValiDataShowErrorMessage.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddInstrument.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.SysRescInfoManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.read.1.tlog +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.write.1.tlog +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.exe +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.pdb +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe.config D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.csproj.ResolveComReference.cache +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.exe +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.pdb +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\office.dll +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\office.xml +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources @@ -507,3 +685,4 @@ D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.SysRescInfoManager.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.read.1.tlog D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.write.1.tlog +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.pdb diff --git a/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache b/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache index b4283e0..b05ca27 100644 --- a/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache +++ b/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache b/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache deleted file mode 100644 index 208d7b0..0000000 --- a/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 4f0593d..fe2b7f8 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -9,30 +9,45 @@ using GeoScene.Data; using GeoScene.Globe; using DevComponents.DotNetBar; +using System.Collections; namespace Cyberpipe { public partial class FrmAllWorkWellStatis : DevComponents.DotNetBar.Office2007Form { - Dictionary workWellLengthAndType = new Dictionary(); - List list = new List(); + + private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; + private Dictionary map = null; DataGridView dataGridViewX1; ToolStripStatusLabel toolStripNumbers; GSOGlobeControl globeControl1; PanelEx panel; - public FrmAllWorkWellStatis(Dictionary wellLen, List _list, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) + //TODOLIST：用晓伟的代理进行操作，功能拆分细化 + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) { InitializeComponent(); panel = p; - workWellLengthAndType = wellLen; - list = _list; dataGridViewX1 = dataGridViewX11; toolStripNumbers = toolStripNumbers1; - globeControl1 = ctl; + map = getAccsMap(polygon); + + } + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, MainFrm.DataGridViewDelegate InitDataGridViewX1, GSOGlobeControl ctl) + { + InitializeComponent(); + globeControl1 = ctl; + m_InitDataGridViewX1 = InitDataGridViewX1; + map = getAccsMap(polygon); + } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) { + drawChart(); + } + + public void drawChart() + { try { // Set axis title @@ -49,6 +64,11 @@ chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; + Dictionary workWellLengthAndType = new Dictionary(); + foreach (KeyValuePair kv in map) + { + workWellLengthAndType.Add(kv.Key, kv.Value.Length); + } chartAllAreaPipeline.Series["井盖"].Points.DataBindXY(workWellLengthAndType.Keys, workWellLengthAndType.Values); for (int m = 0; m < workWellLengthAndType.Values.Count; m++) { @@ -71,11 +91,11 @@ if (indexHit >= 0) { - GSOFeatures fs = list[indexHit]; + //GSOFeatures fs = list[indexHit]; string sql = ""; string pipetype = chartAllAreaPipeline.Series["井盖"].Points[indexHit].AxisLabel; - + GSOFeatures fs = map[pipetype]; string layername = ""; if (pipetype.EndsWith("窖井") || pipetype.EndsWith("表井") || (pipetype.EndsWith("窨井")) || pipetype.EndsWith("孔") || @@ -93,6 +113,23 @@ { return; } + //从图层获取datatable数据,不涉及数据库操作，速度会快一些 + //string [] fieldNames = GSOFeatureUtils.getFields(layername, globeControl1); + //DataTable dt = GSOFeatureUtils.convertGSOFeatures2DataTable(fs,fieldNames); + //if (dt.Rows.Count > 0) + //{ + // dataGridViewX1.DataSource = dt; + // panel.Visible = true; + // toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //} + //else + //{ + // panel.Visible = false; + // dataGridViewX1.DataSource = null; + // dataGridViewX1.Refresh(); + // toolStripNumbers.Text = "类型："; + //} + //数据库获取数据 if (fs.Length > 0) { sql = "select " + getpipeLineFields.getFields(layername, globeControl1) + " from " + layer.Name; @@ -120,8 +157,8 @@ { dataGridViewX1.DataSource = dt; panel.Visible = true; - //toolStripNumbers.Text = " 井盖类型：" + MainFrm.m_CurrentQueryLayer + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + string strLable = toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //m_InitDataGridViewX1(dt, strLable, "", true); } else { @@ -131,7 +168,6 @@ toolStripNumbers.Text = "类型："; } - //} } @@ -174,7 +210,7 @@ } } } - + //m_InitDataGridViewX1(null,"","" , false); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } @@ -183,5 +219,63 @@ PATM_Forms.F_PATMTitle frm = new PATM_Forms.F_PATMTitle("S", chartAllAreaPipeline); frm.Show(); } + + //获取指定layer类型的附属物名称列表 + public string[] getLayerAccNames(string layerType) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(layerType + "管线附属物"); + if (layer == null) return null; + + string sql = "select 附属物名称 from " + layerType + "管线附属物 group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layerType + "管线附属物"); + if (dataset == null) return null; + + int count = dataset.Tables[0].Rows.Count; + + + string[] result = new string[count]; + for (int i = 0; i < count; i++) + { + result[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return result; + } + + /// + /// 获取区域内各图层的井、孔、蓖的map + /// + /// 区域 + /// 要查找的附属物名称数组、如井、孔、蓖 + /// 返回值为：<图层+附属物名称,附属物列表> + + public Dictionary getAccsMap(GSOGeoPolygon3D polygon) + { + //List list = new List(); + Dictionary map = new Dictionary(); + ArrayList listpt = Utility.LayerNamesList; + if (listpt == null || listpt.Count == 0) return null; + FeatureStatisticsService service = new FeatureStatisticsService(); + for (int i = 0; i < listpt.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listpt[i] + "管线附属物"); + string[] accNames = getLayerAccNames(listpt[i] as string); + if (accNames == null || accNames.Length == 0) continue;//排除不合法的值 + for (int j = 0; j < accNames.Length; j++) + { + if (accNames[j].Contains("井") || accNames[j].Contains("孔") || accNames[j].Contains("篦")) + { + + GSOFeatures features = service.Intersect_PointLayerByType(polygon, layer, accNames[j]); + if (features == null) continue; + map.Add(listpt[i] + accNames[j], features); + } + + } + + } + return map; + + } + } } diff --git a/MainFrm.cs b/MainFrm.cs index ac2614d..b584749 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2951,35 +2951,35 @@ break; case "workwellquery": - workWellLen.Clear(); - List listWell = new List(); - //找到所有井 - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //workWellLen.Clear(); + //List listWell = new List(); + ////找到所有井 + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - listWell.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // listWell.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(workWellLen, listWell, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(polygon, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frmWell.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -9740,37 +9740,37 @@ private void buttonItemTJ3_ALL_Click(object sender, EventArgs e) { //日志记录 - LogManager.saveLog(Utility.userName, "井盖数量统计"); + //LogManager.saveLog(Utility.userName, "井盖数量统计"); - workWellLen.Clear(); - List list = new List(); + //workWellLen.Clear(); + //List list = new List(); - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - list.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // list.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(workWellLen, list, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(null, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frm.Show(this); } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ae24fb9..5c2bb7f 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -706,7 +706,6 @@ this.dotNetBarManager1.BottomDockSite = this.dockSite4; this.dotNetBarManager1.EnableFullSizeDock = false; this.dotNetBarManager1.LeftDockSite = this.dockSite1; - this.dotNetBarManager1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.dotNetBarManager1.ParentForm = null; this.dotNetBarManager1.RightDockSite = this.dockSite2; this.dotNetBarManager1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003; @@ -799,7 +798,6 @@ // styleManager1 // this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Office2010Blue; - this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(87)))), ((int)(((byte)(154)))))); // // sideBarPanelItem1 // @@ -848,7 +846,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -894,6 +892,7 @@ this.ribbonTabItemGroup1.Style.BorderRightWidth = 1; this.ribbonTabItemGroup1.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ribbonTabItemGroup1.Style.BorderTopWidth = 1; + this.ribbonTabItemGroup1.Style.Class = ""; this.ribbonTabItemGroup1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonTabItemGroup1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.ribbonTabItemGroup1.Style.TextColor = System.Drawing.Color.White; @@ -906,6 +905,7 @@ // // // + this.galleryContainer2.BackgroundStyle.Class = ""; this.galleryContainer2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer2.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer2.Name = "galleryContainer2"; @@ -915,10 +915,6 @@ this.buttonItem39}); this.galleryContainer2.Text = "断面分析"; // - // - // - this.galleryContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem38 // this.buttonItem38.Name = "buttonItem38"; @@ -939,16 +935,13 @@ // // // + this.galleryContainer3.BackgroundStyle.Class = ""; this.galleryContainer3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer3.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer3.Name = "galleryContainer3"; this.galleryContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem3}); // - // - // - this.galleryContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem3 // this.buttonItem3.Name = "buttonItem3"; @@ -959,6 +952,7 @@ // // // + this.galleryContainer4.BackgroundStyle.Class = ""; this.galleryContainer4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer4.MinimumSize = new System.Drawing.Size(150, 58); this.galleryContainer4.Name = "galleryContainer4"; @@ -970,10 +964,6 @@ this.buttonItem46}); this.galleryContainer4.Text = "断面分析"; // - // - // - this.galleryContainer4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem40 // this.buttonItem40.Name = "buttonItem40"; @@ -1004,6 +994,7 @@ // // // + this.galleryContainer5.BackgroundStyle.Class = ""; this.galleryContainer5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer5.MinimumSize = new System.Drawing.Size(80, 58); this.galleryContainer5.Name = "galleryContainer5"; @@ -1011,10 +1002,6 @@ this.buttonItem44, this.buttonItem43}); // - // - // - this.galleryContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem44 // this.buttonItem44.Name = "buttonItem44"; @@ -1030,16 +1017,13 @@ // // // + this.galleryContainer6.BackgroundStyle.Class = ""; this.galleryContainer6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer6.MinimumSize = new System.Drawing.Size(70, 58); this.galleryContainer6.Name = "galleryContainer6"; this.galleryContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem48}); // - // - // - this.galleryContainer6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem48 // this.buttonItem48.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right; @@ -1073,7 +1057,6 @@ this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx3.Controls.Add(this.layerSensorTree); - this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx3.Location = new System.Drawing.Point(54, 113); this.panelEx3.Name = "panelEx3"; this.panelEx3.Size = new System.Drawing.Size(200, 161); @@ -1188,6 +1171,7 @@ // // // + this.labelX25.BackgroundStyle.Class = ""; this.labelX25.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX25.Location = new System.Drawing.Point(7, 364); this.labelX25.Name = "labelX25"; @@ -1252,6 +1236,7 @@ // // // + this.labelX8.BackgroundStyle.Class = ""; this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX8.Location = new System.Drawing.Point(11, 60); this.labelX8.Name = "labelX8"; @@ -1384,6 +1369,7 @@ // // // + this.checkBoxX3.BackgroundStyle.Class = ""; this.checkBoxX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX3.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX3.Location = new System.Drawing.Point(11, 9); @@ -1401,6 +1387,7 @@ // // // + this.checkBoxX4.BackgroundStyle.Class = ""; this.checkBoxX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX4.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX4.Location = new System.Drawing.Point(110, 9); @@ -1418,6 +1405,7 @@ // // // + this.labelX13.BackgroundStyle.Class = ""; this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX13.Location = new System.Drawing.Point(11, 32); this.labelX13.Name = "labelX13"; @@ -1432,6 +1420,7 @@ // // // + this.labelX14.BackgroundStyle.Class = ""; this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX14.Location = new System.Drawing.Point(10, 204); this.labelX14.Name = "labelX14"; @@ -1509,7 +1498,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(181, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(198, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -1534,6 +1523,7 @@ // // // + this.labelX9.BackgroundStyle.Class = ""; this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX9.Location = new System.Drawing.Point(9, 85); this.labelX9.Name = "labelX9"; @@ -1592,7 +1582,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(180, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(197, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -1635,6 +1625,7 @@ // // // + this.labelX10.BackgroundStyle.Class = ""; this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX10.Location = new System.Drawing.Point(172, 54); this.labelX10.Name = "labelX10"; @@ -1665,6 +1656,7 @@ // // // + this.checkBoxX5.BackgroundStyle.Class = ""; this.checkBoxX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX5.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX5.Location = new System.Drawing.Point(19, 4); @@ -1682,6 +1674,7 @@ // // // + this.checkBoxX6.BackgroundStyle.Class = ""; this.checkBoxX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX6.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX6.Location = new System.Drawing.Point(114, 4); @@ -1699,6 +1692,7 @@ // // // + this.labelX12.BackgroundStyle.Class = ""; this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX12.Location = new System.Drawing.Point(6, 57); this.labelX12.Name = "labelX12"; @@ -1713,6 +1707,7 @@ // // // + this.labelX16.BackgroundStyle.Class = ""; this.labelX16.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX16.Location = new System.Drawing.Point(6, 28); this.labelX16.Name = "labelX16"; @@ -1727,6 +1722,7 @@ // // // + this.labelX17.BackgroundStyle.Class = ""; this.labelX17.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX17.Location = new System.Drawing.Point(8, 235); this.labelX17.Name = "labelX17"; @@ -1772,6 +1768,7 @@ // // // + this.labelX24.BackgroundStyle.Class = ""; this.labelX24.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX24.Image = ((System.Drawing.Image)(resources.GetObject("labelX24.Image"))); this.labelX24.Location = new System.Drawing.Point(7, 403); @@ -1804,7 +1801,7 @@ this.dataGridViewX8.ReadOnly = true; this.dataGridViewX8.RowHeadersVisible = false; this.dataGridViewX8.RowTemplate.Height = 23; - this.dataGridViewX8.Size = new System.Drawing.Size(176, 92); + this.dataGridViewX8.Size = new System.Drawing.Size(193, 92); this.dataGridViewX8.TabIndex = 11; // // dataGridViewTextBoxColumn12 @@ -1838,6 +1835,7 @@ // // // + this.labelX11.BackgroundStyle.Class = ""; this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX11.Location = new System.Drawing.Point(10, 93); this.labelX11.Name = "labelX11"; @@ -1898,7 +1896,7 @@ this.dataGridViewX9.ReadOnly = true; this.dataGridViewX9.RowHeadersVisible = false; this.dataGridViewX9.RowTemplate.Height = 23; - this.dataGridViewX9.Size = new System.Drawing.Size(175, 127); + this.dataGridViewX9.Size = new System.Drawing.Size(192, 127); this.dataGridViewX9.TabIndex = 5; this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick); // @@ -1973,6 +1971,7 @@ // // // + this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX15.Location = new System.Drawing.Point(174, 61); this.labelX15.Name = "labelX15"; @@ -2003,6 +2002,7 @@ // // // + this.checkBoxX7.BackgroundStyle.Class = ""; this.checkBoxX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX7.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX7.Location = new System.Drawing.Point(8, 5); @@ -2020,6 +2020,7 @@ // // // + this.checkBoxX8.BackgroundStyle.Class = ""; this.checkBoxX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX8.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX8.Location = new System.Drawing.Point(118, 5); @@ -2037,6 +2038,7 @@ // // // + this.labelX19.BackgroundStyle.Class = ""; this.labelX19.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX19.Location = new System.Drawing.Point(11, 61); this.labelX19.Name = "labelX19"; @@ -2051,6 +2053,7 @@ // // // + this.labelX21.BackgroundStyle.Class = ""; this.labelX21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX21.Location = new System.Drawing.Point(10, 29); this.labelX21.Name = "labelX21"; @@ -2062,6 +2065,7 @@ // // // + this.labelX22.BackgroundStyle.Class = ""; this.labelX22.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX22.Image = ((System.Drawing.Image)(resources.GetObject("labelX22.Image"))); this.labelX22.Location = new System.Drawing.Point(9, 245); @@ -2139,6 +2143,7 @@ // // // + this.labelX28.BackgroundStyle.Class = ""; this.labelX28.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX28.Location = new System.Drawing.Point(181, 104); this.labelX28.Name = "labelX28"; @@ -2154,6 +2159,7 @@ // // // + this.labelX29.BackgroundStyle.Class = ""; this.labelX29.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX29.Location = new System.Drawing.Point(6, 100); this.labelX29.Name = "labelX29"; @@ -2186,6 +2192,7 @@ // // // + this.labelX4.BackgroundStyle.Class = ""; this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Image = ((System.Drawing.Image)(resources.GetObject("labelX4.Image"))); this.labelX4.Location = new System.Drawing.Point(7, 432); @@ -2249,6 +2256,7 @@ // // // + this.labelX5.BackgroundStyle.Class = ""; this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Image = ((System.Drawing.Image)(resources.GetObject("labelX5.Image"))); this.labelX5.Location = new System.Drawing.Point(9, 134); @@ -2383,6 +2391,7 @@ // // // + this.labelX18.BackgroundStyle.Class = ""; this.labelX18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX18.Location = new System.Drawing.Point(181, 71); this.labelX18.Name = "labelX18"; @@ -2413,6 +2422,7 @@ // // // + this.checkBoxSelectPipeline.BackgroundStyle.Class = ""; this.checkBoxSelectPipeline.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectPipeline.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectPipeline.Location = new System.Drawing.Point(8, 9); @@ -2430,6 +2440,7 @@ // // // + this.checkBoxSelectLayer.BackgroundStyle.Class = ""; this.checkBoxSelectLayer.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectLayer.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectLayer.Location = new System.Drawing.Point(117, 9); @@ -2447,6 +2458,7 @@ // // // + this.labelX20.BackgroundStyle.Class = ""; this.labelX20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX20.Location = new System.Drawing.Point(6, 69); this.labelX20.Name = "labelX20"; @@ -2458,6 +2470,7 @@ // // // + this.labelX26.BackgroundStyle.Class = ""; this.labelX26.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX26.Image = ((System.Drawing.Image)(resources.GetObject("labelX26.Image"))); this.labelX26.Location = new System.Drawing.Point(9, 38); @@ -2470,6 +2483,7 @@ // // // + this.labelX27.BackgroundStyle.Class = ""; this.labelX27.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX27.Image = ((System.Drawing.Image)(resources.GetObject("labelX27.Image"))); this.labelX27.Location = new System.Drawing.Point(7, 287); @@ -2482,6 +2496,7 @@ // // // + this.labelX30.BackgroundStyle.Class = ""; this.labelX30.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX30.Location = new System.Drawing.Point(88, 100); this.labelX30.Name = "labelX30"; @@ -2514,6 +2529,7 @@ // // // + this.labelX23.BackgroundStyle.Class = ""; this.labelX23.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX23.Image = ((System.Drawing.Image)(resources.GetObject("labelX23.Image"))); this.labelX23.Location = new System.Drawing.Point(11, 404); @@ -2577,6 +2593,7 @@ // // // + this.labelX2.BackgroundStyle.Class = ""; this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Image = ((System.Drawing.Image)(resources.GetObject("labelX2.Image"))); this.labelX2.Location = new System.Drawing.Point(12, 100); @@ -2703,6 +2720,7 @@ // // // + this.labelX7.BackgroundStyle.Class = ""; this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX7.Location = new System.Drawing.Point(176, 67); this.labelX7.Name = "labelX7"; @@ -2733,6 +2751,7 @@ // // // + this.checkBoxX1.BackgroundStyle.Class = ""; this.checkBoxX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX1.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX1.Location = new System.Drawing.Point(11, 5); @@ -2750,6 +2769,7 @@ // // // + this.checkBoxX2.BackgroundStyle.Class = ""; this.checkBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX2.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX2.Location = new System.Drawing.Point(120, 5); @@ -2767,6 +2787,7 @@ // // // + this.labelX6.BackgroundStyle.Class = ""; this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX6.Location = new System.Drawing.Point(15, 67); this.labelX6.Name = "labelX6"; @@ -2778,6 +2799,7 @@ // // // + this.labelX1.BackgroundStyle.Class = ""; this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Image = ((System.Drawing.Image)(resources.GetObject("labelX1.Image"))); this.labelX1.Location = new System.Drawing.Point(12, 34); @@ -2790,6 +2812,7 @@ // // // + this.labelX3.BackgroundStyle.Class = ""; this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Image = ((System.Drawing.Image)(resources.GetObject("labelX3.Image"))); this.labelX3.Location = new System.Drawing.Point(11, 250); @@ -2800,11 +2823,11 @@ // expandableSplitter1 // this.expandableSplitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -2816,11 +2839,11 @@ this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -2837,7 +2860,6 @@ this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx4.Controls.Add(this.splitContainer1); this.panelEx4.Controls.Add(this.panelOfTable); - this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx4.Location = new System.Drawing.Point(203, 179); this.panelEx4.Name = "panelEx4"; @@ -2878,7 +2900,6 @@ this.panelEx5.Controls.Add(this.panel1); this.panelEx5.Controls.Add(this.panel3); this.panelEx5.Controls.Add(this.panel5); - this.panelEx5.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx5.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx5.Location = new System.Drawing.Point(0, 0); this.panelEx5.Name = "panelEx5"; @@ -2921,7 +2942,6 @@ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.Controls.Add(this.panel2); this.panelEx1.Controls.Add(this.panel4); - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; @@ -2944,7 +2964,6 @@ this.panelOfTable.Controls.Add(this.dataGridViewX1); this.panelOfTable.Controls.Add(this.statusStrip2); this.panelOfTable.Controls.Add(this.expandableSplitter2); - this.panelOfTable.DisabledBackColor = System.Drawing.Color.Empty; this.panelOfTable.Dock = System.Windows.Forms.DockStyle.Bottom; this.panelOfTable.Location = new System.Drawing.Point(0, 414); this.panelOfTable.Name = "panelOfTable"; @@ -3042,12 +3061,12 @@ // expandableSplitter2 // this.expandableSplitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter2.Dock = System.Windows.Forms.DockStyle.Top; this.expandableSplitter2.ExpandableControl = this.panelOfTable; - this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -3059,11 +3078,11 @@ this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -3183,7 +3202,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(149, 290); + this.toolRightMenu.Size = new System.Drawing.Size(153, 312); // // 量算ToolStripMenuItem // @@ -3259,7 +3278,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -4125,8 +4144,6 @@ // superTooltip1 // this.superTooltip1.DefaultFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); - this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.superTooltip1.MinimumTooltipSize = new System.Drawing.Size(150, 50); // // buttonItem16 @@ -4233,12 +4250,13 @@ // // // + this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4255,7 +4273,7 @@ this.ribbonControl1.Location = new System.Drawing.Point(0, 82); this.ribbonControl1.MdiSystemItemVisible = false; this.ribbonControl1.Name = "ribbonControl1"; - this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); this.ribbonControl1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem19}); this.ribbonControl1.Size = new System.Drawing.Size(1328, 97); @@ -4292,21 +4310,23 @@ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel1.Style.Class = ""; this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseDown.Class = ""; this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4315,14 +4335,15 @@ // // // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.BackgroundStyle.Class = ""; this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.ContainerControlProcessDialogKey = true; this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.DragDropSupport = true; this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem87, this.buttonItem88, @@ -4333,20 +4354,21 @@ this.btnlegendSet, this.buttonItem89, this.btnOutputJPG}); - this.ribbonBar21.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 58); + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; // // // + this.ribbonBar21.TitleStyle.Class = ""; this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.TitleVisible = false; // @@ -4436,14 +4458,17 @@ // // // + this.ribbonPanel12.Style.Class = ""; this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseDown.Class = ""; this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseOver.Class = ""; this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel12.TabIndex = 34; this.ribbonPanel12.Visible = false; @@ -4454,18 +4479,18 @@ // // // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.BackgroundStyle.Class = ""; this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.ContainerControlProcessDialogKey = true; this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.DragDropSupport = true; this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem133, this.buttonItem132}); - this.ribbonBar18.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; this.ribbonBar18.Size = new System.Drawing.Size(171, 59); @@ -4474,10 +4499,12 @@ // // // + this.ribbonBar18.TitleStyle.Class = ""; this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.TitleVisible = false; // @@ -4506,14 +4533,15 @@ // // // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.BackgroundStyle.Class = ""; this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.ContainerControlProcessDialogKey = true; this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.DragDropSupport = true; this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem127, this.buttonItem128, @@ -4521,7 +4549,6 @@ this.buttonItem134, this.buttonItem130, this.btn_check_history}); - this.ribbonBar13.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; this.ribbonBar13.Size = new System.Drawing.Size(505, 59); @@ -4530,10 +4557,12 @@ // // // + this.ribbonBar13.TitleStyle.Class = ""; this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.TitleVisible = false; // @@ -4604,14 +4633,17 @@ // // // + this.ribbonPanel5.Style.Class = ""; this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseDown.Class = ""; this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseOver.Class = ""; this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel5.TabIndex = 37; this.ribbonPanel5.Visible = false; @@ -4622,20 +4654,20 @@ // // // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.BackgroundStyle.Class = ""; this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.ContainerControlProcessDialogKey = true; this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.DragDropSupport = true; this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemHX1, this.buttonItemHX2, this.buttonItemDCTP, this.sliderItem3}); - this.ribbonBar2.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; this.ribbonBar2.Size = new System.Drawing.Size(350, 59); @@ -4644,10 +4676,12 @@ // // // + this.ribbonBar2.TitleStyle.Class = ""; this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.TitleVisible = false; // @@ -4701,14 +4735,17 @@ // // // + this.ribbonPanel2.Style.Class = ""; this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseDown.Class = ""; this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; this.ribbonPanel2.Visible = false; @@ -4719,14 +4756,15 @@ // // // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.BackgroundStyle.Class = ""; this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.ContainerControlProcessDialogKey = true; this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.DragDropSupport = true; this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_user_info, this.btn_role_info, @@ -4735,7 +4773,6 @@ this.btn_user_role, this.btn_password_edit, this.buttonItemPasswordReset}); - this.ribbonBar3.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; this.ribbonBar3.Size = new System.Drawing.Size(551, 59); @@ -4744,10 +4781,12 @@ // // // + this.ribbonBar3.TitleStyle.Class = ""; this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.TitleVisible = false; // @@ -4823,20 +4862,24 @@ this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel15.Style.Class = ""; this.ribbonPanel15.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseDown.Class = ""; this.ribbonPanel15.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4844,14 +4887,15 @@ // // // + this.ribbonBar20.BackgroundMouseOverStyle.Class = ""; this.ribbonBar20.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.BackgroundStyle.Class = ""; this.ribbonBar20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.ContainerControlProcessDialogKey = true; this.ribbonBar20.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar20.DragDropSupport = true; this.ribbonBar20.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSH, this.buttonItemSJGL, @@ -4865,19 +4909,20 @@ this.buttonItemBJ, this.buttonItemSearch, this.buttonItemBZ}); - this.ribbonBar20.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(814, 58); + this.ribbonBar20.Size = new System.Drawing.Size(814, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // // // + this.ribbonBar20.TitleStyle.Class = ""; this.ribbonBar20.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.TitleStyleMouseOver.Class = ""; this.ribbonBar20.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.TitleVisible = false; // @@ -5070,18 +5115,21 @@ // this.buttonItem10.Name = "buttonItem10"; this.buttonItem10.Text = "管线入库-高程"; + this.buttonItem10.Visible = false; this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // // buttonItem11 // this.buttonItem11.Name = "buttonItem11"; this.buttonItem11.Text = "附属物入库-高程"; + this.buttonItem11.Visible = false; this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // // buttonItem12 // this.buttonItem12.Name = "buttonItem12"; this.buttonItem12.Text = "特征管点入库-高程"; + this.buttonItem12.Visible = false; this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // // buttonItemSJGL5 @@ -6226,14 +6274,17 @@ // // // + this.ribbonPanel4.Style.Class = ""; this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseDown.Class = ""; this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseOver.Class = ""; this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel4.TabIndex = 36; this.ribbonPanel4.Visible = false; @@ -6244,17 +6295,17 @@ // // // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.BackgroundStyle.Class = ""; this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.ContainerControlProcessDialogKey = true; this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.DragDropSupport = true; this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_document_info}); - this.ribbonBar1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; this.ribbonBar1.Size = new System.Drawing.Size(88, 59); @@ -6263,10 +6314,12 @@ // // // + this.ribbonBar1.TitleStyle.Class = ""; this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.TitleVisible = false; // @@ -6291,14 +6344,17 @@ // // // + this.ribbonPanel6.Style.Class = ""; this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseDown.Class = ""; this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseOver.Class = ""; this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel6.TabIndex = 38; this.ribbonPanel6.Visible = false; @@ -6309,21 +6365,21 @@ // // // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.BackgroundStyle.Class = ""; this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.ContainerControlProcessDialogKey = true; this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.DragDropSupport = true; this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSPSZ, this.buttonItem8, this.buttonItemLocation, this.sliderItem2, this.buttonItemGBJC}); - this.ribbonBar6.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; this.ribbonBar6.Size = new System.Drawing.Size(427, 59); @@ -6332,10 +6388,12 @@ // // // + this.ribbonBar6.TitleStyle.Class = ""; this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.TitleVisible = false; // @@ -6388,6 +6446,7 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6438,7 +6497,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -7045,7 +7103,7 @@ private DevComponents.DotNetBar.LabelX labelX25; private DevComponents.DotNetBar.PanelEx panelEx3; private System.Windows.Forms.TreeView layerSensorTree; - // private System.Windows.Forms.TreeView layerTree; + // private System.Windows.Forms.TreeView layerTree; private MyTreeView layerTree; private DevComponents.DotNetBar.ButtonX buttonX7; private DevComponents.DotNetBar.ButtonX buttonX16; diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config new file mode 100644 index 0000000..f4cbe66 --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe.config @@ -0,0 +1,32 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb index c7cb8c3..c0fad4a 100644 --- a/bin/x86/Debug/Cyberpipe.pdb +++ b/bin/x86/Debug/Cyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index 3dc3245..1fc46d0 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5f45ee7..9615fbf 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt index b8d8198..c6fbef0 100644 --- a/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -342,8 +342,186 @@ F:\predator\codeReview\GHFX_SZ_64\obj\x64\Debug\Cyberpipe.pdb F:\predator\codeReview\GHFX_SZ_64\bin\x86\Debug\office.dll F:\predator\codeReview\GHFX_SZ_64\bin\x86\Debug\office.xml -D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe.config +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.csproj.ResolveComReference.cache +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.pdb +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\office.dll +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\office.xml +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FormDocumentManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmAddYuBiZiShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGBJCresult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmWait.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\PipeLine.Forms.FrmAddPipelineCoordinate.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGongShuiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmMnModify.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPipelineModelDataOneStep.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmShLayers.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmShRK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmTongXunAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmAddWellShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccess.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoriesgather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoryAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddValve.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddWellShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddYuBiZiShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAllWorkWellStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAnalysisGuiHuaResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPP.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPAuditor.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPFORASK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPFORASKReason.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPregion.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAppUSER.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAppUSERRESET.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBACKORACLE.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBSQDuoBianXingStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBSQStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBufferAnalysisBSQ.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmChangePassword.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCheckHistory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCodingQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCompareFeature.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCreateUser.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCustomLabel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDataBaseOpt.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDatabaseParaSetting2.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDbManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDocumentEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDownloadProgress.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmExportCADS.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlySetDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBasicQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBoosterValvers.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBufferAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDatabaseParaSetting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DigFillAnalysisDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBaseLineProfillAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGenAndFaMenTopu.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGenTopo.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCloseValves.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDigPitSetting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFittingQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlow.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlyToPosition.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFolderSelecter.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFTAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGBJC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGenAndFaMenTopu.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGHRK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHotFuncStat.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHotFuncStatTitle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmKeywordQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLayerControl.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogDescription.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogin.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogOper.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMDDictory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadata.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadataOutput.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadataStat.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMultiPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmOperMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPerm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPermMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeDeepstatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeDiametergather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Frmpipediameterstatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeMaterialGather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPaiShuiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmProject.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmRanQiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddPipeFitting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAllPipelineStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDiameterQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFWPipeLineStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRedlineResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleInfoManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleRescManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmShResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoManger.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoPassword.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmThreeOracle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRole.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValveStatistics.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMaterialSel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.frmPipeSetEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmProfileAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPropertiesMarker.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmOper.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQueryHistory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQueryMessage.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQuerySensorAlarm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegion.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionType.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionTypeMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRESC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRESCMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRole.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetGoalLayer.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmTackPolygonDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHDMAnalysis3.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLineCoordinate.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQuerySQL.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserAdd.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRepo.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRepoMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValiData.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmYJSHTC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Frm_password_reset.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSfiles.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSinout.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSProjedits.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.MainFrm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCreateTunnel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCitySevenLineType.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile_AddField.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile_DeleteField.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmExportVector.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFloodAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCityServerLineAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMarker.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPipelineIndented.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMFiles.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMInout.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMTitle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMProjedit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Properties.Resources.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetLatLonPos.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSceneLightSet.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetFlytoPos.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoriesSensor.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValiDataShowErrorMessage.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddInstrument.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.SysRescInfoManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.read.1.tlog +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.write.1.tlog +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.exe +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.pdb +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe.config D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.csproj.ResolveComReference.cache +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.exe +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.pdb +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\office.dll +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\office.xml +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources @@ -507,3 +685,4 @@ D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.SysRescInfoManager.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.read.1.tlog D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.write.1.tlog +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.pdb diff --git a/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache b/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache index b4283e0..b05ca27 100644 --- a/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache +++ b/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache b/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache deleted file mode 100644 index 208d7b0..0000000 --- a/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.exe b/obj/x64/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/obj/x64/Debug/Cyberpipe.exe Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 4f0593d..fe2b7f8 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -9,30 +9,45 @@ using GeoScene.Data; using GeoScene.Globe; using DevComponents.DotNetBar; +using System.Collections; namespace Cyberpipe { public partial class FrmAllWorkWellStatis : DevComponents.DotNetBar.Office2007Form { - Dictionary workWellLengthAndType = new Dictionary(); - List list = new List(); + + private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; + private Dictionary map = null; DataGridView dataGridViewX1; ToolStripStatusLabel toolStripNumbers; GSOGlobeControl globeControl1; PanelEx panel; - public FrmAllWorkWellStatis(Dictionary wellLen, List _list, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) + //TODOLIST：用晓伟的代理进行操作，功能拆分细化 + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) { InitializeComponent(); panel = p; - workWellLengthAndType = wellLen; - list = _list; dataGridViewX1 = dataGridViewX11; toolStripNumbers = toolStripNumbers1; - globeControl1 = ctl; + map = getAccsMap(polygon); + + } + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, MainFrm.DataGridViewDelegate InitDataGridViewX1, GSOGlobeControl ctl) + { + InitializeComponent(); + globeControl1 = ctl; + m_InitDataGridViewX1 = InitDataGridViewX1; + map = getAccsMap(polygon); + } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) { + drawChart(); + } + + public void drawChart() + { try { // Set axis title @@ -49,6 +64,11 @@ chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; + Dictionary workWellLengthAndType = new Dictionary(); + foreach (KeyValuePair kv in map) + { + workWellLengthAndType.Add(kv.Key, kv.Value.Length); + } chartAllAreaPipeline.Series["井盖"].Points.DataBindXY(workWellLengthAndType.Keys, workWellLengthAndType.Values); for (int m = 0; m < workWellLengthAndType.Values.Count; m++) { @@ -71,11 +91,11 @@ if (indexHit >= 0) { - GSOFeatures fs = list[indexHit]; + //GSOFeatures fs = list[indexHit]; string sql = ""; string pipetype = chartAllAreaPipeline.Series["井盖"].Points[indexHit].AxisLabel; - + GSOFeatures fs = map[pipetype]; string layername = ""; if (pipetype.EndsWith("窖井") || pipetype.EndsWith("表井") || (pipetype.EndsWith("窨井")) || pipetype.EndsWith("孔") || @@ -93,6 +113,23 @@ { return; } + //从图层获取datatable数据,不涉及数据库操作，速度会快一些 + //string [] fieldNames = GSOFeatureUtils.getFields(layername, globeControl1); + //DataTable dt = GSOFeatureUtils.convertGSOFeatures2DataTable(fs,fieldNames); + //if (dt.Rows.Count > 0) + //{ + // dataGridViewX1.DataSource = dt; + // panel.Visible = true; + // toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //} + //else + //{ + // panel.Visible = false; + // dataGridViewX1.DataSource = null; + // dataGridViewX1.Refresh(); + // toolStripNumbers.Text = "类型："; + //} + //数据库获取数据 if (fs.Length > 0) { sql = "select " + getpipeLineFields.getFields(layername, globeControl1) + " from " + layer.Name; @@ -120,8 +157,8 @@ { dataGridViewX1.DataSource = dt; panel.Visible = true; - //toolStripNumbers.Text = " 井盖类型：" + MainFrm.m_CurrentQueryLayer + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + string strLable = toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //m_InitDataGridViewX1(dt, strLable, "", true); } else { @@ -131,7 +168,6 @@ toolStripNumbers.Text = "类型："; } - //} } @@ -174,7 +210,7 @@ } } } - + //m_InitDataGridViewX1(null,"","" , false); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } @@ -183,5 +219,63 @@ PATM_Forms.F_PATMTitle frm = new PATM_Forms.F_PATMTitle("S", chartAllAreaPipeline); frm.Show(); } + + //获取指定layer类型的附属物名称列表 + public string[] getLayerAccNames(string layerType) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(layerType + "管线附属物"); + if (layer == null) return null; + + string sql = "select 附属物名称 from " + layerType + "管线附属物 group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layerType + "管线附属物"); + if (dataset == null) return null; + + int count = dataset.Tables[0].Rows.Count; + + + string[] result = new string[count]; + for (int i = 0; i < count; i++) + { + result[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return result; + } + + /// + /// 获取区域内各图层的井、孔、蓖的map + /// + /// 区域 + /// 要查找的附属物名称数组、如井、孔、蓖 + /// 返回值为：<图层+附属物名称,附属物列表> + + public Dictionary getAccsMap(GSOGeoPolygon3D polygon) + { + //List list = new List(); + Dictionary map = new Dictionary(); + ArrayList listpt = Utility.LayerNamesList; + if (listpt == null || listpt.Count == 0) return null; + FeatureStatisticsService service = new FeatureStatisticsService(); + for (int i = 0; i < listpt.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listpt[i] + "管线附属物"); + string[] accNames = getLayerAccNames(listpt[i] as string); + if (accNames == null || accNames.Length == 0) continue;//排除不合法的值 + for (int j = 0; j < accNames.Length; j++) + { + if (accNames[j].Contains("井") || accNames[j].Contains("孔") || accNames[j].Contains("篦")) + { + + GSOFeatures features = service.Intersect_PointLayerByType(polygon, layer, accNames[j]); + if (features == null) continue; + map.Add(listpt[i] + accNames[j], features); + } + + } + + } + return map; + + } + } } diff --git a/MainFrm.cs b/MainFrm.cs index ac2614d..b584749 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2951,35 +2951,35 @@ break; case "workwellquery": - workWellLen.Clear(); - List listWell = new List(); - //找到所有井 - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //workWellLen.Clear(); + //List listWell = new List(); + ////找到所有井 + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - listWell.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // listWell.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(workWellLen, listWell, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(polygon, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frmWell.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -9740,37 +9740,37 @@ private void buttonItemTJ3_ALL_Click(object sender, EventArgs e) { //日志记录 - LogManager.saveLog(Utility.userName, "井盖数量统计"); + //LogManager.saveLog(Utility.userName, "井盖数量统计"); - workWellLen.Clear(); - List list = new List(); + //workWellLen.Clear(); + //List list = new List(); - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - list.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // list.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(workWellLen, list, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(null, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frm.Show(this); } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ae24fb9..5c2bb7f 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -706,7 +706,6 @@ this.dotNetBarManager1.BottomDockSite = this.dockSite4; this.dotNetBarManager1.EnableFullSizeDock = false; this.dotNetBarManager1.LeftDockSite = this.dockSite1; - this.dotNetBarManager1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.dotNetBarManager1.ParentForm = null; this.dotNetBarManager1.RightDockSite = this.dockSite2; this.dotNetBarManager1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003; @@ -799,7 +798,6 @@ // styleManager1 // this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Office2010Blue; - this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(87)))), ((int)(((byte)(154)))))); // // sideBarPanelItem1 // @@ -848,7 +846,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -894,6 +892,7 @@ this.ribbonTabItemGroup1.Style.BorderRightWidth = 1; this.ribbonTabItemGroup1.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ribbonTabItemGroup1.Style.BorderTopWidth = 1; + this.ribbonTabItemGroup1.Style.Class = ""; this.ribbonTabItemGroup1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonTabItemGroup1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.ribbonTabItemGroup1.Style.TextColor = System.Drawing.Color.White; @@ -906,6 +905,7 @@ // // // + this.galleryContainer2.BackgroundStyle.Class = ""; this.galleryContainer2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer2.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer2.Name = "galleryContainer2"; @@ -915,10 +915,6 @@ this.buttonItem39}); this.galleryContainer2.Text = "断面分析"; // - // - // - this.galleryContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem38 // this.buttonItem38.Name = "buttonItem38"; @@ -939,16 +935,13 @@ // // // + this.galleryContainer3.BackgroundStyle.Class = ""; this.galleryContainer3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer3.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer3.Name = "galleryContainer3"; this.galleryContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem3}); // - // - // - this.galleryContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem3 // this.buttonItem3.Name = "buttonItem3"; @@ -959,6 +952,7 @@ // // // + this.galleryContainer4.BackgroundStyle.Class = ""; this.galleryContainer4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer4.MinimumSize = new System.Drawing.Size(150, 58); this.galleryContainer4.Name = "galleryContainer4"; @@ -970,10 +964,6 @@ this.buttonItem46}); this.galleryContainer4.Text = "断面分析"; // - // - // - this.galleryContainer4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem40 // this.buttonItem40.Name = "buttonItem40"; @@ -1004,6 +994,7 @@ // // // + this.galleryContainer5.BackgroundStyle.Class = ""; this.galleryContainer5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer5.MinimumSize = new System.Drawing.Size(80, 58); this.galleryContainer5.Name = "galleryContainer5"; @@ -1011,10 +1002,6 @@ this.buttonItem44, this.buttonItem43}); // - // - // - this.galleryContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem44 // this.buttonItem44.Name = "buttonItem44"; @@ -1030,16 +1017,13 @@ // // // + this.galleryContainer6.BackgroundStyle.Class = ""; this.galleryContainer6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer6.MinimumSize = new System.Drawing.Size(70, 58); this.galleryContainer6.Name = "galleryContainer6"; this.galleryContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem48}); // - // - // - this.galleryContainer6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem48 // this.buttonItem48.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right; @@ -1073,7 +1057,6 @@ this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx3.Controls.Add(this.layerSensorTree); - this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx3.Location = new System.Drawing.Point(54, 113); this.panelEx3.Name = "panelEx3"; this.panelEx3.Size = new System.Drawing.Size(200, 161); @@ -1188,6 +1171,7 @@ // // // + this.labelX25.BackgroundStyle.Class = ""; this.labelX25.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX25.Location = new System.Drawing.Point(7, 364); this.labelX25.Name = "labelX25"; @@ -1252,6 +1236,7 @@ // // // + this.labelX8.BackgroundStyle.Class = ""; this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX8.Location = new System.Drawing.Point(11, 60); this.labelX8.Name = "labelX8"; @@ -1384,6 +1369,7 @@ // // // + this.checkBoxX3.BackgroundStyle.Class = ""; this.checkBoxX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX3.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX3.Location = new System.Drawing.Point(11, 9); @@ -1401,6 +1387,7 @@ // // // + this.checkBoxX4.BackgroundStyle.Class = ""; this.checkBoxX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX4.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX4.Location = new System.Drawing.Point(110, 9); @@ -1418,6 +1405,7 @@ // // // + this.labelX13.BackgroundStyle.Class = ""; this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX13.Location = new System.Drawing.Point(11, 32); this.labelX13.Name = "labelX13"; @@ -1432,6 +1420,7 @@ // // // + this.labelX14.BackgroundStyle.Class = ""; this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX14.Location = new System.Drawing.Point(10, 204); this.labelX14.Name = "labelX14"; @@ -1509,7 +1498,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(181, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(198, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -1534,6 +1523,7 @@ // // // + this.labelX9.BackgroundStyle.Class = ""; this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX9.Location = new System.Drawing.Point(9, 85); this.labelX9.Name = "labelX9"; @@ -1592,7 +1582,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(180, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(197, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -1635,6 +1625,7 @@ // // // + this.labelX10.BackgroundStyle.Class = ""; this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX10.Location = new System.Drawing.Point(172, 54); this.labelX10.Name = "labelX10"; @@ -1665,6 +1656,7 @@ // // // + this.checkBoxX5.BackgroundStyle.Class = ""; this.checkBoxX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX5.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX5.Location = new System.Drawing.Point(19, 4); @@ -1682,6 +1674,7 @@ // // // + this.checkBoxX6.BackgroundStyle.Class = ""; this.checkBoxX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX6.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX6.Location = new System.Drawing.Point(114, 4); @@ -1699,6 +1692,7 @@ // // // + this.labelX12.BackgroundStyle.Class = ""; this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX12.Location = new System.Drawing.Point(6, 57); this.labelX12.Name = "labelX12"; @@ -1713,6 +1707,7 @@ // // // + this.labelX16.BackgroundStyle.Class = ""; this.labelX16.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX16.Location = new System.Drawing.Point(6, 28); this.labelX16.Name = "labelX16"; @@ -1727,6 +1722,7 @@ // // // + this.labelX17.BackgroundStyle.Class = ""; this.labelX17.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX17.Location = new System.Drawing.Point(8, 235); this.labelX17.Name = "labelX17"; @@ -1772,6 +1768,7 @@ // // // + this.labelX24.BackgroundStyle.Class = ""; this.labelX24.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX24.Image = ((System.Drawing.Image)(resources.GetObject("labelX24.Image"))); this.labelX24.Location = new System.Drawing.Point(7, 403); @@ -1804,7 +1801,7 @@ this.dataGridViewX8.ReadOnly = true; this.dataGridViewX8.RowHeadersVisible = false; this.dataGridViewX8.RowTemplate.Height = 23; - this.dataGridViewX8.Size = new System.Drawing.Size(176, 92); + this.dataGridViewX8.Size = new System.Drawing.Size(193, 92); this.dataGridViewX8.TabIndex = 11; // // dataGridViewTextBoxColumn12 @@ -1838,6 +1835,7 @@ // // // + this.labelX11.BackgroundStyle.Class = ""; this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX11.Location = new System.Drawing.Point(10, 93); this.labelX11.Name = "labelX11"; @@ -1898,7 +1896,7 @@ this.dataGridViewX9.ReadOnly = true; this.dataGridViewX9.RowHeadersVisible = false; this.dataGridViewX9.RowTemplate.Height = 23; - this.dataGridViewX9.Size = new System.Drawing.Size(175, 127); + this.dataGridViewX9.Size = new System.Drawing.Size(192, 127); this.dataGridViewX9.TabIndex = 5; this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick); // @@ -1973,6 +1971,7 @@ // // // + this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX15.Location = new System.Drawing.Point(174, 61); this.labelX15.Name = "labelX15"; @@ -2003,6 +2002,7 @@ // // // + this.checkBoxX7.BackgroundStyle.Class = ""; this.checkBoxX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX7.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX7.Location = new System.Drawing.Point(8, 5); @@ -2020,6 +2020,7 @@ // // // + this.checkBoxX8.BackgroundStyle.Class = ""; this.checkBoxX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX8.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX8.Location = new System.Drawing.Point(118, 5); @@ -2037,6 +2038,7 @@ // // // + this.labelX19.BackgroundStyle.Class = ""; this.labelX19.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX19.Location = new System.Drawing.Point(11, 61); this.labelX19.Name = "labelX19"; @@ -2051,6 +2053,7 @@ // // // + this.labelX21.BackgroundStyle.Class = ""; this.labelX21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX21.Location = new System.Drawing.Point(10, 29); this.labelX21.Name = "labelX21"; @@ -2062,6 +2065,7 @@ // // // + this.labelX22.BackgroundStyle.Class = ""; this.labelX22.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX22.Image = ((System.Drawing.Image)(resources.GetObject("labelX22.Image"))); this.labelX22.Location = new System.Drawing.Point(9, 245); @@ -2139,6 +2143,7 @@ // // // + this.labelX28.BackgroundStyle.Class = ""; this.labelX28.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX28.Location = new System.Drawing.Point(181, 104); this.labelX28.Name = "labelX28"; @@ -2154,6 +2159,7 @@ // // // + this.labelX29.BackgroundStyle.Class = ""; this.labelX29.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX29.Location = new System.Drawing.Point(6, 100); this.labelX29.Name = "labelX29"; @@ -2186,6 +2192,7 @@ // // // + this.labelX4.BackgroundStyle.Class = ""; this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Image = ((System.Drawing.Image)(resources.GetObject("labelX4.Image"))); this.labelX4.Location = new System.Drawing.Point(7, 432); @@ -2249,6 +2256,7 @@ // // // + this.labelX5.BackgroundStyle.Class = ""; this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Image = ((System.Drawing.Image)(resources.GetObject("labelX5.Image"))); this.labelX5.Location = new System.Drawing.Point(9, 134); @@ -2383,6 +2391,7 @@ // // // + this.labelX18.BackgroundStyle.Class = ""; this.labelX18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX18.Location = new System.Drawing.Point(181, 71); this.labelX18.Name = "labelX18"; @@ -2413,6 +2422,7 @@ // // // + this.checkBoxSelectPipeline.BackgroundStyle.Class = ""; this.checkBoxSelectPipeline.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectPipeline.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectPipeline.Location = new System.Drawing.Point(8, 9); @@ -2430,6 +2440,7 @@ // // // + this.checkBoxSelectLayer.BackgroundStyle.Class = ""; this.checkBoxSelectLayer.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectLayer.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectLayer.Location = new System.Drawing.Point(117, 9); @@ -2447,6 +2458,7 @@ // // // + this.labelX20.BackgroundStyle.Class = ""; this.labelX20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX20.Location = new System.Drawing.Point(6, 69); this.labelX20.Name = "labelX20"; @@ -2458,6 +2470,7 @@ // // // + this.labelX26.BackgroundStyle.Class = ""; this.labelX26.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX26.Image = ((System.Drawing.Image)(resources.GetObject("labelX26.Image"))); this.labelX26.Location = new System.Drawing.Point(9, 38); @@ -2470,6 +2483,7 @@ // // // + this.labelX27.BackgroundStyle.Class = ""; this.labelX27.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX27.Image = ((System.Drawing.Image)(resources.GetObject("labelX27.Image"))); this.labelX27.Location = new System.Drawing.Point(7, 287); @@ -2482,6 +2496,7 @@ // // // + this.labelX30.BackgroundStyle.Class = ""; this.labelX30.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX30.Location = new System.Drawing.Point(88, 100); this.labelX30.Name = "labelX30"; @@ -2514,6 +2529,7 @@ // // // + this.labelX23.BackgroundStyle.Class = ""; this.labelX23.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX23.Image = ((System.Drawing.Image)(resources.GetObject("labelX23.Image"))); this.labelX23.Location = new System.Drawing.Point(11, 404); @@ -2577,6 +2593,7 @@ // // // + this.labelX2.BackgroundStyle.Class = ""; this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Image = ((System.Drawing.Image)(resources.GetObject("labelX2.Image"))); this.labelX2.Location = new System.Drawing.Point(12, 100); @@ -2703,6 +2720,7 @@ // // // + this.labelX7.BackgroundStyle.Class = ""; this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX7.Location = new System.Drawing.Point(176, 67); this.labelX7.Name = "labelX7"; @@ -2733,6 +2751,7 @@ // // // + this.checkBoxX1.BackgroundStyle.Class = ""; this.checkBoxX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX1.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX1.Location = new System.Drawing.Point(11, 5); @@ -2750,6 +2769,7 @@ // // // + this.checkBoxX2.BackgroundStyle.Class = ""; this.checkBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX2.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX2.Location = new System.Drawing.Point(120, 5); @@ -2767,6 +2787,7 @@ // // // + this.labelX6.BackgroundStyle.Class = ""; this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX6.Location = new System.Drawing.Point(15, 67); this.labelX6.Name = "labelX6"; @@ -2778,6 +2799,7 @@ // // // + this.labelX1.BackgroundStyle.Class = ""; this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Image = ((System.Drawing.Image)(resources.GetObject("labelX1.Image"))); this.labelX1.Location = new System.Drawing.Point(12, 34); @@ -2790,6 +2812,7 @@ // // // + this.labelX3.BackgroundStyle.Class = ""; this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Image = ((System.Drawing.Image)(resources.GetObject("labelX3.Image"))); this.labelX3.Location = new System.Drawing.Point(11, 250); @@ -2800,11 +2823,11 @@ // expandableSplitter1 // this.expandableSplitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -2816,11 +2839,11 @@ this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -2837,7 +2860,6 @@ this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx4.Controls.Add(this.splitContainer1); this.panelEx4.Controls.Add(this.panelOfTable); - this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx4.Location = new System.Drawing.Point(203, 179); this.panelEx4.Name = "panelEx4"; @@ -2878,7 +2900,6 @@ this.panelEx5.Controls.Add(this.panel1); this.panelEx5.Controls.Add(this.panel3); this.panelEx5.Controls.Add(this.panel5); - this.panelEx5.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx5.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx5.Location = new System.Drawing.Point(0, 0); this.panelEx5.Name = "panelEx5"; @@ -2921,7 +2942,6 @@ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.Controls.Add(this.panel2); this.panelEx1.Controls.Add(this.panel4); - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; @@ -2944,7 +2964,6 @@ this.panelOfTable.Controls.Add(this.dataGridViewX1); this.panelOfTable.Controls.Add(this.statusStrip2); this.panelOfTable.Controls.Add(this.expandableSplitter2); - this.panelOfTable.DisabledBackColor = System.Drawing.Color.Empty; this.panelOfTable.Dock = System.Windows.Forms.DockStyle.Bottom; this.panelOfTable.Location = new System.Drawing.Point(0, 414); this.panelOfTable.Name = "panelOfTable"; @@ -3042,12 +3061,12 @@ // expandableSplitter2 // this.expandableSplitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter2.Dock = System.Windows.Forms.DockStyle.Top; this.expandableSplitter2.ExpandableControl = this.panelOfTable; - this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -3059,11 +3078,11 @@ this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -3183,7 +3202,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(149, 290); + this.toolRightMenu.Size = new System.Drawing.Size(153, 312); // // 量算ToolStripMenuItem // @@ -3259,7 +3278,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -4125,8 +4144,6 @@ // superTooltip1 // this.superTooltip1.DefaultFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); - this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.superTooltip1.MinimumTooltipSize = new System.Drawing.Size(150, 50); // // buttonItem16 @@ -4233,12 +4250,13 @@ // // // + this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4255,7 +4273,7 @@ this.ribbonControl1.Location = new System.Drawing.Point(0, 82); this.ribbonControl1.MdiSystemItemVisible = false; this.ribbonControl1.Name = "ribbonControl1"; - this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); this.ribbonControl1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem19}); this.ribbonControl1.Size = new System.Drawing.Size(1328, 97); @@ -4292,21 +4310,23 @@ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel1.Style.Class = ""; this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseDown.Class = ""; this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4315,14 +4335,15 @@ // // // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.BackgroundStyle.Class = ""; this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.ContainerControlProcessDialogKey = true; this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.DragDropSupport = true; this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem87, this.buttonItem88, @@ -4333,20 +4354,21 @@ this.btnlegendSet, this.buttonItem89, this.btnOutputJPG}); - this.ribbonBar21.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 58); + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; // // // + this.ribbonBar21.TitleStyle.Class = ""; this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.TitleVisible = false; // @@ -4436,14 +4458,17 @@ // // // + this.ribbonPanel12.Style.Class = ""; this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseDown.Class = ""; this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseOver.Class = ""; this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel12.TabIndex = 34; this.ribbonPanel12.Visible = false; @@ -4454,18 +4479,18 @@ // // // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.BackgroundStyle.Class = ""; this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.ContainerControlProcessDialogKey = true; this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.DragDropSupport = true; this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem133, this.buttonItem132}); - this.ribbonBar18.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; this.ribbonBar18.Size = new System.Drawing.Size(171, 59); @@ -4474,10 +4499,12 @@ // // // + this.ribbonBar18.TitleStyle.Class = ""; this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.TitleVisible = false; // @@ -4506,14 +4533,15 @@ // // // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.BackgroundStyle.Class = ""; this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.ContainerControlProcessDialogKey = true; this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.DragDropSupport = true; this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem127, this.buttonItem128, @@ -4521,7 +4549,6 @@ this.buttonItem134, this.buttonItem130, this.btn_check_history}); - this.ribbonBar13.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; this.ribbonBar13.Size = new System.Drawing.Size(505, 59); @@ -4530,10 +4557,12 @@ // // // + this.ribbonBar13.TitleStyle.Class = ""; this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.TitleVisible = false; // @@ -4604,14 +4633,17 @@ // // // + this.ribbonPanel5.Style.Class = ""; this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseDown.Class = ""; this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseOver.Class = ""; this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel5.TabIndex = 37; this.ribbonPanel5.Visible = false; @@ -4622,20 +4654,20 @@ // // // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.BackgroundStyle.Class = ""; this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.ContainerControlProcessDialogKey = true; this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.DragDropSupport = true; this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemHX1, this.buttonItemHX2, this.buttonItemDCTP, this.sliderItem3}); - this.ribbonBar2.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; this.ribbonBar2.Size = new System.Drawing.Size(350, 59); @@ -4644,10 +4676,12 @@ // // // + this.ribbonBar2.TitleStyle.Class = ""; this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.TitleVisible = false; // @@ -4701,14 +4735,17 @@ // // // + this.ribbonPanel2.Style.Class = ""; this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseDown.Class = ""; this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; this.ribbonPanel2.Visible = false; @@ -4719,14 +4756,15 @@ // // // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.BackgroundStyle.Class = ""; this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.ContainerControlProcessDialogKey = true; this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.DragDropSupport = true; this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_user_info, this.btn_role_info, @@ -4735,7 +4773,6 @@ this.btn_user_role, this.btn_password_edit, this.buttonItemPasswordReset}); - this.ribbonBar3.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; this.ribbonBar3.Size = new System.Drawing.Size(551, 59); @@ -4744,10 +4781,12 @@ // // // + this.ribbonBar3.TitleStyle.Class = ""; this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.TitleVisible = false; // @@ -4823,20 +4862,24 @@ this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel15.Style.Class = ""; this.ribbonPanel15.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseDown.Class = ""; this.ribbonPanel15.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4844,14 +4887,15 @@ // // // + this.ribbonBar20.BackgroundMouseOverStyle.Class = ""; this.ribbonBar20.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.BackgroundStyle.Class = ""; this.ribbonBar20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.ContainerControlProcessDialogKey = true; this.ribbonBar20.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar20.DragDropSupport = true; this.ribbonBar20.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSH, this.buttonItemSJGL, @@ -4865,19 +4909,20 @@ this.buttonItemBJ, this.buttonItemSearch, this.buttonItemBZ}); - this.ribbonBar20.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(814, 58); + this.ribbonBar20.Size = new System.Drawing.Size(814, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // // // + this.ribbonBar20.TitleStyle.Class = ""; this.ribbonBar20.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.TitleStyleMouseOver.Class = ""; this.ribbonBar20.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.TitleVisible = false; // @@ -5070,18 +5115,21 @@ // this.buttonItem10.Name = "buttonItem10"; this.buttonItem10.Text = "管线入库-高程"; + this.buttonItem10.Visible = false; this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // // buttonItem11 // this.buttonItem11.Name = "buttonItem11"; this.buttonItem11.Text = "附属物入库-高程"; + this.buttonItem11.Visible = false; this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // // buttonItem12 // this.buttonItem12.Name = "buttonItem12"; this.buttonItem12.Text = "特征管点入库-高程"; + this.buttonItem12.Visible = false; this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // // buttonItemSJGL5 @@ -6226,14 +6274,17 @@ // // // + this.ribbonPanel4.Style.Class = ""; this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseDown.Class = ""; this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseOver.Class = ""; this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel4.TabIndex = 36; this.ribbonPanel4.Visible = false; @@ -6244,17 +6295,17 @@ // // // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.BackgroundStyle.Class = ""; this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.ContainerControlProcessDialogKey = true; this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.DragDropSupport = true; this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_document_info}); - this.ribbonBar1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; this.ribbonBar1.Size = new System.Drawing.Size(88, 59); @@ -6263,10 +6314,12 @@ // // // + this.ribbonBar1.TitleStyle.Class = ""; this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.TitleVisible = false; // @@ -6291,14 +6344,17 @@ // // // + this.ribbonPanel6.Style.Class = ""; this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseDown.Class = ""; this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseOver.Class = ""; this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel6.TabIndex = 38; this.ribbonPanel6.Visible = false; @@ -6309,21 +6365,21 @@ // // // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.BackgroundStyle.Class = ""; this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.ContainerControlProcessDialogKey = true; this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.DragDropSupport = true; this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSPSZ, this.buttonItem8, this.buttonItemLocation, this.sliderItem2, this.buttonItemGBJC}); - this.ribbonBar6.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; this.ribbonBar6.Size = new System.Drawing.Size(427, 59); @@ -6332,10 +6388,12 @@ // // // + this.ribbonBar6.TitleStyle.Class = ""; this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.TitleVisible = false; // @@ -6388,6 +6446,7 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6438,7 +6497,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -7045,7 +7103,7 @@ private DevComponents.DotNetBar.LabelX labelX25; private DevComponents.DotNetBar.PanelEx panelEx3; private System.Windows.Forms.TreeView layerSensorTree; - // private System.Windows.Forms.TreeView layerTree; + // private System.Windows.Forms.TreeView layerTree; private MyTreeView layerTree; private DevComponents.DotNetBar.ButtonX buttonX7; private DevComponents.DotNetBar.ButtonX buttonX16; diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config new file mode 100644 index 0000000..f4cbe66 --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe.config @@ -0,0 +1,32 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb index c7cb8c3..c0fad4a 100644 --- a/bin/x86/Debug/Cyberpipe.pdb +++ b/bin/x86/Debug/Cyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index 3dc3245..1fc46d0 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5f45ee7..9615fbf 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt index b8d8198..c6fbef0 100644 --- a/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -342,8 +342,186 @@ F:\predator\codeReview\GHFX_SZ_64\obj\x64\Debug\Cyberpipe.pdb F:\predator\codeReview\GHFX_SZ_64\bin\x86\Debug\office.dll F:\predator\codeReview\GHFX_SZ_64\bin\x86\Debug\office.xml -D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe.config +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.csproj.ResolveComReference.cache +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.pdb +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\office.dll +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\office.xml +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FormDocumentManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmAddYuBiZiShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGBJCresult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmWait.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\PipeLine.Forms.FrmAddPipelineCoordinate.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGongShuiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmMnModify.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPipelineModelDataOneStep.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmShLayers.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmShRK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmTongXunAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmAddWellShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccess.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoriesgather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoryAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddValve.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddWellShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddYuBiZiShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAllWorkWellStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAnalysisGuiHuaResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPP.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPAuditor.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPFORASK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPFORASKReason.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPregion.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAppUSER.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAppUSERRESET.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBACKORACLE.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBSQDuoBianXingStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBSQStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBufferAnalysisBSQ.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmChangePassword.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCheckHistory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCodingQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCompareFeature.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCreateUser.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCustomLabel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDataBaseOpt.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDatabaseParaSetting2.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDbManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDocumentEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDownloadProgress.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmExportCADS.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlySetDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBasicQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBoosterValvers.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBufferAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDatabaseParaSetting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DigFillAnalysisDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBaseLineProfillAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGenAndFaMenTopu.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGenTopo.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCloseValves.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDigPitSetting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFittingQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlow.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlyToPosition.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFolderSelecter.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFTAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGBJC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGenAndFaMenTopu.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGHRK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHotFuncStat.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHotFuncStatTitle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmKeywordQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLayerControl.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogDescription.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogin.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogOper.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMDDictory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadata.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadataOutput.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadataStat.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMultiPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmOperMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPerm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPermMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeDeepstatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeDiametergather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Frmpipediameterstatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeMaterialGather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPaiShuiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmProject.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmRanQiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddPipeFitting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAllPipelineStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDiameterQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFWPipeLineStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRedlineResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleInfoManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleRescManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmShResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoManger.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoPassword.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmThreeOracle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRole.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValveStatistics.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMaterialSel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.frmPipeSetEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmProfileAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPropertiesMarker.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmOper.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQueryHistory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQueryMessage.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQuerySensorAlarm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegion.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionType.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionTypeMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRESC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRESCMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRole.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetGoalLayer.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmTackPolygonDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHDMAnalysis3.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLineCoordinate.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQuerySQL.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserAdd.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRepo.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRepoMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValiData.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmYJSHTC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Frm_password_reset.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSfiles.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSinout.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSProjedits.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.MainFrm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCreateTunnel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCitySevenLineType.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile_AddField.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile_DeleteField.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmExportVector.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFloodAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCityServerLineAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMarker.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPipelineIndented.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMFiles.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMInout.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMTitle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMProjedit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Properties.Resources.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetLatLonPos.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSceneLightSet.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetFlytoPos.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoriesSensor.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValiDataShowErrorMessage.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddInstrument.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.SysRescInfoManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.read.1.tlog +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.write.1.tlog +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.exe +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.pdb +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe.config D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.csproj.ResolveComReference.cache +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.exe +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.pdb +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\office.dll +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\office.xml +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources @@ -507,3 +685,4 @@ D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.SysRescInfoManager.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.read.1.tlog D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.write.1.tlog +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.pdb diff --git a/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache b/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache index b4283e0..b05ca27 100644 --- a/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache +++ b/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache b/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache deleted file mode 100644 index 208d7b0..0000000 --- a/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.exe b/obj/x64/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/obj/x64/Debug/Cyberpipe.exe Binary files differ diff --git a/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache index 5359685..8476256 100644 --- a/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 4f0593d..fe2b7f8 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -9,30 +9,45 @@ using GeoScene.Data; using GeoScene.Globe; using DevComponents.DotNetBar; +using System.Collections; namespace Cyberpipe { public partial class FrmAllWorkWellStatis : DevComponents.DotNetBar.Office2007Form { - Dictionary workWellLengthAndType = new Dictionary(); - List list = new List(); + + private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; + private Dictionary map = null; DataGridView dataGridViewX1; ToolStripStatusLabel toolStripNumbers; GSOGlobeControl globeControl1; PanelEx panel; - public FrmAllWorkWellStatis(Dictionary wellLen, List _list, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) + //TODOLIST：用晓伟的代理进行操作，功能拆分细化 + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) { InitializeComponent(); panel = p; - workWellLengthAndType = wellLen; - list = _list; dataGridViewX1 = dataGridViewX11; toolStripNumbers = toolStripNumbers1; - globeControl1 = ctl; + map = getAccsMap(polygon); + + } + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, MainFrm.DataGridViewDelegate InitDataGridViewX1, GSOGlobeControl ctl) + { + InitializeComponent(); + globeControl1 = ctl; + m_InitDataGridViewX1 = InitDataGridViewX1; + map = getAccsMap(polygon); + } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) { + drawChart(); + } + + public void drawChart() + { try { // Set axis title @@ -49,6 +64,11 @@ chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; + Dictionary workWellLengthAndType = new Dictionary(); + foreach (KeyValuePair kv in map) + { + workWellLengthAndType.Add(kv.Key, kv.Value.Length); + } chartAllAreaPipeline.Series["井盖"].Points.DataBindXY(workWellLengthAndType.Keys, workWellLengthAndType.Values); for (int m = 0; m < workWellLengthAndType.Values.Count; m++) { @@ -71,11 +91,11 @@ if (indexHit >= 0) { - GSOFeatures fs = list[indexHit]; + //GSOFeatures fs = list[indexHit]; string sql = ""; string pipetype = chartAllAreaPipeline.Series["井盖"].Points[indexHit].AxisLabel; - + GSOFeatures fs = map[pipetype]; string layername = ""; if (pipetype.EndsWith("窖井") || pipetype.EndsWith("表井") || (pipetype.EndsWith("窨井")) || pipetype.EndsWith("孔") || @@ -93,6 +113,23 @@ { return; } + //从图层获取datatable数据,不涉及数据库操作，速度会快一些 + //string [] fieldNames = GSOFeatureUtils.getFields(layername, globeControl1); + //DataTable dt = GSOFeatureUtils.convertGSOFeatures2DataTable(fs,fieldNames); + //if (dt.Rows.Count > 0) + //{ + // dataGridViewX1.DataSource = dt; + // panel.Visible = true; + // toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //} + //else + //{ + // panel.Visible = false; + // dataGridViewX1.DataSource = null; + // dataGridViewX1.Refresh(); + // toolStripNumbers.Text = "类型："; + //} + //数据库获取数据 if (fs.Length > 0) { sql = "select " + getpipeLineFields.getFields(layername, globeControl1) + " from " + layer.Name; @@ -120,8 +157,8 @@ { dataGridViewX1.DataSource = dt; panel.Visible = true; - //toolStripNumbers.Text = " 井盖类型：" + MainFrm.m_CurrentQueryLayer + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + string strLable = toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //m_InitDataGridViewX1(dt, strLable, "", true); } else { @@ -131,7 +168,6 @@ toolStripNumbers.Text = "类型："; } - //} } @@ -174,7 +210,7 @@ } } } - + //m_InitDataGridViewX1(null,"","" , false); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } @@ -183,5 +219,63 @@ PATM_Forms.F_PATMTitle frm = new PATM_Forms.F_PATMTitle("S", chartAllAreaPipeline); frm.Show(); } + + //获取指定layer类型的附属物名称列表 + public string[] getLayerAccNames(string layerType) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(layerType + "管线附属物"); + if (layer == null) return null; + + string sql = "select 附属物名称 from " + layerType + "管线附属物 group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layerType + "管线附属物"); + if (dataset == null) return null; + + int count = dataset.Tables[0].Rows.Count; + + + string[] result = new string[count]; + for (int i = 0; i < count; i++) + { + result[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return result; + } + + /// + /// 获取区域内各图层的井、孔、蓖的map + /// + /// 区域 + /// 要查找的附属物名称数组、如井、孔、蓖 + /// 返回值为：<图层+附属物名称,附属物列表> + + public Dictionary getAccsMap(GSOGeoPolygon3D polygon) + { + //List list = new List(); + Dictionary map = new Dictionary(); + ArrayList listpt = Utility.LayerNamesList; + if (listpt == null || listpt.Count == 0) return null; + FeatureStatisticsService service = new FeatureStatisticsService(); + for (int i = 0; i < listpt.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listpt[i] + "管线附属物"); + string[] accNames = getLayerAccNames(listpt[i] as string); + if (accNames == null || accNames.Length == 0) continue;//排除不合法的值 + for (int j = 0; j < accNames.Length; j++) + { + if (accNames[j].Contains("井") || accNames[j].Contains("孔") || accNames[j].Contains("篦")) + { + + GSOFeatures features = service.Intersect_PointLayerByType(polygon, layer, accNames[j]); + if (features == null) continue; + map.Add(listpt[i] + accNames[j], features); + } + + } + + } + return map; + + } + } } diff --git a/MainFrm.cs b/MainFrm.cs index ac2614d..b584749 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2951,35 +2951,35 @@ break; case "workwellquery": - workWellLen.Clear(); - List listWell = new List(); - //找到所有井 - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //workWellLen.Clear(); + //List listWell = new List(); + ////找到所有井 + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - listWell.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // listWell.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(workWellLen, listWell, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(polygon, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frmWell.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -9740,37 +9740,37 @@ private void buttonItemTJ3_ALL_Click(object sender, EventArgs e) { //日志记录 - LogManager.saveLog(Utility.userName, "井盖数量统计"); + //LogManager.saveLog(Utility.userName, "井盖数量统计"); - workWellLen.Clear(); - List list = new List(); + //workWellLen.Clear(); + //List list = new List(); - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - list.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // list.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(workWellLen, list, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(null, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frm.Show(this); } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ae24fb9..5c2bb7f 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -706,7 +706,6 @@ this.dotNetBarManager1.BottomDockSite = this.dockSite4; this.dotNetBarManager1.EnableFullSizeDock = false; this.dotNetBarManager1.LeftDockSite = this.dockSite1; - this.dotNetBarManager1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.dotNetBarManager1.ParentForm = null; this.dotNetBarManager1.RightDockSite = this.dockSite2; this.dotNetBarManager1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003; @@ -799,7 +798,6 @@ // styleManager1 // this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Office2010Blue; - this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(87)))), ((int)(((byte)(154)))))); // // sideBarPanelItem1 // @@ -848,7 +846,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -894,6 +892,7 @@ this.ribbonTabItemGroup1.Style.BorderRightWidth = 1; this.ribbonTabItemGroup1.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ribbonTabItemGroup1.Style.BorderTopWidth = 1; + this.ribbonTabItemGroup1.Style.Class = ""; this.ribbonTabItemGroup1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonTabItemGroup1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.ribbonTabItemGroup1.Style.TextColor = System.Drawing.Color.White; @@ -906,6 +905,7 @@ // // // + this.galleryContainer2.BackgroundStyle.Class = ""; this.galleryContainer2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer2.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer2.Name = "galleryContainer2"; @@ -915,10 +915,6 @@ this.buttonItem39}); this.galleryContainer2.Text = "断面分析"; // - // - // - this.galleryContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem38 // this.buttonItem38.Name = "buttonItem38"; @@ -939,16 +935,13 @@ // // // + this.galleryContainer3.BackgroundStyle.Class = ""; this.galleryContainer3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer3.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer3.Name = "galleryContainer3"; this.galleryContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem3}); // - // - // - this.galleryContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem3 // this.buttonItem3.Name = "buttonItem3"; @@ -959,6 +952,7 @@ // // // + this.galleryContainer4.BackgroundStyle.Class = ""; this.galleryContainer4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer4.MinimumSize = new System.Drawing.Size(150, 58); this.galleryContainer4.Name = "galleryContainer4"; @@ -970,10 +964,6 @@ this.buttonItem46}); this.galleryContainer4.Text = "断面分析"; // - // - // - this.galleryContainer4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem40 // this.buttonItem40.Name = "buttonItem40"; @@ -1004,6 +994,7 @@ // // // + this.galleryContainer5.BackgroundStyle.Class = ""; this.galleryContainer5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer5.MinimumSize = new System.Drawing.Size(80, 58); this.galleryContainer5.Name = "galleryContainer5"; @@ -1011,10 +1002,6 @@ this.buttonItem44, this.buttonItem43}); // - // - // - this.galleryContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem44 // this.buttonItem44.Name = "buttonItem44"; @@ -1030,16 +1017,13 @@ // // // + this.galleryContainer6.BackgroundStyle.Class = ""; this.galleryContainer6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer6.MinimumSize = new System.Drawing.Size(70, 58); this.galleryContainer6.Name = "galleryContainer6"; this.galleryContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem48}); // - // - // - this.galleryContainer6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem48 // this.buttonItem48.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right; @@ -1073,7 +1057,6 @@ this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx3.Controls.Add(this.layerSensorTree); - this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx3.Location = new System.Drawing.Point(54, 113); this.panelEx3.Name = "panelEx3"; this.panelEx3.Size = new System.Drawing.Size(200, 161); @@ -1188,6 +1171,7 @@ // // // + this.labelX25.BackgroundStyle.Class = ""; this.labelX25.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX25.Location = new System.Drawing.Point(7, 364); this.labelX25.Name = "labelX25"; @@ -1252,6 +1236,7 @@ // // // + this.labelX8.BackgroundStyle.Class = ""; this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX8.Location = new System.Drawing.Point(11, 60); this.labelX8.Name = "labelX8"; @@ -1384,6 +1369,7 @@ // // // + this.checkBoxX3.BackgroundStyle.Class = ""; this.checkBoxX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX3.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX3.Location = new System.Drawing.Point(11, 9); @@ -1401,6 +1387,7 @@ // // // + this.checkBoxX4.BackgroundStyle.Class = ""; this.checkBoxX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX4.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX4.Location = new System.Drawing.Point(110, 9); @@ -1418,6 +1405,7 @@ // // // + this.labelX13.BackgroundStyle.Class = ""; this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX13.Location = new System.Drawing.Point(11, 32); this.labelX13.Name = "labelX13"; @@ -1432,6 +1420,7 @@ // // // + this.labelX14.BackgroundStyle.Class = ""; this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX14.Location = new System.Drawing.Point(10, 204); this.labelX14.Name = "labelX14"; @@ -1509,7 +1498,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(181, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(198, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -1534,6 +1523,7 @@ // // // + this.labelX9.BackgroundStyle.Class = ""; this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX9.Location = new System.Drawing.Point(9, 85); this.labelX9.Name = "labelX9"; @@ -1592,7 +1582,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(180, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(197, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -1635,6 +1625,7 @@ // // // + this.labelX10.BackgroundStyle.Class = ""; this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX10.Location = new System.Drawing.Point(172, 54); this.labelX10.Name = "labelX10"; @@ -1665,6 +1656,7 @@ // // // + this.checkBoxX5.BackgroundStyle.Class = ""; this.checkBoxX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX5.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX5.Location = new System.Drawing.Point(19, 4); @@ -1682,6 +1674,7 @@ // // // + this.checkBoxX6.BackgroundStyle.Class = ""; this.checkBoxX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX6.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX6.Location = new System.Drawing.Point(114, 4); @@ -1699,6 +1692,7 @@ // // // + this.labelX12.BackgroundStyle.Class = ""; this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX12.Location = new System.Drawing.Point(6, 57); this.labelX12.Name = "labelX12"; @@ -1713,6 +1707,7 @@ // // // + this.labelX16.BackgroundStyle.Class = ""; this.labelX16.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX16.Location = new System.Drawing.Point(6, 28); this.labelX16.Name = "labelX16"; @@ -1727,6 +1722,7 @@ // // // + this.labelX17.BackgroundStyle.Class = ""; this.labelX17.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX17.Location = new System.Drawing.Point(8, 235); this.labelX17.Name = "labelX17"; @@ -1772,6 +1768,7 @@ // // // + this.labelX24.BackgroundStyle.Class = ""; this.labelX24.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX24.Image = ((System.Drawing.Image)(resources.GetObject("labelX24.Image"))); this.labelX24.Location = new System.Drawing.Point(7, 403); @@ -1804,7 +1801,7 @@ this.dataGridViewX8.ReadOnly = true; this.dataGridViewX8.RowHeadersVisible = false; this.dataGridViewX8.RowTemplate.Height = 23; - this.dataGridViewX8.Size = new System.Drawing.Size(176, 92); + this.dataGridViewX8.Size = new System.Drawing.Size(193, 92); this.dataGridViewX8.TabIndex = 11; // // dataGridViewTextBoxColumn12 @@ -1838,6 +1835,7 @@ // // // + this.labelX11.BackgroundStyle.Class = ""; this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX11.Location = new System.Drawing.Point(10, 93); this.labelX11.Name = "labelX11"; @@ -1898,7 +1896,7 @@ this.dataGridViewX9.ReadOnly = true; this.dataGridViewX9.RowHeadersVisible = false; this.dataGridViewX9.RowTemplate.Height = 23; - this.dataGridViewX9.Size = new System.Drawing.Size(175, 127); + this.dataGridViewX9.Size = new System.Drawing.Size(192, 127); this.dataGridViewX9.TabIndex = 5; this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick); // @@ -1973,6 +1971,7 @@ // // // + this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX15.Location = new System.Drawing.Point(174, 61); this.labelX15.Name = "labelX15"; @@ -2003,6 +2002,7 @@ // // // + this.checkBoxX7.BackgroundStyle.Class = ""; this.checkBoxX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX7.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX7.Location = new System.Drawing.Point(8, 5); @@ -2020,6 +2020,7 @@ // // // + this.checkBoxX8.BackgroundStyle.Class = ""; this.checkBoxX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX8.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX8.Location = new System.Drawing.Point(118, 5); @@ -2037,6 +2038,7 @@ // // // + this.labelX19.BackgroundStyle.Class = ""; this.labelX19.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX19.Location = new System.Drawing.Point(11, 61); this.labelX19.Name = "labelX19"; @@ -2051,6 +2053,7 @@ // // // + this.labelX21.BackgroundStyle.Class = ""; this.labelX21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX21.Location = new System.Drawing.Point(10, 29); this.labelX21.Name = "labelX21"; @@ -2062,6 +2065,7 @@ // // // + this.labelX22.BackgroundStyle.Class = ""; this.labelX22.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX22.Image = ((System.Drawing.Image)(resources.GetObject("labelX22.Image"))); this.labelX22.Location = new System.Drawing.Point(9, 245); @@ -2139,6 +2143,7 @@ // // // + this.labelX28.BackgroundStyle.Class = ""; this.labelX28.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX28.Location = new System.Drawing.Point(181, 104); this.labelX28.Name = "labelX28"; @@ -2154,6 +2159,7 @@ // // // + this.labelX29.BackgroundStyle.Class = ""; this.labelX29.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX29.Location = new System.Drawing.Point(6, 100); this.labelX29.Name = "labelX29"; @@ -2186,6 +2192,7 @@ // // // + this.labelX4.BackgroundStyle.Class = ""; this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Image = ((System.Drawing.Image)(resources.GetObject("labelX4.Image"))); this.labelX4.Location = new System.Drawing.Point(7, 432); @@ -2249,6 +2256,7 @@ // // // + this.labelX5.BackgroundStyle.Class = ""; this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Image = ((System.Drawing.Image)(resources.GetObject("labelX5.Image"))); this.labelX5.Location = new System.Drawing.Point(9, 134); @@ -2383,6 +2391,7 @@ // // // + this.labelX18.BackgroundStyle.Class = ""; this.labelX18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX18.Location = new System.Drawing.Point(181, 71); this.labelX18.Name = "labelX18"; @@ -2413,6 +2422,7 @@ // // // + this.checkBoxSelectPipeline.BackgroundStyle.Class = ""; this.checkBoxSelectPipeline.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectPipeline.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectPipeline.Location = new System.Drawing.Point(8, 9); @@ -2430,6 +2440,7 @@ // // // + this.checkBoxSelectLayer.BackgroundStyle.Class = ""; this.checkBoxSelectLayer.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectLayer.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectLayer.Location = new System.Drawing.Point(117, 9); @@ -2447,6 +2458,7 @@ // // // + this.labelX20.BackgroundStyle.Class = ""; this.labelX20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX20.Location = new System.Drawing.Point(6, 69); this.labelX20.Name = "labelX20"; @@ -2458,6 +2470,7 @@ // // // + this.labelX26.BackgroundStyle.Class = ""; this.labelX26.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX26.Image = ((System.Drawing.Image)(resources.GetObject("labelX26.Image"))); this.labelX26.Location = new System.Drawing.Point(9, 38); @@ -2470,6 +2483,7 @@ // // // + this.labelX27.BackgroundStyle.Class = ""; this.labelX27.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX27.Image = ((System.Drawing.Image)(resources.GetObject("labelX27.Image"))); this.labelX27.Location = new System.Drawing.Point(7, 287); @@ -2482,6 +2496,7 @@ // // // + this.labelX30.BackgroundStyle.Class = ""; this.labelX30.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX30.Location = new System.Drawing.Point(88, 100); this.labelX30.Name = "labelX30"; @@ -2514,6 +2529,7 @@ // // // + this.labelX23.BackgroundStyle.Class = ""; this.labelX23.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX23.Image = ((System.Drawing.Image)(resources.GetObject("labelX23.Image"))); this.labelX23.Location = new System.Drawing.Point(11, 404); @@ -2577,6 +2593,7 @@ // // // + this.labelX2.BackgroundStyle.Class = ""; this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Image = ((System.Drawing.Image)(resources.GetObject("labelX2.Image"))); this.labelX2.Location = new System.Drawing.Point(12, 100); @@ -2703,6 +2720,7 @@ // // // + this.labelX7.BackgroundStyle.Class = ""; this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX7.Location = new System.Drawing.Point(176, 67); this.labelX7.Name = "labelX7"; @@ -2733,6 +2751,7 @@ // // // + this.checkBoxX1.BackgroundStyle.Class = ""; this.checkBoxX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX1.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX1.Location = new System.Drawing.Point(11, 5); @@ -2750,6 +2769,7 @@ // // // + this.checkBoxX2.BackgroundStyle.Class = ""; this.checkBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX2.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX2.Location = new System.Drawing.Point(120, 5); @@ -2767,6 +2787,7 @@ // // // + this.labelX6.BackgroundStyle.Class = ""; this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX6.Location = new System.Drawing.Point(15, 67); this.labelX6.Name = "labelX6"; @@ -2778,6 +2799,7 @@ // // // + this.labelX1.BackgroundStyle.Class = ""; this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Image = ((System.Drawing.Image)(resources.GetObject("labelX1.Image"))); this.labelX1.Location = new System.Drawing.Point(12, 34); @@ -2790,6 +2812,7 @@ // // // + this.labelX3.BackgroundStyle.Class = ""; this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Image = ((System.Drawing.Image)(resources.GetObject("labelX3.Image"))); this.labelX3.Location = new System.Drawing.Point(11, 250); @@ -2800,11 +2823,11 @@ // expandableSplitter1 // this.expandableSplitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -2816,11 +2839,11 @@ this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -2837,7 +2860,6 @@ this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx4.Controls.Add(this.splitContainer1); this.panelEx4.Controls.Add(this.panelOfTable); - this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx4.Location = new System.Drawing.Point(203, 179); this.panelEx4.Name = "panelEx4"; @@ -2878,7 +2900,6 @@ this.panelEx5.Controls.Add(this.panel1); this.panelEx5.Controls.Add(this.panel3); this.panelEx5.Controls.Add(this.panel5); - this.panelEx5.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx5.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx5.Location = new System.Drawing.Point(0, 0); this.panelEx5.Name = "panelEx5"; @@ -2921,7 +2942,6 @@ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.Controls.Add(this.panel2); this.panelEx1.Controls.Add(this.panel4); - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; @@ -2944,7 +2964,6 @@ this.panelOfTable.Controls.Add(this.dataGridViewX1); this.panelOfTable.Controls.Add(this.statusStrip2); this.panelOfTable.Controls.Add(this.expandableSplitter2); - this.panelOfTable.DisabledBackColor = System.Drawing.Color.Empty; this.panelOfTable.Dock = System.Windows.Forms.DockStyle.Bottom; this.panelOfTable.Location = new System.Drawing.Point(0, 414); this.panelOfTable.Name = "panelOfTable"; @@ -3042,12 +3061,12 @@ // expandableSplitter2 // this.expandableSplitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter2.Dock = System.Windows.Forms.DockStyle.Top; this.expandableSplitter2.ExpandableControl = this.panelOfTable; - this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -3059,11 +3078,11 @@ this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -3183,7 +3202,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(149, 290); + this.toolRightMenu.Size = new System.Drawing.Size(153, 312); // // 量算ToolStripMenuItem // @@ -3259,7 +3278,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -4125,8 +4144,6 @@ // superTooltip1 // this.superTooltip1.DefaultFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); - this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.superTooltip1.MinimumTooltipSize = new System.Drawing.Size(150, 50); // // buttonItem16 @@ -4233,12 +4250,13 @@ // // // + this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4255,7 +4273,7 @@ this.ribbonControl1.Location = new System.Drawing.Point(0, 82); this.ribbonControl1.MdiSystemItemVisible = false; this.ribbonControl1.Name = "ribbonControl1"; - this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); this.ribbonControl1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem19}); this.ribbonControl1.Size = new System.Drawing.Size(1328, 97); @@ -4292,21 +4310,23 @@ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel1.Style.Class = ""; this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseDown.Class = ""; this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4315,14 +4335,15 @@ // // // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.BackgroundStyle.Class = ""; this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.ContainerControlProcessDialogKey = true; this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.DragDropSupport = true; this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem87, this.buttonItem88, @@ -4333,20 +4354,21 @@ this.btnlegendSet, this.buttonItem89, this.btnOutputJPG}); - this.ribbonBar21.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 58); + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; // // // + this.ribbonBar21.TitleStyle.Class = ""; this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.TitleVisible = false; // @@ -4436,14 +4458,17 @@ // // // + this.ribbonPanel12.Style.Class = ""; this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseDown.Class = ""; this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseOver.Class = ""; this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel12.TabIndex = 34; this.ribbonPanel12.Visible = false; @@ -4454,18 +4479,18 @@ // // // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.BackgroundStyle.Class = ""; this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.ContainerControlProcessDialogKey = true; this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.DragDropSupport = true; this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem133, this.buttonItem132}); - this.ribbonBar18.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; this.ribbonBar18.Size = new System.Drawing.Size(171, 59); @@ -4474,10 +4499,12 @@ // // // + this.ribbonBar18.TitleStyle.Class = ""; this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.TitleVisible = false; // @@ -4506,14 +4533,15 @@ // // // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.BackgroundStyle.Class = ""; this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.ContainerControlProcessDialogKey = true; this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.DragDropSupport = true; this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem127, this.buttonItem128, @@ -4521,7 +4549,6 @@ this.buttonItem134, this.buttonItem130, this.btn_check_history}); - this.ribbonBar13.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; this.ribbonBar13.Size = new System.Drawing.Size(505, 59); @@ -4530,10 +4557,12 @@ // // // + this.ribbonBar13.TitleStyle.Class = ""; this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.TitleVisible = false; // @@ -4604,14 +4633,17 @@ // // // + this.ribbonPanel5.Style.Class = ""; this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseDown.Class = ""; this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseOver.Class = ""; this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel5.TabIndex = 37; this.ribbonPanel5.Visible = false; @@ -4622,20 +4654,20 @@ // // // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.BackgroundStyle.Class = ""; this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.ContainerControlProcessDialogKey = true; this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.DragDropSupport = true; this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemHX1, this.buttonItemHX2, this.buttonItemDCTP, this.sliderItem3}); - this.ribbonBar2.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; this.ribbonBar2.Size = new System.Drawing.Size(350, 59); @@ -4644,10 +4676,12 @@ // // // + this.ribbonBar2.TitleStyle.Class = ""; this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.TitleVisible = false; // @@ -4701,14 +4735,17 @@ // // // + this.ribbonPanel2.Style.Class = ""; this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseDown.Class = ""; this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; this.ribbonPanel2.Visible = false; @@ -4719,14 +4756,15 @@ // // // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.BackgroundStyle.Class = ""; this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.ContainerControlProcessDialogKey = true; this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.DragDropSupport = true; this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_user_info, this.btn_role_info, @@ -4735,7 +4773,6 @@ this.btn_user_role, this.btn_password_edit, this.buttonItemPasswordReset}); - this.ribbonBar3.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; this.ribbonBar3.Size = new System.Drawing.Size(551, 59); @@ -4744,10 +4781,12 @@ // // // + this.ribbonBar3.TitleStyle.Class = ""; this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.TitleVisible = false; // @@ -4823,20 +4862,24 @@ this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel15.Style.Class = ""; this.ribbonPanel15.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseDown.Class = ""; this.ribbonPanel15.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4844,14 +4887,15 @@ // // // + this.ribbonBar20.BackgroundMouseOverStyle.Class = ""; this.ribbonBar20.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.BackgroundStyle.Class = ""; this.ribbonBar20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.ContainerControlProcessDialogKey = true; this.ribbonBar20.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar20.DragDropSupport = true; this.ribbonBar20.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSH, this.buttonItemSJGL, @@ -4865,19 +4909,20 @@ this.buttonItemBJ, this.buttonItemSearch, this.buttonItemBZ}); - this.ribbonBar20.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(814, 58); + this.ribbonBar20.Size = new System.Drawing.Size(814, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // // // + this.ribbonBar20.TitleStyle.Class = ""; this.ribbonBar20.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.TitleStyleMouseOver.Class = ""; this.ribbonBar20.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.TitleVisible = false; // @@ -5070,18 +5115,21 @@ // this.buttonItem10.Name = "buttonItem10"; this.buttonItem10.Text = "管线入库-高程"; + this.buttonItem10.Visible = false; this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // // buttonItem11 // this.buttonItem11.Name = "buttonItem11"; this.buttonItem11.Text = "附属物入库-高程"; + this.buttonItem11.Visible = false; this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // // buttonItem12 // this.buttonItem12.Name = "buttonItem12"; this.buttonItem12.Text = "特征管点入库-高程"; + this.buttonItem12.Visible = false; this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // // buttonItemSJGL5 @@ -6226,14 +6274,17 @@ // // // + this.ribbonPanel4.Style.Class = ""; this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseDown.Class = ""; this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseOver.Class = ""; this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel4.TabIndex = 36; this.ribbonPanel4.Visible = false; @@ -6244,17 +6295,17 @@ // // // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.BackgroundStyle.Class = ""; this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.ContainerControlProcessDialogKey = true; this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.DragDropSupport = true; this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_document_info}); - this.ribbonBar1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; this.ribbonBar1.Size = new System.Drawing.Size(88, 59); @@ -6263,10 +6314,12 @@ // // // + this.ribbonBar1.TitleStyle.Class = ""; this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.TitleVisible = false; // @@ -6291,14 +6344,17 @@ // // // + this.ribbonPanel6.Style.Class = ""; this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseDown.Class = ""; this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseOver.Class = ""; this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel6.TabIndex = 38; this.ribbonPanel6.Visible = false; @@ -6309,21 +6365,21 @@ // // // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.BackgroundStyle.Class = ""; this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.ContainerControlProcessDialogKey = true; this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.DragDropSupport = true; this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSPSZ, this.buttonItem8, this.buttonItemLocation, this.sliderItem2, this.buttonItemGBJC}); - this.ribbonBar6.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; this.ribbonBar6.Size = new System.Drawing.Size(427, 59); @@ -6332,10 +6388,12 @@ // // // + this.ribbonBar6.TitleStyle.Class = ""; this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.TitleVisible = false; // @@ -6388,6 +6446,7 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6438,7 +6497,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -7045,7 +7103,7 @@ private DevComponents.DotNetBar.LabelX labelX25; private DevComponents.DotNetBar.PanelEx panelEx3; private System.Windows.Forms.TreeView layerSensorTree; - // private System.Windows.Forms.TreeView layerTree; + // private System.Windows.Forms.TreeView layerTree; private MyTreeView layerTree; private DevComponents.DotNetBar.ButtonX buttonX7; private DevComponents.DotNetBar.ButtonX buttonX16; diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config new file mode 100644 index 0000000..f4cbe66 --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe.config @@ -0,0 +1,32 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb index c7cb8c3..c0fad4a 100644 --- a/bin/x86/Debug/Cyberpipe.pdb +++ b/bin/x86/Debug/Cyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index 3dc3245..1fc46d0 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5f45ee7..9615fbf 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt index b8d8198..c6fbef0 100644 --- a/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -342,8 +342,186 @@ F:\predator\codeReview\GHFX_SZ_64\obj\x64\Debug\Cyberpipe.pdb F:\predator\codeReview\GHFX_SZ_64\bin\x86\Debug\office.dll F:\predator\codeReview\GHFX_SZ_64\bin\x86\Debug\office.xml -D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe.config +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.csproj.ResolveComReference.cache +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.pdb +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\office.dll +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\office.xml +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FormDocumentManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmAddYuBiZiShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGBJCresult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmWait.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\PipeLine.Forms.FrmAddPipelineCoordinate.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGongShuiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmMnModify.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPipelineModelDataOneStep.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmShLayers.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmShRK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmTongXunAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmAddWellShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccess.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoriesgather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoryAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddValve.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddWellShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddYuBiZiShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAllWorkWellStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAnalysisGuiHuaResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPP.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPAuditor.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPFORASK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPFORASKReason.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPregion.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAppUSER.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAppUSERRESET.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBACKORACLE.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBSQDuoBianXingStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBSQStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBufferAnalysisBSQ.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmChangePassword.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCheckHistory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCodingQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCompareFeature.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCreateUser.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCustomLabel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDataBaseOpt.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDatabaseParaSetting2.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDbManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDocumentEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDownloadProgress.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmExportCADS.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlySetDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBasicQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBoosterValvers.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBufferAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDatabaseParaSetting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DigFillAnalysisDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBaseLineProfillAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGenAndFaMenTopu.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGenTopo.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCloseValves.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDigPitSetting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFittingQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlow.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlyToPosition.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFolderSelecter.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFTAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGBJC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGenAndFaMenTopu.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGHRK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHotFuncStat.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHotFuncStatTitle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmKeywordQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLayerControl.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogDescription.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogin.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogOper.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMDDictory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadata.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadataOutput.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadataStat.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMultiPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmOperMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPerm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPermMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeDeepstatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeDiametergather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Frmpipediameterstatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeMaterialGather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPaiShuiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmProject.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmRanQiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddPipeFitting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAllPipelineStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDiameterQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFWPipeLineStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRedlineResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleInfoManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleRescManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmShResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoManger.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoPassword.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmThreeOracle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRole.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValveStatistics.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMaterialSel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.frmPipeSetEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmProfileAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPropertiesMarker.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmOper.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQueryHistory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQueryMessage.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQuerySensorAlarm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegion.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionType.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionTypeMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRESC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRESCMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRole.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetGoalLayer.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmTackPolygonDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHDMAnalysis3.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLineCoordinate.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQuerySQL.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserAdd.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRepo.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRepoMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValiData.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmYJSHTC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Frm_password_reset.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSfiles.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSinout.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSProjedits.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.MainFrm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCreateTunnel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCitySevenLineType.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile_AddField.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile_DeleteField.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmExportVector.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFloodAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCityServerLineAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMarker.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPipelineIndented.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMFiles.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMInout.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMTitle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMProjedit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Properties.Resources.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetLatLonPos.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSceneLightSet.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetFlytoPos.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoriesSensor.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValiDataShowErrorMessage.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddInstrument.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.SysRescInfoManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.read.1.tlog +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.write.1.tlog +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.exe +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.pdb +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe.config D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.csproj.ResolveComReference.cache +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.exe +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.pdb +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\office.dll +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\office.xml +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources @@ -507,3 +685,4 @@ D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.SysRescInfoManager.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.read.1.tlog D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.write.1.tlog +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.pdb diff --git a/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache b/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache index b4283e0..b05ca27 100644 --- a/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache +++ b/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache b/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache deleted file mode 100644 index 208d7b0..0000000 --- a/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.exe b/obj/x64/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/obj/x64/Debug/Cyberpipe.exe Binary files differ diff --git a/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache index 5359685..8476256 100644 --- a/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x64/Debug/GenerateResource.read.1.tlog b/obj/x64/Debug/GenerateResource.read.1.tlog index fa8e7c6..3971f44 100644 --- a/obj/x64/Debug/GenerateResource.read.1.tlog +++ b/obj/x64/Debug/GenerateResource.read.1.tlog Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 4f0593d..fe2b7f8 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -9,30 +9,45 @@ using GeoScene.Data; using GeoScene.Globe; using DevComponents.DotNetBar; +using System.Collections; namespace Cyberpipe { public partial class FrmAllWorkWellStatis : DevComponents.DotNetBar.Office2007Form { - Dictionary workWellLengthAndType = new Dictionary(); - List list = new List(); + + private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; + private Dictionary map = null; DataGridView dataGridViewX1; ToolStripStatusLabel toolStripNumbers; GSOGlobeControl globeControl1; PanelEx panel; - public FrmAllWorkWellStatis(Dictionary wellLen, List _list, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) + //TODOLIST：用晓伟的代理进行操作，功能拆分细化 + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) { InitializeComponent(); panel = p; - workWellLengthAndType = wellLen; - list = _list; dataGridViewX1 = dataGridViewX11; toolStripNumbers = toolStripNumbers1; - globeControl1 = ctl; + map = getAccsMap(polygon); + + } + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, MainFrm.DataGridViewDelegate InitDataGridViewX1, GSOGlobeControl ctl) + { + InitializeComponent(); + globeControl1 = ctl; + m_InitDataGridViewX1 = InitDataGridViewX1; + map = getAccsMap(polygon); + } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) { + drawChart(); + } + + public void drawChart() + { try { // Set axis title @@ -49,6 +64,11 @@ chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; + Dictionary workWellLengthAndType = new Dictionary(); + foreach (KeyValuePair kv in map) + { + workWellLengthAndType.Add(kv.Key, kv.Value.Length); + } chartAllAreaPipeline.Series["井盖"].Points.DataBindXY(workWellLengthAndType.Keys, workWellLengthAndType.Values); for (int m = 0; m < workWellLengthAndType.Values.Count; m++) { @@ -71,11 +91,11 @@ if (indexHit >= 0) { - GSOFeatures fs = list[indexHit]; + //GSOFeatures fs = list[indexHit]; string sql = ""; string pipetype = chartAllAreaPipeline.Series["井盖"].Points[indexHit].AxisLabel; - + GSOFeatures fs = map[pipetype]; string layername = ""; if (pipetype.EndsWith("窖井") || pipetype.EndsWith("表井") || (pipetype.EndsWith("窨井")) || pipetype.EndsWith("孔") || @@ -93,6 +113,23 @@ { return; } + //从图层获取datatable数据,不涉及数据库操作，速度会快一些 + //string [] fieldNames = GSOFeatureUtils.getFields(layername, globeControl1); + //DataTable dt = GSOFeatureUtils.convertGSOFeatures2DataTable(fs,fieldNames); + //if (dt.Rows.Count > 0) + //{ + // dataGridViewX1.DataSource = dt; + // panel.Visible = true; + // toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //} + //else + //{ + // panel.Visible = false; + // dataGridViewX1.DataSource = null; + // dataGridViewX1.Refresh(); + // toolStripNumbers.Text = "类型："; + //} + //数据库获取数据 if (fs.Length > 0) { sql = "select " + getpipeLineFields.getFields(layername, globeControl1) + " from " + layer.Name; @@ -120,8 +157,8 @@ { dataGridViewX1.DataSource = dt; panel.Visible = true; - //toolStripNumbers.Text = " 井盖类型：" + MainFrm.m_CurrentQueryLayer + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + string strLable = toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //m_InitDataGridViewX1(dt, strLable, "", true); } else { @@ -131,7 +168,6 @@ toolStripNumbers.Text = "类型："; } - //} } @@ -174,7 +210,7 @@ } } } - + //m_InitDataGridViewX1(null,"","" , false); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } @@ -183,5 +219,63 @@ PATM_Forms.F_PATMTitle frm = new PATM_Forms.F_PATMTitle("S", chartAllAreaPipeline); frm.Show(); } + + //获取指定layer类型的附属物名称列表 + public string[] getLayerAccNames(string layerType) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(layerType + "管线附属物"); + if (layer == null) return null; + + string sql = "select 附属物名称 from " + layerType + "管线附属物 group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layerType + "管线附属物"); + if (dataset == null) return null; + + int count = dataset.Tables[0].Rows.Count; + + + string[] result = new string[count]; + for (int i = 0; i < count; i++) + { + result[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return result; + } + + /// + /// 获取区域内各图层的井、孔、蓖的map + /// + /// 区域 + /// 要查找的附属物名称数组、如井、孔、蓖 + /// 返回值为：<图层+附属物名称,附属物列表> + + public Dictionary getAccsMap(GSOGeoPolygon3D polygon) + { + //List list = new List(); + Dictionary map = new Dictionary(); + ArrayList listpt = Utility.LayerNamesList; + if (listpt == null || listpt.Count == 0) return null; + FeatureStatisticsService service = new FeatureStatisticsService(); + for (int i = 0; i < listpt.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listpt[i] + "管线附属物"); + string[] accNames = getLayerAccNames(listpt[i] as string); + if (accNames == null || accNames.Length == 0) continue;//排除不合法的值 + for (int j = 0; j < accNames.Length; j++) + { + if (accNames[j].Contains("井") || accNames[j].Contains("孔") || accNames[j].Contains("篦")) + { + + GSOFeatures features = service.Intersect_PointLayerByType(polygon, layer, accNames[j]); + if (features == null) continue; + map.Add(listpt[i] + accNames[j], features); + } + + } + + } + return map; + + } + } } diff --git a/MainFrm.cs b/MainFrm.cs index ac2614d..b584749 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2951,35 +2951,35 @@ break; case "workwellquery": - workWellLen.Clear(); - List listWell = new List(); - //找到所有井 - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //workWellLen.Clear(); + //List listWell = new List(); + ////找到所有井 + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - listWell.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // listWell.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(workWellLen, listWell, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(polygon, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frmWell.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -9740,37 +9740,37 @@ private void buttonItemTJ3_ALL_Click(object sender, EventArgs e) { //日志记录 - LogManager.saveLog(Utility.userName, "井盖数量统计"); + //LogManager.saveLog(Utility.userName, "井盖数量统计"); - workWellLen.Clear(); - List list = new List(); + //workWellLen.Clear(); + //List list = new List(); - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - list.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // list.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(workWellLen, list, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(null, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frm.Show(this); } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ae24fb9..5c2bb7f 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -706,7 +706,6 @@ this.dotNetBarManager1.BottomDockSite = this.dockSite4; this.dotNetBarManager1.EnableFullSizeDock = false; this.dotNetBarManager1.LeftDockSite = this.dockSite1; - this.dotNetBarManager1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.dotNetBarManager1.ParentForm = null; this.dotNetBarManager1.RightDockSite = this.dockSite2; this.dotNetBarManager1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003; @@ -799,7 +798,6 @@ // styleManager1 // this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Office2010Blue; - this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(87)))), ((int)(((byte)(154)))))); // // sideBarPanelItem1 // @@ -848,7 +846,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -894,6 +892,7 @@ this.ribbonTabItemGroup1.Style.BorderRightWidth = 1; this.ribbonTabItemGroup1.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ribbonTabItemGroup1.Style.BorderTopWidth = 1; + this.ribbonTabItemGroup1.Style.Class = ""; this.ribbonTabItemGroup1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonTabItemGroup1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.ribbonTabItemGroup1.Style.TextColor = System.Drawing.Color.White; @@ -906,6 +905,7 @@ // // // + this.galleryContainer2.BackgroundStyle.Class = ""; this.galleryContainer2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer2.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer2.Name = "galleryContainer2"; @@ -915,10 +915,6 @@ this.buttonItem39}); this.galleryContainer2.Text = "断面分析"; // - // - // - this.galleryContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem38 // this.buttonItem38.Name = "buttonItem38"; @@ -939,16 +935,13 @@ // // // + this.galleryContainer3.BackgroundStyle.Class = ""; this.galleryContainer3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer3.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer3.Name = "galleryContainer3"; this.galleryContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem3}); // - // - // - this.galleryContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem3 // this.buttonItem3.Name = "buttonItem3"; @@ -959,6 +952,7 @@ // // // + this.galleryContainer4.BackgroundStyle.Class = ""; this.galleryContainer4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer4.MinimumSize = new System.Drawing.Size(150, 58); this.galleryContainer4.Name = "galleryContainer4"; @@ -970,10 +964,6 @@ this.buttonItem46}); this.galleryContainer4.Text = "断面分析"; // - // - // - this.galleryContainer4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem40 // this.buttonItem40.Name = "buttonItem40"; @@ -1004,6 +994,7 @@ // // // + this.galleryContainer5.BackgroundStyle.Class = ""; this.galleryContainer5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer5.MinimumSize = new System.Drawing.Size(80, 58); this.galleryContainer5.Name = "galleryContainer5"; @@ -1011,10 +1002,6 @@ this.buttonItem44, this.buttonItem43}); // - // - // - this.galleryContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem44 // this.buttonItem44.Name = "buttonItem44"; @@ -1030,16 +1017,13 @@ // // // + this.galleryContainer6.BackgroundStyle.Class = ""; this.galleryContainer6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer6.MinimumSize = new System.Drawing.Size(70, 58); this.galleryContainer6.Name = "galleryContainer6"; this.galleryContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem48}); // - // - // - this.galleryContainer6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem48 // this.buttonItem48.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right; @@ -1073,7 +1057,6 @@ this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx3.Controls.Add(this.layerSensorTree); - this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx3.Location = new System.Drawing.Point(54, 113); this.panelEx3.Name = "panelEx3"; this.panelEx3.Size = new System.Drawing.Size(200, 161); @@ -1188,6 +1171,7 @@ // // // + this.labelX25.BackgroundStyle.Class = ""; this.labelX25.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX25.Location = new System.Drawing.Point(7, 364); this.labelX25.Name = "labelX25"; @@ -1252,6 +1236,7 @@ // // // + this.labelX8.BackgroundStyle.Class = ""; this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX8.Location = new System.Drawing.Point(11, 60); this.labelX8.Name = "labelX8"; @@ -1384,6 +1369,7 @@ // // // + this.checkBoxX3.BackgroundStyle.Class = ""; this.checkBoxX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX3.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX3.Location = new System.Drawing.Point(11, 9); @@ -1401,6 +1387,7 @@ // // // + this.checkBoxX4.BackgroundStyle.Class = ""; this.checkBoxX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX4.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX4.Location = new System.Drawing.Point(110, 9); @@ -1418,6 +1405,7 @@ // // // + this.labelX13.BackgroundStyle.Class = ""; this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX13.Location = new System.Drawing.Point(11, 32); this.labelX13.Name = "labelX13"; @@ -1432,6 +1420,7 @@ // // // + this.labelX14.BackgroundStyle.Class = ""; this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX14.Location = new System.Drawing.Point(10, 204); this.labelX14.Name = "labelX14"; @@ -1509,7 +1498,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(181, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(198, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -1534,6 +1523,7 @@ // // // + this.labelX9.BackgroundStyle.Class = ""; this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX9.Location = new System.Drawing.Point(9, 85); this.labelX9.Name = "labelX9"; @@ -1592,7 +1582,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(180, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(197, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -1635,6 +1625,7 @@ // // // + this.labelX10.BackgroundStyle.Class = ""; this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX10.Location = new System.Drawing.Point(172, 54); this.labelX10.Name = "labelX10"; @@ -1665,6 +1656,7 @@ // // // + this.checkBoxX5.BackgroundStyle.Class = ""; this.checkBoxX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX5.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX5.Location = new System.Drawing.Point(19, 4); @@ -1682,6 +1674,7 @@ // // // + this.checkBoxX6.BackgroundStyle.Class = ""; this.checkBoxX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX6.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX6.Location = new System.Drawing.Point(114, 4); @@ -1699,6 +1692,7 @@ // // // + this.labelX12.BackgroundStyle.Class = ""; this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX12.Location = new System.Drawing.Point(6, 57); this.labelX12.Name = "labelX12"; @@ -1713,6 +1707,7 @@ // // // + this.labelX16.BackgroundStyle.Class = ""; this.labelX16.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX16.Location = new System.Drawing.Point(6, 28); this.labelX16.Name = "labelX16"; @@ -1727,6 +1722,7 @@ // // // + this.labelX17.BackgroundStyle.Class = ""; this.labelX17.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX17.Location = new System.Drawing.Point(8, 235); this.labelX17.Name = "labelX17"; @@ -1772,6 +1768,7 @@ // // // + this.labelX24.BackgroundStyle.Class = ""; this.labelX24.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX24.Image = ((System.Drawing.Image)(resources.GetObject("labelX24.Image"))); this.labelX24.Location = new System.Drawing.Point(7, 403); @@ -1804,7 +1801,7 @@ this.dataGridViewX8.ReadOnly = true; this.dataGridViewX8.RowHeadersVisible = false; this.dataGridViewX8.RowTemplate.Height = 23; - this.dataGridViewX8.Size = new System.Drawing.Size(176, 92); + this.dataGridViewX8.Size = new System.Drawing.Size(193, 92); this.dataGridViewX8.TabIndex = 11; // // dataGridViewTextBoxColumn12 @@ -1838,6 +1835,7 @@ // // // + this.labelX11.BackgroundStyle.Class = ""; this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX11.Location = new System.Drawing.Point(10, 93); this.labelX11.Name = "labelX11"; @@ -1898,7 +1896,7 @@ this.dataGridViewX9.ReadOnly = true; this.dataGridViewX9.RowHeadersVisible = false; this.dataGridViewX9.RowTemplate.Height = 23; - this.dataGridViewX9.Size = new System.Drawing.Size(175, 127); + this.dataGridViewX9.Size = new System.Drawing.Size(192, 127); this.dataGridViewX9.TabIndex = 5; this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick); // @@ -1973,6 +1971,7 @@ // // // + this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX15.Location = new System.Drawing.Point(174, 61); this.labelX15.Name = "labelX15"; @@ -2003,6 +2002,7 @@ // // // + this.checkBoxX7.BackgroundStyle.Class = ""; this.checkBoxX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX7.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX7.Location = new System.Drawing.Point(8, 5); @@ -2020,6 +2020,7 @@ // // // + this.checkBoxX8.BackgroundStyle.Class = ""; this.checkBoxX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX8.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX8.Location = new System.Drawing.Point(118, 5); @@ -2037,6 +2038,7 @@ // // // + this.labelX19.BackgroundStyle.Class = ""; this.labelX19.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX19.Location = new System.Drawing.Point(11, 61); this.labelX19.Name = "labelX19"; @@ -2051,6 +2053,7 @@ // // // + this.labelX21.BackgroundStyle.Class = ""; this.labelX21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX21.Location = new System.Drawing.Point(10, 29); this.labelX21.Name = "labelX21"; @@ -2062,6 +2065,7 @@ // // // + this.labelX22.BackgroundStyle.Class = ""; this.labelX22.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX22.Image = ((System.Drawing.Image)(resources.GetObject("labelX22.Image"))); this.labelX22.Location = new System.Drawing.Point(9, 245); @@ -2139,6 +2143,7 @@ // // // + this.labelX28.BackgroundStyle.Class = ""; this.labelX28.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX28.Location = new System.Drawing.Point(181, 104); this.labelX28.Name = "labelX28"; @@ -2154,6 +2159,7 @@ // // // + this.labelX29.BackgroundStyle.Class = ""; this.labelX29.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX29.Location = new System.Drawing.Point(6, 100); this.labelX29.Name = "labelX29"; @@ -2186,6 +2192,7 @@ // // // + this.labelX4.BackgroundStyle.Class = ""; this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Image = ((System.Drawing.Image)(resources.GetObject("labelX4.Image"))); this.labelX4.Location = new System.Drawing.Point(7, 432); @@ -2249,6 +2256,7 @@ // // // + this.labelX5.BackgroundStyle.Class = ""; this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Image = ((System.Drawing.Image)(resources.GetObject("labelX5.Image"))); this.labelX5.Location = new System.Drawing.Point(9, 134); @@ -2383,6 +2391,7 @@ // // // + this.labelX18.BackgroundStyle.Class = ""; this.labelX18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX18.Location = new System.Drawing.Point(181, 71); this.labelX18.Name = "labelX18"; @@ -2413,6 +2422,7 @@ // // // + this.checkBoxSelectPipeline.BackgroundStyle.Class = ""; this.checkBoxSelectPipeline.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectPipeline.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectPipeline.Location = new System.Drawing.Point(8, 9); @@ -2430,6 +2440,7 @@ // // // + this.checkBoxSelectLayer.BackgroundStyle.Class = ""; this.checkBoxSelectLayer.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectLayer.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectLayer.Location = new System.Drawing.Point(117, 9); @@ -2447,6 +2458,7 @@ // // // + this.labelX20.BackgroundStyle.Class = ""; this.labelX20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX20.Location = new System.Drawing.Point(6, 69); this.labelX20.Name = "labelX20"; @@ -2458,6 +2470,7 @@ // // // + this.labelX26.BackgroundStyle.Class = ""; this.labelX26.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX26.Image = ((System.Drawing.Image)(resources.GetObject("labelX26.Image"))); this.labelX26.Location = new System.Drawing.Point(9, 38); @@ -2470,6 +2483,7 @@ // // // + this.labelX27.BackgroundStyle.Class = ""; this.labelX27.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX27.Image = ((System.Drawing.Image)(resources.GetObject("labelX27.Image"))); this.labelX27.Location = new System.Drawing.Point(7, 287); @@ -2482,6 +2496,7 @@ // // // + this.labelX30.BackgroundStyle.Class = ""; this.labelX30.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX30.Location = new System.Drawing.Point(88, 100); this.labelX30.Name = "labelX30"; @@ -2514,6 +2529,7 @@ // // // + this.labelX23.BackgroundStyle.Class = ""; this.labelX23.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX23.Image = ((System.Drawing.Image)(resources.GetObject("labelX23.Image"))); this.labelX23.Location = new System.Drawing.Point(11, 404); @@ -2577,6 +2593,7 @@ // // // + this.labelX2.BackgroundStyle.Class = ""; this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Image = ((System.Drawing.Image)(resources.GetObject("labelX2.Image"))); this.labelX2.Location = new System.Drawing.Point(12, 100); @@ -2703,6 +2720,7 @@ // // // + this.labelX7.BackgroundStyle.Class = ""; this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX7.Location = new System.Drawing.Point(176, 67); this.labelX7.Name = "labelX7"; @@ -2733,6 +2751,7 @@ // // // + this.checkBoxX1.BackgroundStyle.Class = ""; this.checkBoxX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX1.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX1.Location = new System.Drawing.Point(11, 5); @@ -2750,6 +2769,7 @@ // // // + this.checkBoxX2.BackgroundStyle.Class = ""; this.checkBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX2.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX2.Location = new System.Drawing.Point(120, 5); @@ -2767,6 +2787,7 @@ // // // + this.labelX6.BackgroundStyle.Class = ""; this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX6.Location = new System.Drawing.Point(15, 67); this.labelX6.Name = "labelX6"; @@ -2778,6 +2799,7 @@ // // // + this.labelX1.BackgroundStyle.Class = ""; this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Image = ((System.Drawing.Image)(resources.GetObject("labelX1.Image"))); this.labelX1.Location = new System.Drawing.Point(12, 34); @@ -2790,6 +2812,7 @@ // // // + this.labelX3.BackgroundStyle.Class = ""; this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Image = ((System.Drawing.Image)(resources.GetObject("labelX3.Image"))); this.labelX3.Location = new System.Drawing.Point(11, 250); @@ -2800,11 +2823,11 @@ // expandableSplitter1 // this.expandableSplitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -2816,11 +2839,11 @@ this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -2837,7 +2860,6 @@ this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx4.Controls.Add(this.splitContainer1); this.panelEx4.Controls.Add(this.panelOfTable); - this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx4.Location = new System.Drawing.Point(203, 179); this.panelEx4.Name = "panelEx4"; @@ -2878,7 +2900,6 @@ this.panelEx5.Controls.Add(this.panel1); this.panelEx5.Controls.Add(this.panel3); this.panelEx5.Controls.Add(this.panel5); - this.panelEx5.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx5.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx5.Location = new System.Drawing.Point(0, 0); this.panelEx5.Name = "panelEx5"; @@ -2921,7 +2942,6 @@ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.Controls.Add(this.panel2); this.panelEx1.Controls.Add(this.panel4); - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; @@ -2944,7 +2964,6 @@ this.panelOfTable.Controls.Add(this.dataGridViewX1); this.panelOfTable.Controls.Add(this.statusStrip2); this.panelOfTable.Controls.Add(this.expandableSplitter2); - this.panelOfTable.DisabledBackColor = System.Drawing.Color.Empty; this.panelOfTable.Dock = System.Windows.Forms.DockStyle.Bottom; this.panelOfTable.Location = new System.Drawing.Point(0, 414); this.panelOfTable.Name = "panelOfTable"; @@ -3042,12 +3061,12 @@ // expandableSplitter2 // this.expandableSplitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter2.Dock = System.Windows.Forms.DockStyle.Top; this.expandableSplitter2.ExpandableControl = this.panelOfTable; - this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -3059,11 +3078,11 @@ this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -3183,7 +3202,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(149, 290); + this.toolRightMenu.Size = new System.Drawing.Size(153, 312); // // 量算ToolStripMenuItem // @@ -3259,7 +3278,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -4125,8 +4144,6 @@ // superTooltip1 // this.superTooltip1.DefaultFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); - this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.superTooltip1.MinimumTooltipSize = new System.Drawing.Size(150, 50); // // buttonItem16 @@ -4233,12 +4250,13 @@ // // // + this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4255,7 +4273,7 @@ this.ribbonControl1.Location = new System.Drawing.Point(0, 82); this.ribbonControl1.MdiSystemItemVisible = false; this.ribbonControl1.Name = "ribbonControl1"; - this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); this.ribbonControl1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem19}); this.ribbonControl1.Size = new System.Drawing.Size(1328, 97); @@ -4292,21 +4310,23 @@ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel1.Style.Class = ""; this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseDown.Class = ""; this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4315,14 +4335,15 @@ // // // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.BackgroundStyle.Class = ""; this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.ContainerControlProcessDialogKey = true; this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.DragDropSupport = true; this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem87, this.buttonItem88, @@ -4333,20 +4354,21 @@ this.btnlegendSet, this.buttonItem89, this.btnOutputJPG}); - this.ribbonBar21.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 58); + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; // // // + this.ribbonBar21.TitleStyle.Class = ""; this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.TitleVisible = false; // @@ -4436,14 +4458,17 @@ // // // + this.ribbonPanel12.Style.Class = ""; this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseDown.Class = ""; this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseOver.Class = ""; this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel12.TabIndex = 34; this.ribbonPanel12.Visible = false; @@ -4454,18 +4479,18 @@ // // // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.BackgroundStyle.Class = ""; this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.ContainerControlProcessDialogKey = true; this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.DragDropSupport = true; this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem133, this.buttonItem132}); - this.ribbonBar18.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; this.ribbonBar18.Size = new System.Drawing.Size(171, 59); @@ -4474,10 +4499,12 @@ // // // + this.ribbonBar18.TitleStyle.Class = ""; this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.TitleVisible = false; // @@ -4506,14 +4533,15 @@ // // // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.BackgroundStyle.Class = ""; this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.ContainerControlProcessDialogKey = true; this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.DragDropSupport = true; this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem127, this.buttonItem128, @@ -4521,7 +4549,6 @@ this.buttonItem134, this.buttonItem130, this.btn_check_history}); - this.ribbonBar13.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; this.ribbonBar13.Size = new System.Drawing.Size(505, 59); @@ -4530,10 +4557,12 @@ // // // + this.ribbonBar13.TitleStyle.Class = ""; this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.TitleVisible = false; // @@ -4604,14 +4633,17 @@ // // // + this.ribbonPanel5.Style.Class = ""; this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseDown.Class = ""; this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseOver.Class = ""; this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel5.TabIndex = 37; this.ribbonPanel5.Visible = false; @@ -4622,20 +4654,20 @@ // // // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.BackgroundStyle.Class = ""; this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.ContainerControlProcessDialogKey = true; this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.DragDropSupport = true; this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemHX1, this.buttonItemHX2, this.buttonItemDCTP, this.sliderItem3}); - this.ribbonBar2.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; this.ribbonBar2.Size = new System.Drawing.Size(350, 59); @@ -4644,10 +4676,12 @@ // // // + this.ribbonBar2.TitleStyle.Class = ""; this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.TitleVisible = false; // @@ -4701,14 +4735,17 @@ // // // + this.ribbonPanel2.Style.Class = ""; this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseDown.Class = ""; this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; this.ribbonPanel2.Visible = false; @@ -4719,14 +4756,15 @@ // // // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.BackgroundStyle.Class = ""; this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.ContainerControlProcessDialogKey = true; this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.DragDropSupport = true; this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_user_info, this.btn_role_info, @@ -4735,7 +4773,6 @@ this.btn_user_role, this.btn_password_edit, this.buttonItemPasswordReset}); - this.ribbonBar3.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; this.ribbonBar3.Size = new System.Drawing.Size(551, 59); @@ -4744,10 +4781,12 @@ // // // + this.ribbonBar3.TitleStyle.Class = ""; this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.TitleVisible = false; // @@ -4823,20 +4862,24 @@ this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel15.Style.Class = ""; this.ribbonPanel15.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseDown.Class = ""; this.ribbonPanel15.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4844,14 +4887,15 @@ // // // + this.ribbonBar20.BackgroundMouseOverStyle.Class = ""; this.ribbonBar20.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.BackgroundStyle.Class = ""; this.ribbonBar20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.ContainerControlProcessDialogKey = true; this.ribbonBar20.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar20.DragDropSupport = true; this.ribbonBar20.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSH, this.buttonItemSJGL, @@ -4865,19 +4909,20 @@ this.buttonItemBJ, this.buttonItemSearch, this.buttonItemBZ}); - this.ribbonBar20.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(814, 58); + this.ribbonBar20.Size = new System.Drawing.Size(814, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // // // + this.ribbonBar20.TitleStyle.Class = ""; this.ribbonBar20.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.TitleStyleMouseOver.Class = ""; this.ribbonBar20.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.TitleVisible = false; // @@ -5070,18 +5115,21 @@ // this.buttonItem10.Name = "buttonItem10"; this.buttonItem10.Text = "管线入库-高程"; + this.buttonItem10.Visible = false; this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // // buttonItem11 // this.buttonItem11.Name = "buttonItem11"; this.buttonItem11.Text = "附属物入库-高程"; + this.buttonItem11.Visible = false; this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // // buttonItem12 // this.buttonItem12.Name = "buttonItem12"; this.buttonItem12.Text = "特征管点入库-高程"; + this.buttonItem12.Visible = false; this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // // buttonItemSJGL5 @@ -6226,14 +6274,17 @@ // // // + this.ribbonPanel4.Style.Class = ""; this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseDown.Class = ""; this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseOver.Class = ""; this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel4.TabIndex = 36; this.ribbonPanel4.Visible = false; @@ -6244,17 +6295,17 @@ // // // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.BackgroundStyle.Class = ""; this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.ContainerControlProcessDialogKey = true; this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.DragDropSupport = true; this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_document_info}); - this.ribbonBar1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; this.ribbonBar1.Size = new System.Drawing.Size(88, 59); @@ -6263,10 +6314,12 @@ // // // + this.ribbonBar1.TitleStyle.Class = ""; this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.TitleVisible = false; // @@ -6291,14 +6344,17 @@ // // // + this.ribbonPanel6.Style.Class = ""; this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseDown.Class = ""; this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseOver.Class = ""; this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel6.TabIndex = 38; this.ribbonPanel6.Visible = false; @@ -6309,21 +6365,21 @@ // // // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.BackgroundStyle.Class = ""; this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.ContainerControlProcessDialogKey = true; this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.DragDropSupport = true; this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSPSZ, this.buttonItem8, this.buttonItemLocation, this.sliderItem2, this.buttonItemGBJC}); - this.ribbonBar6.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; this.ribbonBar6.Size = new System.Drawing.Size(427, 59); @@ -6332,10 +6388,12 @@ // // // + this.ribbonBar6.TitleStyle.Class = ""; this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.TitleVisible = false; // @@ -6388,6 +6446,7 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6438,7 +6497,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -7045,7 +7103,7 @@ private DevComponents.DotNetBar.LabelX labelX25; private DevComponents.DotNetBar.PanelEx panelEx3; private System.Windows.Forms.TreeView layerSensorTree; - // private System.Windows.Forms.TreeView layerTree; + // private System.Windows.Forms.TreeView layerTree; private MyTreeView layerTree; private DevComponents.DotNetBar.ButtonX buttonX7; private DevComponents.DotNetBar.ButtonX buttonX16; diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config new file mode 100644 index 0000000..f4cbe66 --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe.config @@ -0,0 +1,32 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb index c7cb8c3..c0fad4a 100644 --- a/bin/x86/Debug/Cyberpipe.pdb +++ b/bin/x86/Debug/Cyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index 3dc3245..1fc46d0 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5f45ee7..9615fbf 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt index b8d8198..c6fbef0 100644 --- a/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -342,8 +342,186 @@ F:\predator\codeReview\GHFX_SZ_64\obj\x64\Debug\Cyberpipe.pdb F:\predator\codeReview\GHFX_SZ_64\bin\x86\Debug\office.dll F:\predator\codeReview\GHFX_SZ_64\bin\x86\Debug\office.xml -D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe.config +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.csproj.ResolveComReference.cache +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.pdb +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\office.dll +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\office.xml +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FormDocumentManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmAddYuBiZiShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGBJCresult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmWait.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\PipeLine.Forms.FrmAddPipelineCoordinate.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGongShuiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmMnModify.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPipelineModelDataOneStep.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmShLayers.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmShRK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmTongXunAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmAddWellShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccess.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoriesgather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoryAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddValve.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddWellShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddYuBiZiShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAllWorkWellStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAnalysisGuiHuaResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPP.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPAuditor.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPFORASK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPFORASKReason.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPregion.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAppUSER.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAppUSERRESET.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBACKORACLE.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBSQDuoBianXingStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBSQStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBufferAnalysisBSQ.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmChangePassword.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCheckHistory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCodingQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCompareFeature.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCreateUser.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCustomLabel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDataBaseOpt.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDatabaseParaSetting2.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDbManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDocumentEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDownloadProgress.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmExportCADS.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlySetDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBasicQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBoosterValvers.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBufferAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDatabaseParaSetting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DigFillAnalysisDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBaseLineProfillAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGenAndFaMenTopu.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGenTopo.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCloseValves.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDigPitSetting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFittingQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlow.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlyToPosition.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFolderSelecter.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFTAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGBJC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGenAndFaMenTopu.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGHRK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHotFuncStat.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHotFuncStatTitle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmKeywordQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLayerControl.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogDescription.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogin.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogOper.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMDDictory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadata.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadataOutput.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadataStat.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMultiPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmOperMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPerm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPermMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeDeepstatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeDiametergather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Frmpipediameterstatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeMaterialGather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPaiShuiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmProject.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmRanQiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddPipeFitting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAllPipelineStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDiameterQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFWPipeLineStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRedlineResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleInfoManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleRescManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmShResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoManger.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoPassword.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmThreeOracle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRole.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValveStatistics.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMaterialSel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.frmPipeSetEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmProfileAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPropertiesMarker.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmOper.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQueryHistory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQueryMessage.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQuerySensorAlarm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegion.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionType.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionTypeMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRESC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRESCMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRole.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetGoalLayer.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmTackPolygonDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHDMAnalysis3.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLineCoordinate.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQuerySQL.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserAdd.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRepo.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRepoMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValiData.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmYJSHTC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Frm_password_reset.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSfiles.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSinout.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSProjedits.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.MainFrm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCreateTunnel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCitySevenLineType.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile_AddField.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile_DeleteField.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmExportVector.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFloodAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCityServerLineAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMarker.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPipelineIndented.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMFiles.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMInout.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMTitle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMProjedit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Properties.Resources.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetLatLonPos.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSceneLightSet.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetFlytoPos.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoriesSensor.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValiDataShowErrorMessage.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddInstrument.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.SysRescInfoManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.read.1.tlog +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.write.1.tlog +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.exe +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.pdb +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe.config D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.csproj.ResolveComReference.cache +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.exe +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.pdb +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\office.dll +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\office.xml +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources @@ -507,3 +685,4 @@ D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.SysRescInfoManager.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.read.1.tlog D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.write.1.tlog +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.pdb diff --git a/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache b/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache index b4283e0..b05ca27 100644 --- a/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache +++ b/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache b/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache deleted file mode 100644 index 208d7b0..0000000 --- a/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.exe b/obj/x64/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/obj/x64/Debug/Cyberpipe.exe Binary files differ diff --git a/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache index 5359685..8476256 100644 --- a/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x64/Debug/GenerateResource.read.1.tlog b/obj/x64/Debug/GenerateResource.read.1.tlog index fa8e7c6..3971f44 100644 --- a/obj/x64/Debug/GenerateResource.read.1.tlog +++ b/obj/x64/Debug/GenerateResource.read.1.tlog Binary files differ diff --git a/obj/x64/Debug/GenerateResource.write.1.tlog b/obj/x64/Debug/GenerateResource.write.1.tlog index 07697dc..ef1961e 100644 --- a/obj/x64/Debug/GenerateResource.write.1.tlog +++ b/obj/x64/Debug/GenerateResource.write.1.tlog Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2177757 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Thumbs.db +*.exe +*.obj +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.designer.cs +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vs \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index a47e005..4038d91 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -115,7 +115,7 @@ False bin\x86\Debug\Aspose.Cells.dll - + False bin\x86\Debug\DevComponents.DotNetBar2.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index cd2ccd3..c534a82 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index 8686f85..7b5caad 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -6,6 +6,8 @@ using GeoScene.Globe; using GeoScene.Engine; +using System.Windows.Forms; + namespace Cyberpipe { class FeatureStatisticsService @@ -18,7 +20,7 @@ /// /// - private GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) + public GSOFeatures Intersect_PointLayerByType(GSOGeoPolygon3D polygon, GSOLayer layer, string type) { if (layer == null) return null; @@ -43,8 +45,8 @@ return newfeats; } - - + + /// /// /// 根据附属物列表，统计该类附属物个数 @@ -55,7 +57,7 @@ { if (feats == null || feats.Length == 0) return null; Dictionary result = new Dictionary(); - result.Add(feats[0].GetFieldAsString("附属物名称"),feats.Length); + result.Add(feats[0].GetFieldAsString("附属物名称"), feats.Length); return result; } /// @@ -73,14 +75,15 @@ FeaturesClassfyResult result = new FeaturesClassfyResult(); double totalLength = 0.0; int ncount = 0; - GSOFeatures features = getPipesByValueSection( polygon, layer, min, max, fieldName); - for (int i = 0; i < features.Length;i++ ) { + GSOFeatures features = getPipesByValueSection(polygon, layer, min, max, fieldName); + for (int i = 0; i < features.Length; i++) + { GSOGeoPolyline3D line = features[i].Geometry as GSOGeoPolyline3D; double length = line.GetSpaceLength(true, 6378137); totalLength += length; ncount += 1; } - string filedValue = (min == null) ? "不限":min+"-"; + string filedValue = (min == null) ? "不限" : min + "-"; filedValue += (max == null) ? "不限" : max + ""; result.layerName = layer.Caption; result.groupFieldValue = filedValue;//上下限的拼接 @@ -99,20 +102,21 @@ /// 上限 /// 统计类型："起始埋深"或"管径_毫米" /// - public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer,double? min,double? max,string fieldName) { + public GSOFeatures getPipesByValueSection(GSOGeoPolygon3D polygon, GSOLayer layer, double? min, double? max, string fieldName) + { if (layer == null) return null; GSOFeatures result = new GSOFeatures(); GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 - GSOFeatures feats = ( polygon == null )? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); + GSOFeatures feats = (polygon == null) ? flayer.GetAllFeatures() : flayer.FindFeaturesInPolygon(polygon, false); - double minValue = min ?? Double.MinValue ; + double minValue = min ?? Double.MinValue; double maxValue = max ?? Double.MaxValue; - + //筛选出符合条件的 - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { double radius = feats[i].GetFieldAsDouble(fieldName); if (radius >= min && radius <= max) @@ -121,17 +125,17 @@ } } - + return result; - + } //图层名称、管径、条数、总长度 public List groupPipeByDiameter(GSOGeoPolygon3D polygon, GSOLayer layer) { if (layer == null) return null; - List result = new List() ; - + List result = new List(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -173,7 +177,7 @@ } } return result; - + } //图层名称、附属物个数 /// @@ -208,7 +212,7 @@ //过滤 for (int n = 0; n < feats.Length; n++) { - if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); + if (feats[n].GetFieldAsString("附属物名称").Contains(accessStrs[j])) newfeats.Add(feats[n]); } ncount = newfeats.Length; } @@ -218,10 +222,10 @@ featuresClass.layerName = accessStrs[j]; featuresClass.ncount = ncount; - result.Add(featuresClass); + result.Add(featuresClass); } return result; - + } /// @@ -231,11 +235,11 @@ /// /// 材质 /// - public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer,string material) - { - if (layer == null) return null; - FeaturesClassfyResult result = new FeaturesClassfyResult() ; - + public FeaturesClassfyResult groupPipeByMaterial(GSOGeoPolygon3D polygon, GSOLayer layer, string material) + { + if (layer == null) return null; + FeaturesClassfyResult result = new FeaturesClassfyResult(); + GSOFeatureLayer flayer = layer as GSOFeatureLayer; //TODOLIST:优化为只获取管线，目前不清楚调用方式 @@ -244,7 +248,7 @@ string fixedMaterial = material == "无" ? "" : material; double totalLength = 0.00; int ncount = 0; - for (int i = 0; i < feats.Length;i++ ) + for (int i = 0; i < feats.Length; i++) { if (feats[i].GetFieldAsString("材质").Equals(fixedMaterial)) { @@ -255,7 +259,7 @@ totalLength += length; ncount += 1; } - } + } } result.layerName = layer.Caption; @@ -264,13 +268,9 @@ result.sum = totalLength; return result; } - - - - } } diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 4f0593d..fe2b7f8 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -9,30 +9,45 @@ using GeoScene.Data; using GeoScene.Globe; using DevComponents.DotNetBar; +using System.Collections; namespace Cyberpipe { public partial class FrmAllWorkWellStatis : DevComponents.DotNetBar.Office2007Form { - Dictionary workWellLengthAndType = new Dictionary(); - List list = new List(); + + private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; + private Dictionary map = null; DataGridView dataGridViewX1; ToolStripStatusLabel toolStripNumbers; GSOGlobeControl globeControl1; PanelEx panel; - public FrmAllWorkWellStatis(Dictionary wellLen, List _list, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) + //TODOLIST：用晓伟的代理进行操作，功能拆分细化 + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, DataGridView dataGridViewX11, ToolStripStatusLabel toolStripNumbers1, GSOGlobeControl ctl, PanelEx p) { InitializeComponent(); panel = p; - workWellLengthAndType = wellLen; - list = _list; dataGridViewX1 = dataGridViewX11; toolStripNumbers = toolStripNumbers1; - globeControl1 = ctl; + map = getAccsMap(polygon); + + } + public FrmAllWorkWellStatis(GSOGeoPolygon3D polygon, MainFrm.DataGridViewDelegate InitDataGridViewX1, GSOGlobeControl ctl) + { + InitializeComponent(); + globeControl1 = ctl; + m_InitDataGridViewX1 = InitDataGridViewX1; + map = getAccsMap(polygon); + } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) { + drawChart(); + } + + public void drawChart() + { try { // Set axis title @@ -49,6 +64,11 @@ chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; + Dictionary workWellLengthAndType = new Dictionary(); + foreach (KeyValuePair kv in map) + { + workWellLengthAndType.Add(kv.Key, kv.Value.Length); + } chartAllAreaPipeline.Series["井盖"].Points.DataBindXY(workWellLengthAndType.Keys, workWellLengthAndType.Values); for (int m = 0; m < workWellLengthAndType.Values.Count; m++) { @@ -71,11 +91,11 @@ if (indexHit >= 0) { - GSOFeatures fs = list[indexHit]; + //GSOFeatures fs = list[indexHit]; string sql = ""; string pipetype = chartAllAreaPipeline.Series["井盖"].Points[indexHit].AxisLabel; - + GSOFeatures fs = map[pipetype]; string layername = ""; if (pipetype.EndsWith("窖井") || pipetype.EndsWith("表井") || (pipetype.EndsWith("窨井")) || pipetype.EndsWith("孔") || @@ -93,6 +113,23 @@ { return; } + //从图层获取datatable数据,不涉及数据库操作，速度会快一些 + //string [] fieldNames = GSOFeatureUtils.getFields(layername, globeControl1); + //DataTable dt = GSOFeatureUtils.convertGSOFeatures2DataTable(fs,fieldNames); + //if (dt.Rows.Count > 0) + //{ + // dataGridViewX1.DataSource = dt; + // panel.Visible = true; + // toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //} + //else + //{ + // panel.Visible = false; + // dataGridViewX1.DataSource = null; + // dataGridViewX1.Refresh(); + // toolStripNumbers.Text = "类型："; + //} + //数据库获取数据 if (fs.Length > 0) { sql = "select " + getpipeLineFields.getFields(layername, globeControl1) + " from " + layer.Name; @@ -120,8 +157,8 @@ { dataGridViewX1.DataSource = dt; panel.Visible = true; - //toolStripNumbers.Text = " 井盖类型：" + MainFrm.m_CurrentQueryLayer + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + string strLable = toolStripNumbers.Text = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; + //m_InitDataGridViewX1(dt, strLable, "", true); } else { @@ -131,7 +168,6 @@ toolStripNumbers.Text = "类型："; } - //} } @@ -174,7 +210,7 @@ } } } - + //m_InitDataGridViewX1(null,"","" , false); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); } @@ -183,5 +219,63 @@ PATM_Forms.F_PATMTitle frm = new PATM_Forms.F_PATMTitle("S", chartAllAreaPipeline); frm.Show(); } + + //获取指定layer类型的附属物名称列表 + public string[] getLayerAccNames(string layerType) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(layerType + "管线附属物"); + if (layer == null) return null; + + string sql = "select 附属物名称 from " + layerType + "管线附属物 group by 附属物名称"; + DataSet dataset = OledbHelper.getDataSet(sql, layerType + "管线附属物"); + if (dataset == null) return null; + + int count = dataset.Tables[0].Rows.Count; + + + string[] result = new string[count]; + for (int i = 0; i < count; i++) + { + result[i] = dataset.Tables[0].Rows[i][0].ToString(); + } + return result; + } + + /// + /// 获取区域内各图层的井、孔、蓖的map + /// + /// 区域 + /// 要查找的附属物名称数组、如井、孔、蓖 + /// 返回值为：<图层+附属物名称,附属物列表> + + public Dictionary getAccsMap(GSOGeoPolygon3D polygon) + { + //List list = new List(); + Dictionary map = new Dictionary(); + ArrayList listpt = Utility.LayerNamesList; + if (listpt == null || listpt.Count == 0) return null; + FeatureStatisticsService service = new FeatureStatisticsService(); + for (int i = 0; i < listpt.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listpt[i] + "管线附属物"); + string[] accNames = getLayerAccNames(listpt[i] as string); + if (accNames == null || accNames.Length == 0) continue;//排除不合法的值 + for (int j = 0; j < accNames.Length; j++) + { + if (accNames[j].Contains("井") || accNames[j].Contains("孔") || accNames[j].Contains("篦")) + { + + GSOFeatures features = service.Intersect_PointLayerByType(polygon, layer, accNames[j]); + if (features == null) continue; + map.Add(listpt[i] + accNames[j], features); + } + + } + + } + return map; + + } + } } diff --git a/MainFrm.cs b/MainFrm.cs index ac2614d..b584749 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2951,35 +2951,35 @@ break; case "workwellquery": - workWellLen.Clear(); - List listWell = new List(); - //找到所有井 - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //workWellLen.Clear(); + //List listWell = new List(); + ////找到所有井 + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - listWell.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // listWell.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(workWellLen, listWell, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frmWell = new FrmAllWorkWellStatis(polygon, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frmWell.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -9740,37 +9740,37 @@ private void buttonItemTJ3_ALL_Click(object sender, EventArgs e) { //日志记录 - LogManager.saveLog(Utility.userName, "井盖数量统计"); + //LogManager.saveLog(Utility.userName, "井盖数量统计"); - workWellLen.Clear(); - List list = new List(); + //workWellLen.Clear(); + //List list = new List(); - if (Utility.LayerNamesList != null) - { - ArrayList listpt = Utility.LayerNamesList; + //if (Utility.LayerNamesList != null) + //{ + // ArrayList listpt = Utility.LayerNamesList; - for (int i = 0; i < listpt.Count; i++) - { - string pipelineType = (string)Utility.LayerNamesList[i]; + // for (int i = 0; i < listpt.Count; i++) + // { + // string pipelineType = (string)Utility.LayerNamesList[i]; - string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; - DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); - if (dataset != null) - { - for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) - { - string accname = dataset.Tables[0].Rows[j][0].ToString(); - if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) - { - GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - list.Add(fs); - } - } - } - } - } + // string sql = "select 附属物名称 from " + pipelineType + "管线附属物 group by 附属物名称"; + // DataSet dataset = OledbHelper.getDataSet(sql, pipelineType + "管线附属物"); + // if (dataset != null) + // { + // for (int j = 0; j < dataset.Tables[0].Rows.Count; j++) + // { + // string accname = dataset.Tables[0].Rows[j][0].ToString(); + // if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) + // { + // GSOFeatures fs = Intersect_PointLayerByType(null, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); + // list.Add(fs); + // } + // } + // } + // } + //} - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(workWellLen, list, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(null, dataGridViewX1, toolStripNumbers, globeControl1, panelOfTable); frm.Show(this); } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ae24fb9..5c2bb7f 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -706,7 +706,6 @@ this.dotNetBarManager1.BottomDockSite = this.dockSite4; this.dotNetBarManager1.EnableFullSizeDock = false; this.dotNetBarManager1.LeftDockSite = this.dockSite1; - this.dotNetBarManager1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.dotNetBarManager1.ParentForm = null; this.dotNetBarManager1.RightDockSite = this.dockSite2; this.dotNetBarManager1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003; @@ -799,7 +798,6 @@ // styleManager1 // this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Office2010Blue; - this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(87)))), ((int)(((byte)(154)))))); // // sideBarPanelItem1 // @@ -848,7 +846,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -894,6 +892,7 @@ this.ribbonTabItemGroup1.Style.BorderRightWidth = 1; this.ribbonTabItemGroup1.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ribbonTabItemGroup1.Style.BorderTopWidth = 1; + this.ribbonTabItemGroup1.Style.Class = ""; this.ribbonTabItemGroup1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonTabItemGroup1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.ribbonTabItemGroup1.Style.TextColor = System.Drawing.Color.White; @@ -906,6 +905,7 @@ // // // + this.galleryContainer2.BackgroundStyle.Class = ""; this.galleryContainer2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer2.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer2.Name = "galleryContainer2"; @@ -915,10 +915,6 @@ this.buttonItem39}); this.galleryContainer2.Text = "断面分析"; // - // - // - this.galleryContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem38 // this.buttonItem38.Name = "buttonItem38"; @@ -939,16 +935,13 @@ // // // + this.galleryContainer3.BackgroundStyle.Class = ""; this.galleryContainer3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer3.MinimumSize = new System.Drawing.Size(90, 58); this.galleryContainer3.Name = "galleryContainer3"; this.galleryContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem3}); // - // - // - this.galleryContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem3 // this.buttonItem3.Name = "buttonItem3"; @@ -959,6 +952,7 @@ // // // + this.galleryContainer4.BackgroundStyle.Class = ""; this.galleryContainer4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer4.MinimumSize = new System.Drawing.Size(150, 58); this.galleryContainer4.Name = "galleryContainer4"; @@ -970,10 +964,6 @@ this.buttonItem46}); this.galleryContainer4.Text = "断面分析"; // - // - // - this.galleryContainer4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem40 // this.buttonItem40.Name = "buttonItem40"; @@ -1004,6 +994,7 @@ // // // + this.galleryContainer5.BackgroundStyle.Class = ""; this.galleryContainer5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer5.MinimumSize = new System.Drawing.Size(80, 58); this.galleryContainer5.Name = "galleryContainer5"; @@ -1011,10 +1002,6 @@ this.buttonItem44, this.buttonItem43}); // - // - // - this.galleryContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem44 // this.buttonItem44.Name = "buttonItem44"; @@ -1030,16 +1017,13 @@ // // // + this.galleryContainer6.BackgroundStyle.Class = ""; this.galleryContainer6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galleryContainer6.MinimumSize = new System.Drawing.Size(70, 58); this.galleryContainer6.Name = "galleryContainer6"; this.galleryContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem48}); // - // - // - this.galleryContainer6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // // buttonItem48 // this.buttonItem48.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right; @@ -1073,7 +1057,6 @@ this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx3.Controls.Add(this.layerSensorTree); - this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx3.Location = new System.Drawing.Point(54, 113); this.panelEx3.Name = "panelEx3"; this.panelEx3.Size = new System.Drawing.Size(200, 161); @@ -1188,6 +1171,7 @@ // // // + this.labelX25.BackgroundStyle.Class = ""; this.labelX25.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX25.Location = new System.Drawing.Point(7, 364); this.labelX25.Name = "labelX25"; @@ -1252,6 +1236,7 @@ // // // + this.labelX8.BackgroundStyle.Class = ""; this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX8.Location = new System.Drawing.Point(11, 60); this.labelX8.Name = "labelX8"; @@ -1384,6 +1369,7 @@ // // // + this.checkBoxX3.BackgroundStyle.Class = ""; this.checkBoxX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX3.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX3.Location = new System.Drawing.Point(11, 9); @@ -1401,6 +1387,7 @@ // // // + this.checkBoxX4.BackgroundStyle.Class = ""; this.checkBoxX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX4.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX4.Location = new System.Drawing.Point(110, 9); @@ -1418,6 +1405,7 @@ // // // + this.labelX13.BackgroundStyle.Class = ""; this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX13.Location = new System.Drawing.Point(11, 32); this.labelX13.Name = "labelX13"; @@ -1432,6 +1420,7 @@ // // // + this.labelX14.BackgroundStyle.Class = ""; this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX14.Location = new System.Drawing.Point(10, 204); this.labelX14.Name = "labelX14"; @@ -1509,7 +1498,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(181, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(198, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -1534,6 +1523,7 @@ // // // + this.labelX9.BackgroundStyle.Class = ""; this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX9.Location = new System.Drawing.Point(9, 85); this.labelX9.Name = "labelX9"; @@ -1592,7 +1582,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(180, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(197, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -1635,6 +1625,7 @@ // // // + this.labelX10.BackgroundStyle.Class = ""; this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX10.Location = new System.Drawing.Point(172, 54); this.labelX10.Name = "labelX10"; @@ -1665,6 +1656,7 @@ // // // + this.checkBoxX5.BackgroundStyle.Class = ""; this.checkBoxX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX5.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX5.Location = new System.Drawing.Point(19, 4); @@ -1682,6 +1674,7 @@ // // // + this.checkBoxX6.BackgroundStyle.Class = ""; this.checkBoxX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX6.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX6.Location = new System.Drawing.Point(114, 4); @@ -1699,6 +1692,7 @@ // // // + this.labelX12.BackgroundStyle.Class = ""; this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX12.Location = new System.Drawing.Point(6, 57); this.labelX12.Name = "labelX12"; @@ -1713,6 +1707,7 @@ // // // + this.labelX16.BackgroundStyle.Class = ""; this.labelX16.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX16.Location = new System.Drawing.Point(6, 28); this.labelX16.Name = "labelX16"; @@ -1727,6 +1722,7 @@ // // // + this.labelX17.BackgroundStyle.Class = ""; this.labelX17.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX17.Location = new System.Drawing.Point(8, 235); this.labelX17.Name = "labelX17"; @@ -1772,6 +1768,7 @@ // // // + this.labelX24.BackgroundStyle.Class = ""; this.labelX24.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX24.Image = ((System.Drawing.Image)(resources.GetObject("labelX24.Image"))); this.labelX24.Location = new System.Drawing.Point(7, 403); @@ -1804,7 +1801,7 @@ this.dataGridViewX8.ReadOnly = true; this.dataGridViewX8.RowHeadersVisible = false; this.dataGridViewX8.RowTemplate.Height = 23; - this.dataGridViewX8.Size = new System.Drawing.Size(176, 92); + this.dataGridViewX8.Size = new System.Drawing.Size(193, 92); this.dataGridViewX8.TabIndex = 11; // // dataGridViewTextBoxColumn12 @@ -1838,6 +1835,7 @@ // // // + this.labelX11.BackgroundStyle.Class = ""; this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX11.Location = new System.Drawing.Point(10, 93); this.labelX11.Name = "labelX11"; @@ -1898,7 +1896,7 @@ this.dataGridViewX9.ReadOnly = true; this.dataGridViewX9.RowHeadersVisible = false; this.dataGridViewX9.RowTemplate.Height = 23; - this.dataGridViewX9.Size = new System.Drawing.Size(175, 127); + this.dataGridViewX9.Size = new System.Drawing.Size(192, 127); this.dataGridViewX9.TabIndex = 5; this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick); // @@ -1973,6 +1971,7 @@ // // // + this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX15.Location = new System.Drawing.Point(174, 61); this.labelX15.Name = "labelX15"; @@ -2003,6 +2002,7 @@ // // // + this.checkBoxX7.BackgroundStyle.Class = ""; this.checkBoxX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX7.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX7.Location = new System.Drawing.Point(8, 5); @@ -2020,6 +2020,7 @@ // // // + this.checkBoxX8.BackgroundStyle.Class = ""; this.checkBoxX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX8.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX8.Location = new System.Drawing.Point(118, 5); @@ -2037,6 +2038,7 @@ // // // + this.labelX19.BackgroundStyle.Class = ""; this.labelX19.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX19.Location = new System.Drawing.Point(11, 61); this.labelX19.Name = "labelX19"; @@ -2051,6 +2053,7 @@ // // // + this.labelX21.BackgroundStyle.Class = ""; this.labelX21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX21.Location = new System.Drawing.Point(10, 29); this.labelX21.Name = "labelX21"; @@ -2062,6 +2065,7 @@ // // // + this.labelX22.BackgroundStyle.Class = ""; this.labelX22.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX22.Image = ((System.Drawing.Image)(resources.GetObject("labelX22.Image"))); this.labelX22.Location = new System.Drawing.Point(9, 245); @@ -2139,6 +2143,7 @@ // // // + this.labelX28.BackgroundStyle.Class = ""; this.labelX28.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX28.Location = new System.Drawing.Point(181, 104); this.labelX28.Name = "labelX28"; @@ -2154,6 +2159,7 @@ // // // + this.labelX29.BackgroundStyle.Class = ""; this.labelX29.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX29.Location = new System.Drawing.Point(6, 100); this.labelX29.Name = "labelX29"; @@ -2186,6 +2192,7 @@ // // // + this.labelX4.BackgroundStyle.Class = ""; this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Image = ((System.Drawing.Image)(resources.GetObject("labelX4.Image"))); this.labelX4.Location = new System.Drawing.Point(7, 432); @@ -2249,6 +2256,7 @@ // // // + this.labelX5.BackgroundStyle.Class = ""; this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Image = ((System.Drawing.Image)(resources.GetObject("labelX5.Image"))); this.labelX5.Location = new System.Drawing.Point(9, 134); @@ -2383,6 +2391,7 @@ // // // + this.labelX18.BackgroundStyle.Class = ""; this.labelX18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX18.Location = new System.Drawing.Point(181, 71); this.labelX18.Name = "labelX18"; @@ -2413,6 +2422,7 @@ // // // + this.checkBoxSelectPipeline.BackgroundStyle.Class = ""; this.checkBoxSelectPipeline.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectPipeline.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectPipeline.Location = new System.Drawing.Point(8, 9); @@ -2430,6 +2440,7 @@ // // // + this.checkBoxSelectLayer.BackgroundStyle.Class = ""; this.checkBoxSelectLayer.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxSelectLayer.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxSelectLayer.Location = new System.Drawing.Point(117, 9); @@ -2447,6 +2458,7 @@ // // // + this.labelX20.BackgroundStyle.Class = ""; this.labelX20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX20.Location = new System.Drawing.Point(6, 69); this.labelX20.Name = "labelX20"; @@ -2458,6 +2470,7 @@ // // // + this.labelX26.BackgroundStyle.Class = ""; this.labelX26.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX26.Image = ((System.Drawing.Image)(resources.GetObject("labelX26.Image"))); this.labelX26.Location = new System.Drawing.Point(9, 38); @@ -2470,6 +2483,7 @@ // // // + this.labelX27.BackgroundStyle.Class = ""; this.labelX27.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX27.Image = ((System.Drawing.Image)(resources.GetObject("labelX27.Image"))); this.labelX27.Location = new System.Drawing.Point(7, 287); @@ -2482,6 +2496,7 @@ // // // + this.labelX30.BackgroundStyle.Class = ""; this.labelX30.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX30.Location = new System.Drawing.Point(88, 100); this.labelX30.Name = "labelX30"; @@ -2514,6 +2529,7 @@ // // // + this.labelX23.BackgroundStyle.Class = ""; this.labelX23.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX23.Image = ((System.Drawing.Image)(resources.GetObject("labelX23.Image"))); this.labelX23.Location = new System.Drawing.Point(11, 404); @@ -2577,6 +2593,7 @@ // // // + this.labelX2.BackgroundStyle.Class = ""; this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Image = ((System.Drawing.Image)(resources.GetObject("labelX2.Image"))); this.labelX2.Location = new System.Drawing.Point(12, 100); @@ -2703,6 +2720,7 @@ // // // + this.labelX7.BackgroundStyle.Class = ""; this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX7.Location = new System.Drawing.Point(176, 67); this.labelX7.Name = "labelX7"; @@ -2733,6 +2751,7 @@ // // // + this.checkBoxX1.BackgroundStyle.Class = ""; this.checkBoxX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX1.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX1.Location = new System.Drawing.Point(11, 5); @@ -2750,6 +2769,7 @@ // // // + this.checkBoxX2.BackgroundStyle.Class = ""; this.checkBoxX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.checkBoxX2.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.checkBoxX2.Location = new System.Drawing.Point(120, 5); @@ -2767,6 +2787,7 @@ // // // + this.labelX6.BackgroundStyle.Class = ""; this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX6.Location = new System.Drawing.Point(15, 67); this.labelX6.Name = "labelX6"; @@ -2778,6 +2799,7 @@ // // // + this.labelX1.BackgroundStyle.Class = ""; this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Image = ((System.Drawing.Image)(resources.GetObject("labelX1.Image"))); this.labelX1.Location = new System.Drawing.Point(12, 34); @@ -2790,6 +2812,7 @@ // // // + this.labelX3.BackgroundStyle.Class = ""; this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Image = ((System.Drawing.Image)(resources.GetObject("labelX3.Image"))); this.labelX3.Location = new System.Drawing.Point(11, 250); @@ -2800,11 +2823,11 @@ // expandableSplitter1 // this.expandableSplitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -2816,11 +2839,11 @@ this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -2837,7 +2860,6 @@ this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx4.Controls.Add(this.splitContainer1); this.panelEx4.Controls.Add(this.panelOfTable); - this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx4.Location = new System.Drawing.Point(203, 179); this.panelEx4.Name = "panelEx4"; @@ -2878,7 +2900,6 @@ this.panelEx5.Controls.Add(this.panel1); this.panelEx5.Controls.Add(this.panel3); this.panelEx5.Controls.Add(this.panel5); - this.panelEx5.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx5.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx5.Location = new System.Drawing.Point(0, 0); this.panelEx5.Name = "panelEx5"; @@ -2921,7 +2942,6 @@ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.Controls.Add(this.panel2); this.panelEx1.Controls.Add(this.panel4); - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; @@ -2944,7 +2964,6 @@ this.panelOfTable.Controls.Add(this.dataGridViewX1); this.panelOfTable.Controls.Add(this.statusStrip2); this.panelOfTable.Controls.Add(this.expandableSplitter2); - this.panelOfTable.DisabledBackColor = System.Drawing.Color.Empty; this.panelOfTable.Dock = System.Windows.Forms.DockStyle.Bottom; this.panelOfTable.Location = new System.Drawing.Point(0, 414); this.panelOfTable.Name = "panelOfTable"; @@ -3042,12 +3061,12 @@ // expandableSplitter2 // this.expandableSplitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); - this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter2.Dock = System.Windows.Forms.DockStyle.Top; this.expandableSplitter2.ExpandableControl = this.panelOfTable; - this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; @@ -3059,11 +3078,11 @@ this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(108)))), ((int)(((byte)(122))))); + this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; @@ -3183,7 +3202,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(149, 290); + this.toolRightMenu.Size = new System.Drawing.Size(153, 312); // // 量算ToolStripMenuItem // @@ -3259,7 +3278,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -4125,8 +4144,6 @@ // superTooltip1 // this.superTooltip1.DefaultFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); - this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.superTooltip1.MinimumTooltipSize = new System.Drawing.Size(150, 50); // // buttonItem16 @@ -4233,12 +4250,13 @@ // // // + this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4255,7 +4273,7 @@ this.ribbonControl1.Location = new System.Drawing.Point(0, 82); this.ribbonControl1.MdiSystemItemVisible = false; this.ribbonControl1.Name = "ribbonControl1"; - this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); this.ribbonControl1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem19}); this.ribbonControl1.Size = new System.Drawing.Size(1328, 97); @@ -4292,21 +4310,23 @@ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel1.Style.Class = ""; this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseDown.Class = ""; this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4315,14 +4335,15 @@ // // // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.BackgroundStyle.Class = ""; this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.ContainerControlProcessDialogKey = true; this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.DragDropSupport = true; this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem87, this.buttonItem88, @@ -4333,20 +4354,21 @@ this.btnlegendSet, this.buttonItem89, this.btnOutputJPG}); - this.ribbonBar21.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(649, 58); + this.ribbonBar21.Size = new System.Drawing.Size(649, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; // // // + this.ribbonBar21.TitleStyle.Class = ""; this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar21.TitleVisible = false; // @@ -4436,14 +4458,17 @@ // // // + this.ribbonPanel12.Style.Class = ""; this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseDown.Class = ""; this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel12.StyleMouseOver.Class = ""; this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel12.TabIndex = 34; this.ribbonPanel12.Visible = false; @@ -4454,18 +4479,18 @@ // // // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.BackgroundStyle.Class = ""; this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.ContainerControlProcessDialogKey = true; this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.DragDropSupport = true; this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem133, this.buttonItem132}); - this.ribbonBar18.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; this.ribbonBar18.Size = new System.Drawing.Size(171, 59); @@ -4474,10 +4499,12 @@ // // // + this.ribbonBar18.TitleStyle.Class = ""; this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar18.TitleVisible = false; // @@ -4506,14 +4533,15 @@ // // // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.BackgroundStyle.Class = ""; this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.ContainerControlProcessDialogKey = true; this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.DragDropSupport = true; this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem127, this.buttonItem128, @@ -4521,7 +4549,6 @@ this.buttonItem134, this.buttonItem130, this.btn_check_history}); - this.ribbonBar13.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; this.ribbonBar13.Size = new System.Drawing.Size(505, 59); @@ -4530,10 +4557,12 @@ // // // + this.ribbonBar13.TitleStyle.Class = ""; this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar13.TitleVisible = false; // @@ -4604,14 +4633,17 @@ // // // + this.ribbonPanel5.Style.Class = ""; this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseDown.Class = ""; this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel5.StyleMouseOver.Class = ""; this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel5.TabIndex = 37; this.ribbonPanel5.Visible = false; @@ -4622,20 +4654,20 @@ // // // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.BackgroundStyle.Class = ""; this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.ContainerControlProcessDialogKey = true; this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.DragDropSupport = true; this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemHX1, this.buttonItemHX2, this.buttonItemDCTP, this.sliderItem3}); - this.ribbonBar2.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; this.ribbonBar2.Size = new System.Drawing.Size(350, 59); @@ -4644,10 +4676,12 @@ // // // + this.ribbonBar2.TitleStyle.Class = ""; this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar2.TitleVisible = false; // @@ -4701,14 +4735,17 @@ // // // + this.ribbonPanel2.Style.Class = ""; this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseDown.Class = ""; this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; this.ribbonPanel2.Visible = false; @@ -4719,14 +4756,15 @@ // // // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.BackgroundStyle.Class = ""; this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.ContainerControlProcessDialogKey = true; this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.DragDropSupport = true; this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_user_info, this.btn_role_info, @@ -4735,7 +4773,6 @@ this.btn_user_role, this.btn_password_edit, this.buttonItemPasswordReset}); - this.ribbonBar3.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; this.ribbonBar3.Size = new System.Drawing.Size(551, 59); @@ -4744,10 +4781,12 @@ // // // + this.ribbonBar3.TitleStyle.Class = ""; this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar3.TitleVisible = false; // @@ -4823,20 +4862,24 @@ this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 61); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // + this.ribbonPanel15.Style.Class = ""; this.ribbonPanel15.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseDown.Class = ""; this.ribbonPanel15.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4844,14 +4887,15 @@ // // // + this.ribbonBar20.BackgroundMouseOverStyle.Class = ""; this.ribbonBar20.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.BackgroundStyle.Class = ""; this.ribbonBar20.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.ContainerControlProcessDialogKey = true; this.ribbonBar20.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar20.DragDropSupport = true; this.ribbonBar20.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSH, this.buttonItemSJGL, @@ -4865,19 +4909,20 @@ this.buttonItemBJ, this.buttonItemSearch, this.buttonItemBZ}); - this.ribbonBar20.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(814, 58); + this.ribbonBar20.Size = new System.Drawing.Size(814, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // // // + this.ribbonBar20.TitleStyle.Class = ""; this.ribbonBar20.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar20.TitleStyleMouseOver.Class = ""; this.ribbonBar20.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar20.TitleVisible = false; // @@ -5070,18 +5115,21 @@ // this.buttonItem10.Name = "buttonItem10"; this.buttonItem10.Text = "管线入库-高程"; + this.buttonItem10.Visible = false; this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // // buttonItem11 // this.buttonItem11.Name = "buttonItem11"; this.buttonItem11.Text = "附属物入库-高程"; + this.buttonItem11.Visible = false; this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // // buttonItem12 // this.buttonItem12.Name = "buttonItem12"; this.buttonItem12.Text = "特征管点入库-高程"; + this.buttonItem12.Visible = false; this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // // buttonItemSJGL5 @@ -6226,14 +6274,17 @@ // // // + this.ribbonPanel4.Style.Class = ""; this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseDown.Class = ""; this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel4.StyleMouseOver.Class = ""; this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel4.TabIndex = 36; this.ribbonPanel4.Visible = false; @@ -6244,17 +6295,17 @@ // // // + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.BackgroundStyle.Class = ""; this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.ContainerControlProcessDialogKey = true; this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.DragDropSupport = true; this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btn_document_info}); - this.ribbonBar1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; this.ribbonBar1.Size = new System.Drawing.Size(88, 59); @@ -6263,10 +6314,12 @@ // // // + this.ribbonBar1.TitleStyle.Class = ""; this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar1.TitleStyleMouseOver.Class = ""; this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar1.TitleVisible = false; // @@ -6291,14 +6344,17 @@ // // // + this.ribbonPanel6.Style.Class = ""; this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseDown.Class = ""; this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonPanel6.StyleMouseOver.Class = ""; this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel6.TabIndex = 38; this.ribbonPanel6.Visible = false; @@ -6309,21 +6365,21 @@ // // // + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.BackgroundStyle.Class = ""; this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.ContainerControlProcessDialogKey = true; this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.DragDropSupport = true; this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItemSPSZ, this.buttonItem8, this.buttonItemLocation, this.sliderItem2, this.buttonItemGBJC}); - this.ribbonBar6.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; this.ribbonBar6.Size = new System.Drawing.Size(427, 59); @@ -6332,10 +6388,12 @@ // // // + this.ribbonBar6.TitleStyle.Class = ""; this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // + this.ribbonBar6.TitleStyleMouseOver.Class = ""; this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonBar6.TitleVisible = false; // @@ -6388,6 +6446,7 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6438,7 +6497,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -7045,7 +7103,7 @@ private DevComponents.DotNetBar.LabelX labelX25; private DevComponents.DotNetBar.PanelEx panelEx3; private System.Windows.Forms.TreeView layerSensorTree; - // private System.Windows.Forms.TreeView layerTree; + // private System.Windows.Forms.TreeView layerTree; private MyTreeView layerTree; private DevComponents.DotNetBar.ButtonX buttonX7; private DevComponents.DotNetBar.ButtonX buttonX16; diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config new file mode 100644 index 0000000..f4cbe66 --- /dev/null +++ b/bin/x86/Debug/Cyberpipe.exe.config @@ -0,0 +1,32 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb index c7cb8c3..c0fad4a 100644 --- a/bin/x86/Debug/Cyberpipe.pdb +++ b/bin/x86/Debug/Cyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index 3dc3245..1fc46d0 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5f45ee7..9615fbf 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt index b8d8198..c6fbef0 100644 --- a/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -342,8 +342,186 @@ F:\predator\codeReview\GHFX_SZ_64\obj\x64\Debug\Cyberpipe.pdb F:\predator\codeReview\GHFX_SZ_64\bin\x86\Debug\office.dll F:\predator\codeReview\GHFX_SZ_64\bin\x86\Debug\office.xml -D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe.config +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.csproj.ResolveComReference.cache +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.pdb +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\office.dll +E:\wxl\work\GHFX_REFACTOR\bin\x86\Debug\office.xml +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FormDocumentManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmAddYuBiZiShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGBJCresult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmWait.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\PipeLine.Forms.FrmAddPipelineCoordinate.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGongShuiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmMnModify.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPipelineModelDataOneStep.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmShLayers.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmShRK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmTongXunAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmAddWellShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Form_RK.FrmPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccess.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoriesgather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoryAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddValve.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddWellShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddYuBiZiShp.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAllWorkWellStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAnalysisGuiHuaResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPP.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPAuditor.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPFORASK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPFORASKReason.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAPPregion.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAppUSER.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAppUSERRESET.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBACKORACLE.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBSQDuoBianXingStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBSQStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBufferAnalysisBSQ.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmChangePassword.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCheckHistory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCodingQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCompareFeature.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCreateUser.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCustomLabel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDataBaseOpt.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDatabaseParaSetting2.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDbManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDocumentEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDownloadProgress.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmExportCADS.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlySetDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBasicQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBoosterValvers.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBufferAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDatabaseParaSetting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DigFillAnalysisDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmBaseLineProfillAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGenAndFaMenTopu.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmGenTopo.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCloseValves.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDigPitSetting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFittingQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlow.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFlyToPosition.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFolderSelecter.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFTAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGBJC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGenAndFaMenTopu.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmGHRK.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHotFuncStat.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHotFuncStatTitle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmKeywordQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLayerControl.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogDescription.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogin.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLogOper.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMDDictory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadata.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadataOutput.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMetadataStat.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMultiPipelineModelDB.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmOperMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPerm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPermMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeDeepstatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeDiametergather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Frmpipediameterstatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmpipeMaterialGather.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmPaiShuiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmProject.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Forms.FrmRanQiAttribute.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddPipeFitting.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAllPipelineStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmDiameterQuery.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFWPipeLineStatis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRedlineResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleInfoManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleRescManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmShResult.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoManger.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSysUserInfoPassword.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmThreeOracle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRole.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValveStatistics.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMaterialSel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.frmPipeSetEdit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmProfileAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPropertiesMarker.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmOper.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQueryHistory.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQueryMessage.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQuerySensorAlarm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegion.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionType.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRegionTypeMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRESC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRESCMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRole.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetGoalLayer.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmTackPolygonDlg.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmHDMAnalysis3.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmLineCoordinate.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmQuerySQL.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserAdd.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRepo.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRepoMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmUserRoleMgr.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValiData.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmYJSHTC.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Frm_password_reset.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSfiles.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSinout.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.HFS_Forms.Frm_HFSProjedits.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.MainFrm.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCreateTunnel.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCitySevenLineType.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile_AddField.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmEditShapeFile_DeleteField.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmExportVector.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmFloodAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmCityServerLineAnalysis.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmMarker.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmPipelineIndented.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMFiles.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMInout.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMTitle.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.PATM_Forms.F_PATMProjedit.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.Properties.Resources.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetLatLonPos.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSceneLightSet.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmSetFlytoPos.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAccessoriesSensor.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmValiDataShowErrorMessage.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.FrmAddInstrument.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.SysRescInfoManager.resources +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.read.1.tlog +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.write.1.tlog +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.exe +E:\wxl\work\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.pdb +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe.config D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.csproj.ResolveComReference.cache +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.exe +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.exe +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\Cyberpipe.pdb +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\office.dll +D:\GHFX\GHFX_REFACTOR\bin\x86\Debug\office.xml +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\ResolveAssemblyReference.cache D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources @@ -507,3 +685,4 @@ D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.SysRescInfoManager.resources D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.read.1.tlog D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\GenerateResource.write.1.tlog +D:\GHFX\GHFX_REFACTOR\obj\x64\Debug\Cyberpipe.pdb diff --git a/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache b/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache index b4283e0..b05ca27 100644 --- a/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache +++ b/obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache b/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache deleted file mode 100644 index 208d7b0..0000000 --- a/obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.exe b/obj/x64/Debug/Cyberpipe.exe new file mode 100644 index 0000000..526c7dd --- /dev/null +++ b/obj/x64/Debug/Cyberpipe.exe Binary files differ diff --git a/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache index 5359685..8476256 100644 --- a/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x64/Debug/GenerateResource.read.1.tlog b/obj/x64/Debug/GenerateResource.read.1.tlog index fa8e7c6..3971f44 100644 --- a/obj/x64/Debug/GenerateResource.read.1.tlog +++ b/obj/x64/Debug/GenerateResource.read.1.tlog Binary files differ diff --git a/obj/x64/Debug/GenerateResource.write.1.tlog b/obj/x64/Debug/GenerateResource.write.1.tlog index 07697dc..ef1961e 100644 --- a/obj/x64/Debug/GenerateResource.write.1.tlog +++ b/obj/x64/Debug/GenerateResource.write.1.tlog Binary files differ diff --git a/obj/x64/Debug/ResolveAssemblyReference.cache b/obj/x64/Debug/ResolveAssemblyReference.cache new file mode 100644 index 0000000..5af038f --- /dev/null +++ b/obj/x64/Debug/ResolveAssemblyReference.cache Binary files differ