diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e29aade..3e268fe 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e29aade..3e268fe 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index 7ed3325..f78290f 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -142,11 +142,9 @@ lineBuilder.build(layer, checkBoxAdd.Checked ? EnumUpdateMode.Append : EnumUpdateMode.Update, checkBoxDeep.Checked ? EnumBuildMode.Depth : EnumBuildMode.Alititude, lineParam); - addLayerToGlobeControl(lineParam.layerName); DialogResult = DialogResult.OK; MessageBox.Show("入库完成！", "提示"); - } catch (Exception ex) { diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e29aade..3e268fe 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index 7ed3325..f78290f 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -142,11 +142,9 @@ lineBuilder.build(layer, checkBoxAdd.Checked ? EnumUpdateMode.Append : EnumUpdateMode.Update, checkBoxDeep.Checked ? EnumBuildMode.Depth : EnumBuildMode.Alititude, lineParam); - addLayerToGlobeControl(lineParam.layerName); DialogResult = DialogResult.OK; MessageBox.Show("入库完成！", "提示"); - } catch (Exception ex) { diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 7c5e484..6928b7a 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -25,8 +25,6 @@ globeControl1 = ctl; m_InitDataGridViewX1 = InitDataGridViewX1; this.polygon = polygon; - - } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) @@ -51,7 +49,6 @@ chartAllAreaPipeline.Series["井盖"].ChartType = SeriesChartType.Column;//"井盖" chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; - //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; Dictionary workWellLengthAndType = new Dictionary(); foreach (KeyValuePair kv in map) @@ -69,7 +66,7 @@ } catch (Exception ex) { - //LogError.PublishError(ex); + LogError.PublishError(ex); } } @@ -115,7 +112,7 @@ DataTable dt = OledbHelper.QueryTable(sql); string strLable = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - m_InitDataGridViewX1(dt, strLable, "", true); + m_InitDataGridViewX1(dt, strLable, layername, true); } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e29aade..3e268fe 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index 7ed3325..f78290f 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -142,11 +142,9 @@ lineBuilder.build(layer, checkBoxAdd.Checked ? EnumUpdateMode.Append : EnumUpdateMode.Update, checkBoxDeep.Checked ? EnumBuildMode.Depth : EnumBuildMode.Alititude, lineParam); - addLayerToGlobeControl(lineParam.layerName); DialogResult = DialogResult.OK; MessageBox.Show("入库完成！", "提示"); - } catch (Exception ex) { diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 7c5e484..6928b7a 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -25,8 +25,6 @@ globeControl1 = ctl; m_InitDataGridViewX1 = InitDataGridViewX1; this.polygon = polygon; - - } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) @@ -51,7 +49,6 @@ chartAllAreaPipeline.Series["井盖"].ChartType = SeriesChartType.Column;//"井盖" chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; - //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; Dictionary workWellLengthAndType = new Dictionary(); foreach (KeyValuePair kv in map) @@ -69,7 +66,7 @@ } catch (Exception ex) { - //LogError.PublishError(ex); + LogError.PublishError(ex); } } @@ -115,7 +112,7 @@ DataTable dt = OledbHelper.QueryTable(sql); string strLable = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - m_InitDataGridViewX1(dt, strLable, "", true); + m_InitDataGridViewX1(dt, strLable, layername, true); } diff --git a/FrmValveStatistics.cs b/FrmValveStatistics.cs index 317ad72..37d7d0d 100644 --- a/FrmValveStatistics.cs +++ b/FrmValveStatistics.cs @@ -13,14 +13,6 @@ { public partial class FrmValveStatistics : Office2007Form { - //Dictionary workWellLengthAndType = new Dictionary(); - //List list = new List(); - //GSOGlobeControl globeControl1; - - //DataTable table = new DataTable(); - //string strLable = ""; - //private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; - private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; private Dictionary map; private GSOGlobeControl globeControl1; @@ -50,7 +42,7 @@ /// private void FrmLayerSelectedQuery_Load(object sender, EventArgs e) { - map = getValveMap(polygon) ; + map = getValveMap(polygon); drawChart(); } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e29aade..3e268fe 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index 7ed3325..f78290f 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -142,11 +142,9 @@ lineBuilder.build(layer, checkBoxAdd.Checked ? EnumUpdateMode.Append : EnumUpdateMode.Update, checkBoxDeep.Checked ? EnumBuildMode.Depth : EnumBuildMode.Alititude, lineParam); - addLayerToGlobeControl(lineParam.layerName); DialogResult = DialogResult.OK; MessageBox.Show("入库完成！", "提示"); - } catch (Exception ex) { diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 7c5e484..6928b7a 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -25,8 +25,6 @@ globeControl1 = ctl; m_InitDataGridViewX1 = InitDataGridViewX1; this.polygon = polygon; - - } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) @@ -51,7 +49,6 @@ chartAllAreaPipeline.Series["井盖"].ChartType = SeriesChartType.Column;//"井盖" chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; - //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; Dictionary workWellLengthAndType = new Dictionary(); foreach (KeyValuePair kv in map) @@ -69,7 +66,7 @@ } catch (Exception ex) { - //LogError.PublishError(ex); + LogError.PublishError(ex); } } @@ -115,7 +112,7 @@ DataTable dt = OledbHelper.QueryTable(sql); string strLable = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - m_InitDataGridViewX1(dt, strLable, "", true); + m_InitDataGridViewX1(dt, strLable, layername, true); } diff --git a/FrmValveStatistics.cs b/FrmValveStatistics.cs index 317ad72..37d7d0d 100644 --- a/FrmValveStatistics.cs +++ b/FrmValveStatistics.cs @@ -13,14 +13,6 @@ { public partial class FrmValveStatistics : Office2007Form { - //Dictionary workWellLengthAndType = new Dictionary(); - //List list = new List(); - //GSOGlobeControl globeControl1; - - //DataTable table = new DataTable(); - //string strLable = ""; - //private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; - private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; private Dictionary map; private GSOGlobeControl globeControl1; @@ -50,7 +42,7 @@ /// private void FrmLayerSelectedQuery_Load(object sender, EventArgs e) { - map = getValveMap(polygon) ; + map = getValveMap(polygon); drawChart(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 00f644a..611ed4b 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -57,7 +57,6 @@ // newFeatureSet if (newFeatureSet.GetFeatureByName(newFeature.Name, true).Length > 0) { //存在 - if (updateMode.Equals(EnumUpdateMode.Append)) { continue; @@ -67,7 +66,6 @@ } newFeatureSet.AddFeature(newFeature); - } newFeatureSet.Save(); newFeatureSet.Close(); @@ -105,8 +103,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth) / 1000; - double height = f.GetFieldAsDouble(lineParam.channelHeight) / 1000; + double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight); GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); @@ -164,17 +162,14 @@ if (double.IsInfinity(pt3d.Z)) { - //TODOLIST:ERROR log4net pt3d.Z = deep2; - //MessageBox.Show("无穷！"); } pt3ds.Add(pt3d); } line[0] = pt3ds; - // getPipeLineRectStyle(line, lineParam, f); - return line; } + } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e29aade..3e268fe 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index 7ed3325..f78290f 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -142,11 +142,9 @@ lineBuilder.build(layer, checkBoxAdd.Checked ? EnumUpdateMode.Append : EnumUpdateMode.Update, checkBoxDeep.Checked ? EnumBuildMode.Depth : EnumBuildMode.Alititude, lineParam); - addLayerToGlobeControl(lineParam.layerName); DialogResult = DialogResult.OK; MessageBox.Show("入库完成！", "提示"); - } catch (Exception ex) { diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index 7c5e484..6928b7a 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -25,8 +25,6 @@ globeControl1 = ctl; m_InitDataGridViewX1 = InitDataGridViewX1; this.polygon = polygon; - - } private void FrmAllPipelineStatis_Load(object sender, EventArgs e) @@ -51,7 +49,6 @@ chartAllAreaPipeline.Series["井盖"].ChartType = SeriesChartType.Column;//"井盖" chartAllAreaPipeline.Series["井盖"]["DrawingStyle"] = "Cylinder"; - //chartAllAreaPipeline.Series[0].IsValueShownAsLabel = true; Dictionary workWellLengthAndType = new Dictionary(); foreach (KeyValuePair kv in map) @@ -69,7 +66,7 @@ } catch (Exception ex) { - //LogError.PublishError(ex); + LogError.PublishError(ex); } } @@ -115,7 +112,7 @@ DataTable dt = OledbHelper.QueryTable(sql); string strLable = " 井盖类型：" + pipetype + "||共有：" + Convert.ToString(dt.Rows.Count) + "条记录"; - m_InitDataGridViewX1(dt, strLable, "", true); + m_InitDataGridViewX1(dt, strLable, layername, true); } diff --git a/FrmValveStatistics.cs b/FrmValveStatistics.cs index 317ad72..37d7d0d 100644 --- a/FrmValveStatistics.cs +++ b/FrmValveStatistics.cs @@ -13,14 +13,6 @@ { public partial class FrmValveStatistics : Office2007Form { - //Dictionary workWellLengthAndType = new Dictionary(); - //List list = new List(); - //GSOGlobeControl globeControl1; - - //DataTable table = new DataTable(); - //string strLable = ""; - //private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; - private MainFrm.DataGridViewDelegate m_InitDataGridViewX1; private Dictionary map; private GSOGlobeControl globeControl1; @@ -50,7 +42,7 @@ /// private void FrmLayerSelectedQuery_Load(object sender, EventArgs e) { - map = getValveMap(polygon) ; + map = getValveMap(polygon); drawChart(); } diff --git a/LineBuilder.cs b/LineBuilder.cs index 00f644a..611ed4b 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -57,7 +57,6 @@ // newFeatureSet if (newFeatureSet.GetFeatureByName(newFeature.Name, true).Length > 0) { //存在 - if (updateMode.Equals(EnumUpdateMode.Append)) { continue; @@ -67,7 +66,6 @@ } newFeatureSet.AddFeature(newFeature); - } newFeatureSet.Save(); newFeatureSet.Close(); @@ -105,8 +103,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth) / 1000; - double height = f.GetFieldAsDouble(lineParam.channelHeight) / 1000; + double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight); GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); @@ -164,17 +162,14 @@ if (double.IsInfinity(pt3d.Z)) { - //TODOLIST:ERROR log4net pt3d.Z = deep2; - //MessageBox.Show("无穷！"); } pt3ds.Add(pt3d); } line[0] = pt3ds; - // getPipeLineRectStyle(line, lineParam, f); - return line; } + } } diff --git a/MainFrm.cs b/MainFrm.cs index 34a6eef..f848026 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1160,7 +1160,7 @@ { globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - //初始化TreeView + //初始化TreeView initLayerTree(); }