diff --git a/Cyberpipe.suo b/Cyberpipe.suo index b7b0658..5cd6753 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index b7b0658..5cd6753 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index b127fe3..8fd1268 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -143,9 +143,9 @@ for (int j = 0; j < feats.Length; j++) { - if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径_毫米"))) + if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径"))) { - lstDiameter.Add(feats[j].GetFieldAsFloat("管径_毫米")); + lstDiameter.Add(feats[j].GetFieldAsFloat("管径")); } } lstDiameter.Sort(); @@ -157,7 +157,7 @@ int ncount = 0; for (int j = 0; j < feats.Length; j++) { - if (Math.Abs(feats[j].GetFieldAsFloat("管径_毫米") - diameter) > 0.00001) continue; + if (Math.Abs(feats[j].GetFieldAsFloat("管径") - diameter) > 0.00001) continue; GSOGeoPolyline3D line = feats[j].Geometry as GSOGeoPolyline3D; if (line == null) continue; double length = line.GetSpaceLength(true, 6378137); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index b7b0658..5cd6753 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index b127fe3..8fd1268 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -143,9 +143,9 @@ for (int j = 0; j < feats.Length; j++) { - if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径_毫米"))) + if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径"))) { - lstDiameter.Add(feats[j].GetFieldAsFloat("管径_毫米")); + lstDiameter.Add(feats[j].GetFieldAsFloat("管径")); } } lstDiameter.Sort(); @@ -157,7 +157,7 @@ int ncount = 0; for (int j = 0; j < feats.Length; j++) { - if (Math.Abs(feats[j].GetFieldAsFloat("管径_毫米") - diameter) > 0.00001) continue; + if (Math.Abs(feats[j].GetFieldAsFloat("管径") - diameter) > 0.00001) continue; GSOGeoPolyline3D line = feats[j].Geometry as GSOGeoPolyline3D; if (line == null) continue; double length = line.GetSpaceLength(true, 6378137); diff --git a/Forms/FrmGongShuiAttribute.cs b/Forms/FrmGongShuiAttribute.cs index 0afd212..a31681c 100644 --- a/Forms/FrmGongShuiAttribute.cs +++ b/Forms/FrmGongShuiAttribute.cs @@ -128,7 +128,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/Cyberpipe.suo b/Cyberpipe.suo index b7b0658..5cd6753 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index b127fe3..8fd1268 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -143,9 +143,9 @@ for (int j = 0; j < feats.Length; j++) { - if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径_毫米"))) + if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径"))) { - lstDiameter.Add(feats[j].GetFieldAsFloat("管径_毫米")); + lstDiameter.Add(feats[j].GetFieldAsFloat("管径")); } } lstDiameter.Sort(); @@ -157,7 +157,7 @@ int ncount = 0; for (int j = 0; j < feats.Length; j++) { - if (Math.Abs(feats[j].GetFieldAsFloat("管径_毫米") - diameter) > 0.00001) continue; + if (Math.Abs(feats[j].GetFieldAsFloat("管径") - diameter) > 0.00001) continue; GSOGeoPolyline3D line = feats[j].Geometry as GSOGeoPolyline3D; if (line == null) continue; double length = line.GetSpaceLength(true, 6378137); diff --git a/Forms/FrmGongShuiAttribute.cs b/Forms/FrmGongShuiAttribute.cs index 0afd212..a31681c 100644 --- a/Forms/FrmGongShuiAttribute.cs +++ b/Forms/FrmGongShuiAttribute.cs @@ -128,7 +128,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 8da8941..41bee50 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex >0) { diff --git a/Cyberpipe.suo b/Cyberpipe.suo index b7b0658..5cd6753 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index b127fe3..8fd1268 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -143,9 +143,9 @@ for (int j = 0; j < feats.Length; j++) { - if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径_毫米"))) + if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径"))) { - lstDiameter.Add(feats[j].GetFieldAsFloat("管径_毫米")); + lstDiameter.Add(feats[j].GetFieldAsFloat("管径")); } } lstDiameter.Sort(); @@ -157,7 +157,7 @@ int ncount = 0; for (int j = 0; j < feats.Length; j++) { - if (Math.Abs(feats[j].GetFieldAsFloat("管径_毫米") - diameter) > 0.00001) continue; + if (Math.Abs(feats[j].GetFieldAsFloat("管径") - diameter) > 0.00001) continue; GSOGeoPolyline3D line = feats[j].Geometry as GSOGeoPolyline3D; if (line == null) continue; double length = line.GetSpaceLength(true, 6378137); diff --git a/Forms/FrmGongShuiAttribute.cs b/Forms/FrmGongShuiAttribute.cs index 0afd212..a31681c 100644 --- a/Forms/FrmGongShuiAttribute.cs +++ b/Forms/FrmGongShuiAttribute.cs @@ -128,7 +128,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 8da8941..41bee50 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex >0) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index 5f441d6..adf7846 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -219,7 +219,7 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + cmbRadius.SelectedItem = "管径"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index b7b0658..5cd6753 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index b127fe3..8fd1268 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -143,9 +143,9 @@ for (int j = 0; j < feats.Length; j++) { - if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径_毫米"))) + if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径"))) { - lstDiameter.Add(feats[j].GetFieldAsFloat("管径_毫米")); + lstDiameter.Add(feats[j].GetFieldAsFloat("管径")); } } lstDiameter.Sort(); @@ -157,7 +157,7 @@ int ncount = 0; for (int j = 0; j < feats.Length; j++) { - if (Math.Abs(feats[j].GetFieldAsFloat("管径_毫米") - diameter) > 0.00001) continue; + if (Math.Abs(feats[j].GetFieldAsFloat("管径") - diameter) > 0.00001) continue; GSOGeoPolyline3D line = feats[j].Geometry as GSOGeoPolyline3D; if (line == null) continue; double length = line.GetSpaceLength(true, 6378137); diff --git a/Forms/FrmGongShuiAttribute.cs b/Forms/FrmGongShuiAttribute.cs index 0afd212..a31681c 100644 --- a/Forms/FrmGongShuiAttribute.cs +++ b/Forms/FrmGongShuiAttribute.cs @@ -128,7 +128,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 8da8941..41bee50 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex >0) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index 5f441d6..adf7846 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -219,7 +219,7 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + cmbRadius.SelectedItem = "管径"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; } diff --git a/Forms/FrmRanQiAttribute.cs b/Forms/FrmRanQiAttribute.cs index e069469..a8953db 100644 --- a/Forms/FrmRanQiAttribute.cs +++ b/Forms/FrmRanQiAttribute.cs @@ -199,7 +199,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaiShe.SelectedIndex > 0) { diff --git a/Cyberpipe.suo b/Cyberpipe.suo index b7b0658..5cd6753 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index b127fe3..8fd1268 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -143,9 +143,9 @@ for (int j = 0; j < feats.Length; j++) { - if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径_毫米"))) + if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径"))) { - lstDiameter.Add(feats[j].GetFieldAsFloat("管径_毫米")); + lstDiameter.Add(feats[j].GetFieldAsFloat("管径")); } } lstDiameter.Sort(); @@ -157,7 +157,7 @@ int ncount = 0; for (int j = 0; j < feats.Length; j++) { - if (Math.Abs(feats[j].GetFieldAsFloat("管径_毫米") - diameter) > 0.00001) continue; + if (Math.Abs(feats[j].GetFieldAsFloat("管径") - diameter) > 0.00001) continue; GSOGeoPolyline3D line = feats[j].Geometry as GSOGeoPolyline3D; if (line == null) continue; double length = line.GetSpaceLength(true, 6378137); diff --git a/Forms/FrmGongShuiAttribute.cs b/Forms/FrmGongShuiAttribute.cs index 0afd212..a31681c 100644 --- a/Forms/FrmGongShuiAttribute.cs +++ b/Forms/FrmGongShuiAttribute.cs @@ -128,7 +128,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 8da8941..41bee50 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex >0) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index 5f441d6..adf7846 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -219,7 +219,7 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + cmbRadius.SelectedItem = "管径"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; } diff --git a/Forms/FrmRanQiAttribute.cs b/Forms/FrmRanQiAttribute.cs index e069469..a8953db 100644 --- a/Forms/FrmRanQiAttribute.cs +++ b/Forms/FrmRanQiAttribute.cs @@ -199,7 +199,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaiShe.SelectedIndex > 0) { diff --git a/Forms/FrmTongXunAttribute.cs b/Forms/FrmTongXunAttribute.cs index 79a71ed..a34cb0e 100644 --- a/Forms/FrmTongXunAttribute.cs +++ b/Forms/FrmTongXunAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/Cyberpipe.suo b/Cyberpipe.suo index b7b0658..5cd6753 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index b127fe3..8fd1268 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -143,9 +143,9 @@ for (int j = 0; j < feats.Length; j++) { - if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径_毫米"))) + if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径"))) { - lstDiameter.Add(feats[j].GetFieldAsFloat("管径_毫米")); + lstDiameter.Add(feats[j].GetFieldAsFloat("管径")); } } lstDiameter.Sort(); @@ -157,7 +157,7 @@ int ncount = 0; for (int j = 0; j < feats.Length; j++) { - if (Math.Abs(feats[j].GetFieldAsFloat("管径_毫米") - diameter) > 0.00001) continue; + if (Math.Abs(feats[j].GetFieldAsFloat("管径") - diameter) > 0.00001) continue; GSOGeoPolyline3D line = feats[j].Geometry as GSOGeoPolyline3D; if (line == null) continue; double length = line.GetSpaceLength(true, 6378137); diff --git a/Forms/FrmGongShuiAttribute.cs b/Forms/FrmGongShuiAttribute.cs index 0afd212..a31681c 100644 --- a/Forms/FrmGongShuiAttribute.cs +++ b/Forms/FrmGongShuiAttribute.cs @@ -128,7 +128,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 8da8941..41bee50 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex >0) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index 5f441d6..adf7846 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -219,7 +219,7 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + cmbRadius.SelectedItem = "管径"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; } diff --git a/Forms/FrmRanQiAttribute.cs b/Forms/FrmRanQiAttribute.cs index e069469..a8953db 100644 --- a/Forms/FrmRanQiAttribute.cs +++ b/Forms/FrmRanQiAttribute.cs @@ -199,7 +199,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaiShe.SelectedIndex > 0) { diff --git a/Forms/FrmTongXunAttribute.cs b/Forms/FrmTongXunAttribute.cs index 79a71ed..a34cb0e 100644 --- a/Forms/FrmTongXunAttribute.cs +++ b/Forms/FrmTongXunAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index 6595ee9..8a3df4a 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -169,11 +169,11 @@ // m_InitDataGridViewX1(table,strLable,comboBoxEx1.Text,true); // } PaginationUtil.ResetPagination(); - int total = PaginationUtil.CountSql(comboBoxEx1.Text, "管径_毫米",mathT, textBoxX2.Text, textBoxX1.Text); + int total = PaginationUtil.CountSql(comboBoxEx1.Text, "管径",mathT, textBoxX2.Text, textBoxX1.Text); if (total > 0) { string strLable = comboBoxEx1.Text + "共有:" + total + "条"; - string sql = PaginationUtil.GetQuerySql(globeControl1, comboBoxEx1.Text, "管径_毫米",mathT, textBoxX2.Text, textBoxX1.Text); + string sql = PaginationUtil.GetQuerySql(globeControl1, comboBoxEx1.Text, "管径",mathT, textBoxX2.Text, textBoxX1.Text); PaginationUtil pagination = PaginationUtil.InitPagination(sql, total, _pageControl, m_InitDataGridViewX1, strLable, comboBoxEx1.Text); pagination.FillDataGridView(); } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index b7b0658..5cd6753 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index b127fe3..8fd1268 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -143,9 +143,9 @@ for (int j = 0; j < feats.Length; j++) { - if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径_毫米"))) + if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径"))) { - lstDiameter.Add(feats[j].GetFieldAsFloat("管径_毫米")); + lstDiameter.Add(feats[j].GetFieldAsFloat("管径")); } } lstDiameter.Sort(); @@ -157,7 +157,7 @@ int ncount = 0; for (int j = 0; j < feats.Length; j++) { - if (Math.Abs(feats[j].GetFieldAsFloat("管径_毫米") - diameter) > 0.00001) continue; + if (Math.Abs(feats[j].GetFieldAsFloat("管径") - diameter) > 0.00001) continue; GSOGeoPolyline3D line = feats[j].Geometry as GSOGeoPolyline3D; if (line == null) continue; double length = line.GetSpaceLength(true, 6378137); diff --git a/Forms/FrmGongShuiAttribute.cs b/Forms/FrmGongShuiAttribute.cs index 0afd212..a31681c 100644 --- a/Forms/FrmGongShuiAttribute.cs +++ b/Forms/FrmGongShuiAttribute.cs @@ -128,7 +128,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 8da8941..41bee50 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex >0) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index 5f441d6..adf7846 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -219,7 +219,7 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + cmbRadius.SelectedItem = "管径"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; } diff --git a/Forms/FrmRanQiAttribute.cs b/Forms/FrmRanQiAttribute.cs index e069469..a8953db 100644 --- a/Forms/FrmRanQiAttribute.cs +++ b/Forms/FrmRanQiAttribute.cs @@ -199,7 +199,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaiShe.SelectedIndex > 0) { diff --git a/Forms/FrmTongXunAttribute.cs b/Forms/FrmTongXunAttribute.cs index 79a71ed..a34cb0e 100644 --- a/Forms/FrmTongXunAttribute.cs +++ b/Forms/FrmTongXunAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index 6595ee9..8a3df4a 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -169,11 +169,11 @@ // m_InitDataGridViewX1(table,strLable,comboBoxEx1.Text,true); // } PaginationUtil.ResetPagination(); - int total = PaginationUtil.CountSql(comboBoxEx1.Text, "管径_毫米",mathT, textBoxX2.Text, textBoxX1.Text); + int total = PaginationUtil.CountSql(comboBoxEx1.Text, "管径",mathT, textBoxX2.Text, textBoxX1.Text); if (total > 0) { string strLable = comboBoxEx1.Text + "共有:" + total + "条"; - string sql = PaginationUtil.GetQuerySql(globeControl1, comboBoxEx1.Text, "管径_毫米",mathT, textBoxX2.Text, textBoxX1.Text); + string sql = PaginationUtil.GetQuerySql(globeControl1, comboBoxEx1.Text, "管径",mathT, textBoxX2.Text, textBoxX1.Text); PaginationUtil pagination = PaginationUtil.InitPagination(sql, total, _pageControl, m_InitDataGridViewX1, strLable, comboBoxEx1.Text); pagination.FillDataGridView(); } diff --git a/FrmHDMAnalysis3.cs b/FrmHDMAnalysis3.cs index 9d9b606..534012b 100644 --- a/FrmHDMAnalysis3.cs +++ b/FrmHDMAnalysis3.cs @@ -45,7 +45,7 @@ table.Columns.Add("编号", typeof(string)); table.Columns.Add("管线类型", typeof(string)); table.Columns.Add("管线编码", typeof(string)); - table.Columns.Add("管径_毫米", typeof(string)); + table.Columns.Add("管径", typeof(string)); table.Columns.Add("材质", typeof(string)); table.Columns.Add("管线埋深", typeof(string)); @@ -72,7 +72,7 @@ string pipeType = feature.Dataset == null ? "" : feature.Dataset.Caption; string number = Convert.ToString(i + 1); string material = feature.GetFieldAsString("材质"); - string diameter = feature.GetFieldAsString("管径_毫米"); + string diameter = feature.GetFieldAsString("管径"); table.Rows.Add(number, pipeType, feature.Name, diameter, material, Convert.ToDecimal(coor.Z).ToString("f2")); chart1.Series["管线"].Points[i].LegendText = number; if (feature.Geometry.Style.GetType() == typeof(GSOPipeLineStyle3D)) @@ -87,7 +87,7 @@ chart1.Series["管线"].Points[i].MarkerBorderWidth = 3; //边框的宽度 chart1.Series["管线"].Points[i].MarkerColor = Color.Transparent; - chart1.Series["管线"].Points[i].MarkerSize = Convert.ToInt32(Math.Floor((feature.GetFieldAsDouble("管径_毫米") / 0.35 + + chart1.Series["管线"].Points[i].MarkerSize = Convert.ToInt32(Math.Floor((feature.GetFieldAsDouble("管径") / 0.35 + chart1.Series["管线"].Points[i].MarkerBorderWidth) / 100.0)); i++; } @@ -141,7 +141,7 @@ "#hor-minimalist-b tbody tr:hover td {" + "color:#000099;}" + "" + - "" + + "
管线类型管线编码管径_毫米
" + "" + "
管线类型管线编码管径材质管线埋深
" + row[1] + "" + row[2] + diff --git a/Cyberpipe.suo b/Cyberpipe.suo index b7b0658..5cd6753 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index b127fe3..8fd1268 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -143,9 +143,9 @@ for (int j = 0; j < feats.Length; j++) { - if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径_毫米"))) + if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径"))) { - lstDiameter.Add(feats[j].GetFieldAsFloat("管径_毫米")); + lstDiameter.Add(feats[j].GetFieldAsFloat("管径")); } } lstDiameter.Sort(); @@ -157,7 +157,7 @@ int ncount = 0; for (int j = 0; j < feats.Length; j++) { - if (Math.Abs(feats[j].GetFieldAsFloat("管径_毫米") - diameter) > 0.00001) continue; + if (Math.Abs(feats[j].GetFieldAsFloat("管径") - diameter) > 0.00001) continue; GSOGeoPolyline3D line = feats[j].Geometry as GSOGeoPolyline3D; if (line == null) continue; double length = line.GetSpaceLength(true, 6378137); diff --git a/Forms/FrmGongShuiAttribute.cs b/Forms/FrmGongShuiAttribute.cs index 0afd212..a31681c 100644 --- a/Forms/FrmGongShuiAttribute.cs +++ b/Forms/FrmGongShuiAttribute.cs @@ -128,7 +128,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 8da8941..41bee50 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex >0) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index 5f441d6..adf7846 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -219,7 +219,7 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + cmbRadius.SelectedItem = "管径"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; } diff --git a/Forms/FrmRanQiAttribute.cs b/Forms/FrmRanQiAttribute.cs index e069469..a8953db 100644 --- a/Forms/FrmRanQiAttribute.cs +++ b/Forms/FrmRanQiAttribute.cs @@ -199,7 +199,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaiShe.SelectedIndex > 0) { diff --git a/Forms/FrmTongXunAttribute.cs b/Forms/FrmTongXunAttribute.cs index 79a71ed..a34cb0e 100644 --- a/Forms/FrmTongXunAttribute.cs +++ b/Forms/FrmTongXunAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index 6595ee9..8a3df4a 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -169,11 +169,11 @@ // m_InitDataGridViewX1(table,strLable,comboBoxEx1.Text,true); // } PaginationUtil.ResetPagination(); - int total = PaginationUtil.CountSql(comboBoxEx1.Text, "管径_毫米",mathT, textBoxX2.Text, textBoxX1.Text); + int total = PaginationUtil.CountSql(comboBoxEx1.Text, "管径",mathT, textBoxX2.Text, textBoxX1.Text); if (total > 0) { string strLable = comboBoxEx1.Text + "共有:" + total + "条"; - string sql = PaginationUtil.GetQuerySql(globeControl1, comboBoxEx1.Text, "管径_毫米",mathT, textBoxX2.Text, textBoxX1.Text); + string sql = PaginationUtil.GetQuerySql(globeControl1, comboBoxEx1.Text, "管径",mathT, textBoxX2.Text, textBoxX1.Text); PaginationUtil pagination = PaginationUtil.InitPagination(sql, total, _pageControl, m_InitDataGridViewX1, strLable, comboBoxEx1.Text); pagination.FillDataGridView(); } diff --git a/FrmHDMAnalysis3.cs b/FrmHDMAnalysis3.cs index 9d9b606..534012b 100644 --- a/FrmHDMAnalysis3.cs +++ b/FrmHDMAnalysis3.cs @@ -45,7 +45,7 @@ table.Columns.Add("编号", typeof(string)); table.Columns.Add("管线类型", typeof(string)); table.Columns.Add("管线编码", typeof(string)); - table.Columns.Add("管径_毫米", typeof(string)); + table.Columns.Add("管径", typeof(string)); table.Columns.Add("材质", typeof(string)); table.Columns.Add("管线埋深", typeof(string)); @@ -72,7 +72,7 @@ string pipeType = feature.Dataset == null ? "" : feature.Dataset.Caption; string number = Convert.ToString(i + 1); string material = feature.GetFieldAsString("材质"); - string diameter = feature.GetFieldAsString("管径_毫米"); + string diameter = feature.GetFieldAsString("管径"); table.Rows.Add(number, pipeType, feature.Name, diameter, material, Convert.ToDecimal(coor.Z).ToString("f2")); chart1.Series["管线"].Points[i].LegendText = number; if (feature.Geometry.Style.GetType() == typeof(GSOPipeLineStyle3D)) @@ -87,7 +87,7 @@ chart1.Series["管线"].Points[i].MarkerBorderWidth = 3; //边框的宽度 chart1.Series["管线"].Points[i].MarkerColor = Color.Transparent; - chart1.Series["管线"].Points[i].MarkerSize = Convert.ToInt32(Math.Floor((feature.GetFieldAsDouble("管径_毫米") / 0.35 + + chart1.Series["管线"].Points[i].MarkerSize = Convert.ToInt32(Math.Floor((feature.GetFieldAsDouble("管径") / 0.35 + chart1.Series["管线"].Points[i].MarkerBorderWidth) / 100.0)); i++; } @@ -141,7 +141,7 @@ "#hor-minimalist-b tbody tr:hover td {" + "color:#000099;}" + "" + - "" + + "
管线类型管线编码管径_毫米
" + "" + "
管线类型管线编码管径材质管线埋深
" + row[1] + "" + row[2] + diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 48ac35f..b3ae59c 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -187,7 +187,7 @@ if (tempDown != null) downLimit = Convert.ToDouble(tempDown); if (upLimit == null && downLimit == null) continue;//空行过滤 //获取符合条件的管线 - FeaturesClassfyResult result = service.GetPipesInfoByValueSection(polygon, layer, downLimit, upLimit, "管径_毫米"); + FeaturesClassfyResult result = service.GetPipesInfoByValueSection(polygon, layer, downLimit, upLimit, "管径"); DataGridViewRow row = new DataGridViewRow(); int index = dataGridViewX1.Rows.Add(row); row = dataGridViewX1.Rows[index]; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index b7b0658..5cd6753 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index b127fe3..8fd1268 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -143,9 +143,9 @@ for (int j = 0; j < feats.Length; j++) { - if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径_毫米"))) + if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径"))) { - lstDiameter.Add(feats[j].GetFieldAsFloat("管径_毫米")); + lstDiameter.Add(feats[j].GetFieldAsFloat("管径")); } } lstDiameter.Sort(); @@ -157,7 +157,7 @@ int ncount = 0; for (int j = 0; j < feats.Length; j++) { - if (Math.Abs(feats[j].GetFieldAsFloat("管径_毫米") - diameter) > 0.00001) continue; + if (Math.Abs(feats[j].GetFieldAsFloat("管径") - diameter) > 0.00001) continue; GSOGeoPolyline3D line = feats[j].Geometry as GSOGeoPolyline3D; if (line == null) continue; double length = line.GetSpaceLength(true, 6378137); diff --git a/Forms/FrmGongShuiAttribute.cs b/Forms/FrmGongShuiAttribute.cs index 0afd212..a31681c 100644 --- a/Forms/FrmGongShuiAttribute.cs +++ b/Forms/FrmGongShuiAttribute.cs @@ -128,7 +128,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 8da8941..41bee50 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex >0) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index 5f441d6..adf7846 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -219,7 +219,7 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + cmbRadius.SelectedItem = "管径"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; } diff --git a/Forms/FrmRanQiAttribute.cs b/Forms/FrmRanQiAttribute.cs index e069469..a8953db 100644 --- a/Forms/FrmRanQiAttribute.cs +++ b/Forms/FrmRanQiAttribute.cs @@ -199,7 +199,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaiShe.SelectedIndex > 0) { diff --git a/Forms/FrmTongXunAttribute.cs b/Forms/FrmTongXunAttribute.cs index 79a71ed..a34cb0e 100644 --- a/Forms/FrmTongXunAttribute.cs +++ b/Forms/FrmTongXunAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index 6595ee9..8a3df4a 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -169,11 +169,11 @@ // m_InitDataGridViewX1(table,strLable,comboBoxEx1.Text,true); // } PaginationUtil.ResetPagination(); - int total = PaginationUtil.CountSql(comboBoxEx1.Text, "管径_毫米",mathT, textBoxX2.Text, textBoxX1.Text); + int total = PaginationUtil.CountSql(comboBoxEx1.Text, "管径",mathT, textBoxX2.Text, textBoxX1.Text); if (total > 0) { string strLable = comboBoxEx1.Text + "共有:" + total + "条"; - string sql = PaginationUtil.GetQuerySql(globeControl1, comboBoxEx1.Text, "管径_毫米",mathT, textBoxX2.Text, textBoxX1.Text); + string sql = PaginationUtil.GetQuerySql(globeControl1, comboBoxEx1.Text, "管径",mathT, textBoxX2.Text, textBoxX1.Text); PaginationUtil pagination = PaginationUtil.InitPagination(sql, total, _pageControl, m_InitDataGridViewX1, strLable, comboBoxEx1.Text); pagination.FillDataGridView(); } diff --git a/FrmHDMAnalysis3.cs b/FrmHDMAnalysis3.cs index 9d9b606..534012b 100644 --- a/FrmHDMAnalysis3.cs +++ b/FrmHDMAnalysis3.cs @@ -45,7 +45,7 @@ table.Columns.Add("编号", typeof(string)); table.Columns.Add("管线类型", typeof(string)); table.Columns.Add("管线编码", typeof(string)); - table.Columns.Add("管径_毫米", typeof(string)); + table.Columns.Add("管径", typeof(string)); table.Columns.Add("材质", typeof(string)); table.Columns.Add("管线埋深", typeof(string)); @@ -72,7 +72,7 @@ string pipeType = feature.Dataset == null ? "" : feature.Dataset.Caption; string number = Convert.ToString(i + 1); string material = feature.GetFieldAsString("材质"); - string diameter = feature.GetFieldAsString("管径_毫米"); + string diameter = feature.GetFieldAsString("管径"); table.Rows.Add(number, pipeType, feature.Name, diameter, material, Convert.ToDecimal(coor.Z).ToString("f2")); chart1.Series["管线"].Points[i].LegendText = number; if (feature.Geometry.Style.GetType() == typeof(GSOPipeLineStyle3D)) @@ -87,7 +87,7 @@ chart1.Series["管线"].Points[i].MarkerBorderWidth = 3; //边框的宽度 chart1.Series["管线"].Points[i].MarkerColor = Color.Transparent; - chart1.Series["管线"].Points[i].MarkerSize = Convert.ToInt32(Math.Floor((feature.GetFieldAsDouble("管径_毫米") / 0.35 + + chart1.Series["管线"].Points[i].MarkerSize = Convert.ToInt32(Math.Floor((feature.GetFieldAsDouble("管径") / 0.35 + chart1.Series["管线"].Points[i].MarkerBorderWidth) / 100.0)); i++; } @@ -141,7 +141,7 @@ "#hor-minimalist-b tbody tr:hover td {" + "color:#000099;}" + "" + - "" + + "
管线类型管线编码管径_毫米
" + "" + "
管线类型管线编码管径材质管线埋深
" + row[1] + "" + row[2] + diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 48ac35f..b3ae59c 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -187,7 +187,7 @@ if (tempDown != null) downLimit = Convert.ToDouble(tempDown); if (upLimit == null && downLimit == null) continue;//空行过滤 //获取符合条件的管线 - FeaturesClassfyResult result = service.GetPipesInfoByValueSection(polygon, layer, downLimit, upLimit, "管径_毫米"); + FeaturesClassfyResult result = service.GetPipesInfoByValueSection(polygon, layer, downLimit, upLimit, "管径"); DataGridViewRow row = new DataGridViewRow(); int index = dataGridViewX1.Rows.Add(row); row = dataGridViewX1.Rows[index]; diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 66ffda3..b08ccc4 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -90,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -238,6 +239,15 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); @@ -337,15 +347,6 @@ this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -517,7 +518,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -528,6 +528,7 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); @@ -536,7 +537,6 @@ this.ribbonPanel12.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -956,6 +956,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2152,6 +2164,135 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar3); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + 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; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + 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.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.buttonItemPasswordReset}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 1; + // + // + // + 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; + // + // btn_user_info + // + this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // buttonItemPasswordReset + // + this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); + this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; + this.buttonItemPasswordReset.SubItemsExpandWidth = 14; + this.buttonItemPasswordReset.Text = "重置密码"; + this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -3392,135 +3533,6 @@ this.buttonItem14.Text = "导出施工图"; this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar3); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); - // - // - // - 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; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - 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.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.buttonItemPasswordReset}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 1; - // - // - // - 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; - // - // btn_user_info - // - this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // buttonItemPasswordReset - // - this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); - this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; - this.buttonItemPasswordReset.SubItemsExpandWidth = 14; - this.buttonItemPasswordReset.Text = "重置密码"; - this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -4458,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(42664, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(43258, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4552,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(42663, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(43257, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5738,18 +5750,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5792,6 +5792,7 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); @@ -5800,7 +5801,6 @@ this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index b7b0658..5cd6753 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index b127fe3..8fd1268 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -143,9 +143,9 @@ for (int j = 0; j < feats.Length; j++) { - if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径_毫米"))) + if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径"))) { - lstDiameter.Add(feats[j].GetFieldAsFloat("管径_毫米")); + lstDiameter.Add(feats[j].GetFieldAsFloat("管径")); } } lstDiameter.Sort(); @@ -157,7 +157,7 @@ int ncount = 0; for (int j = 0; j < feats.Length; j++) { - if (Math.Abs(feats[j].GetFieldAsFloat("管径_毫米") - diameter) > 0.00001) continue; + if (Math.Abs(feats[j].GetFieldAsFloat("管径") - diameter) > 0.00001) continue; GSOGeoPolyline3D line = feats[j].Geometry as GSOGeoPolyline3D; if (line == null) continue; double length = line.GetSpaceLength(true, 6378137); diff --git a/Forms/FrmGongShuiAttribute.cs b/Forms/FrmGongShuiAttribute.cs index 0afd212..a31681c 100644 --- a/Forms/FrmGongShuiAttribute.cs +++ b/Forms/FrmGongShuiAttribute.cs @@ -128,7 +128,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 8da8941..41bee50 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex >0) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index 5f441d6..adf7846 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -219,7 +219,7 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + cmbRadius.SelectedItem = "管径"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; } diff --git a/Forms/FrmRanQiAttribute.cs b/Forms/FrmRanQiAttribute.cs index e069469..a8953db 100644 --- a/Forms/FrmRanQiAttribute.cs +++ b/Forms/FrmRanQiAttribute.cs @@ -199,7 +199,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaiShe.SelectedIndex > 0) { diff --git a/Forms/FrmTongXunAttribute.cs b/Forms/FrmTongXunAttribute.cs index 79a71ed..a34cb0e 100644 --- a/Forms/FrmTongXunAttribute.cs +++ b/Forms/FrmTongXunAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index 6595ee9..8a3df4a 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -169,11 +169,11 @@ // m_InitDataGridViewX1(table,strLable,comboBoxEx1.Text,true); // } PaginationUtil.ResetPagination(); - int total = PaginationUtil.CountSql(comboBoxEx1.Text, "管径_毫米",mathT, textBoxX2.Text, textBoxX1.Text); + int total = PaginationUtil.CountSql(comboBoxEx1.Text, "管径",mathT, textBoxX2.Text, textBoxX1.Text); if (total > 0) { string strLable = comboBoxEx1.Text + "共有:" + total + "条"; - string sql = PaginationUtil.GetQuerySql(globeControl1, comboBoxEx1.Text, "管径_毫米",mathT, textBoxX2.Text, textBoxX1.Text); + string sql = PaginationUtil.GetQuerySql(globeControl1, comboBoxEx1.Text, "管径",mathT, textBoxX2.Text, textBoxX1.Text); PaginationUtil pagination = PaginationUtil.InitPagination(sql, total, _pageControl, m_InitDataGridViewX1, strLable, comboBoxEx1.Text); pagination.FillDataGridView(); } diff --git a/FrmHDMAnalysis3.cs b/FrmHDMAnalysis3.cs index 9d9b606..534012b 100644 --- a/FrmHDMAnalysis3.cs +++ b/FrmHDMAnalysis3.cs @@ -45,7 +45,7 @@ table.Columns.Add("编号", typeof(string)); table.Columns.Add("管线类型", typeof(string)); table.Columns.Add("管线编码", typeof(string)); - table.Columns.Add("管径_毫米", typeof(string)); + table.Columns.Add("管径", typeof(string)); table.Columns.Add("材质", typeof(string)); table.Columns.Add("管线埋深", typeof(string)); @@ -72,7 +72,7 @@ string pipeType = feature.Dataset == null ? "" : feature.Dataset.Caption; string number = Convert.ToString(i + 1); string material = feature.GetFieldAsString("材质"); - string diameter = feature.GetFieldAsString("管径_毫米"); + string diameter = feature.GetFieldAsString("管径"); table.Rows.Add(number, pipeType, feature.Name, diameter, material, Convert.ToDecimal(coor.Z).ToString("f2")); chart1.Series["管线"].Points[i].LegendText = number; if (feature.Geometry.Style.GetType() == typeof(GSOPipeLineStyle3D)) @@ -87,7 +87,7 @@ chart1.Series["管线"].Points[i].MarkerBorderWidth = 3; //边框的宽度 chart1.Series["管线"].Points[i].MarkerColor = Color.Transparent; - chart1.Series["管线"].Points[i].MarkerSize = Convert.ToInt32(Math.Floor((feature.GetFieldAsDouble("管径_毫米") / 0.35 + + chart1.Series["管线"].Points[i].MarkerSize = Convert.ToInt32(Math.Floor((feature.GetFieldAsDouble("管径") / 0.35 + chart1.Series["管线"].Points[i].MarkerBorderWidth) / 100.0)); i++; } @@ -141,7 +141,7 @@ "#hor-minimalist-b tbody tr:hover td {" + "color:#000099;}" + "" + - "" + + "
管线类型管线编码管径_毫米
" + "" + "
管线类型管线编码管径材质管线埋深
" + row[1] + "" + row[2] + diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 48ac35f..b3ae59c 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -187,7 +187,7 @@ if (tempDown != null) downLimit = Convert.ToDouble(tempDown); if (upLimit == null && downLimit == null) continue;//空行过滤 //获取符合条件的管线 - FeaturesClassfyResult result = service.GetPipesInfoByValueSection(polygon, layer, downLimit, upLimit, "管径_毫米"); + FeaturesClassfyResult result = service.GetPipesInfoByValueSection(polygon, layer, downLimit, upLimit, "管径"); DataGridViewRow row = new DataGridViewRow(); int index = dataGridViewX1.Rows.Add(row); row = dataGridViewX1.Rows[index]; diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 66ffda3..b08ccc4 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -90,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -238,6 +239,15 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); @@ -337,15 +347,6 @@ this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -517,7 +518,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -528,6 +528,7 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); @@ -536,7 +537,6 @@ this.ribbonPanel12.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -956,6 +956,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2152,6 +2164,135 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar3); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + 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; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + 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.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.buttonItemPasswordReset}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 1; + // + // + // + 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; + // + // btn_user_info + // + this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // buttonItemPasswordReset + // + this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); + this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; + this.buttonItemPasswordReset.SubItemsExpandWidth = 14; + this.buttonItemPasswordReset.Text = "重置密码"; + this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -3392,135 +3533,6 @@ this.buttonItem14.Text = "导出施工图"; this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar3); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); - // - // - // - 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; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - 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.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.buttonItemPasswordReset}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 1; - // - // - // - 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; - // - // btn_user_info - // - this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // buttonItemPasswordReset - // - this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); - this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; - this.buttonItemPasswordReset.SubItemsExpandWidth = 14; - this.buttonItemPasswordReset.Text = "重置密码"; - this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -4458,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(42664, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(43258, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4552,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(42663, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(43257, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5738,18 +5750,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5792,6 +5792,7 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); @@ -5800,7 +5801,6 @@ this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); diff --git a/MarkInfo.cs b/MarkInfo.cs index c762669..bbb15ac 100644 --- a/MarkInfo.cs +++ b/MarkInfo.cs @@ -228,7 +228,7 @@ centerPoint.Y = point3d.Y; centerPoint.Z = point3d.Z; - String desc0 = "管径：" + resFeature.GetFieldAsFloat("管径_毫米") + "毫米"; + String desc0 = "管径：" + resFeature.GetFieldAsFloat("管径") + "毫米"; MarkInfo markInfo0 = new MarkInfo(); markInfo0.Desc = desc0; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index b7b0658..5cd6753 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureStatisticsService.cs b/FeatureStatisticsService.cs index b127fe3..8fd1268 100644 --- a/FeatureStatisticsService.cs +++ b/FeatureStatisticsService.cs @@ -143,9 +143,9 @@ for (int j = 0; j < feats.Length; j++) { - if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径_毫米"))) + if (!lstDiameter.Contains(feats[j].GetFieldAsFloat("管径"))) { - lstDiameter.Add(feats[j].GetFieldAsFloat("管径_毫米")); + lstDiameter.Add(feats[j].GetFieldAsFloat("管径")); } } lstDiameter.Sort(); @@ -157,7 +157,7 @@ int ncount = 0; for (int j = 0; j < feats.Length; j++) { - if (Math.Abs(feats[j].GetFieldAsFloat("管径_毫米") - diameter) > 0.00001) continue; + if (Math.Abs(feats[j].GetFieldAsFloat("管径") - diameter) > 0.00001) continue; GSOGeoPolyline3D line = feats[j].Geometry as GSOGeoPolyline3D; if (line == null) continue; double length = line.GetSpaceLength(true, 6378137); diff --git a/Forms/FrmGongShuiAttribute.cs b/Forms/FrmGongShuiAttribute.cs index 0afd212..a31681c 100644 --- a/Forms/FrmGongShuiAttribute.cs +++ b/Forms/FrmGongShuiAttribute.cs @@ -128,7 +128,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 8da8941..41bee50 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex >0) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index 5f441d6..adf7846 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -219,7 +219,7 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + cmbRadius.SelectedItem = "管径"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; } diff --git a/Forms/FrmRanQiAttribute.cs b/Forms/FrmRanQiAttribute.cs index e069469..a8953db 100644 --- a/Forms/FrmRanQiAttribute.cs +++ b/Forms/FrmRanQiAttribute.cs @@ -199,7 +199,7 @@ } if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaiShe.SelectedIndex > 0) { diff --git a/Forms/FrmTongXunAttribute.cs b/Forms/FrmTongXunAttribute.cs index 79a71ed..a34cb0e 100644 --- a/Forms/FrmTongXunAttribute.cs +++ b/Forms/FrmTongXunAttribute.cs @@ -111,7 +111,7 @@ if (txtGuanJing.Text != "") { - feat.SetValue("管径_毫米", Convert.ToInt32(txtGuanJing.Text)); + feat.SetValue("管径", Convert.ToInt32(txtGuanJing.Text)); } if (combMaterial.SelectedIndex>0) { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index 6595ee9..8a3df4a 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -169,11 +169,11 @@ // m_InitDataGridViewX1(table,strLable,comboBoxEx1.Text,true); // } PaginationUtil.ResetPagination(); - int total = PaginationUtil.CountSql(comboBoxEx1.Text, "管径_毫米",mathT, textBoxX2.Text, textBoxX1.Text); + int total = PaginationUtil.CountSql(comboBoxEx1.Text, "管径",mathT, textBoxX2.Text, textBoxX1.Text); if (total > 0) { string strLable = comboBoxEx1.Text + "共有:" + total + "条"; - string sql = PaginationUtil.GetQuerySql(globeControl1, comboBoxEx1.Text, "管径_毫米",mathT, textBoxX2.Text, textBoxX1.Text); + string sql = PaginationUtil.GetQuerySql(globeControl1, comboBoxEx1.Text, "管径",mathT, textBoxX2.Text, textBoxX1.Text); PaginationUtil pagination = PaginationUtil.InitPagination(sql, total, _pageControl, m_InitDataGridViewX1, strLable, comboBoxEx1.Text); pagination.FillDataGridView(); } diff --git a/FrmHDMAnalysis3.cs b/FrmHDMAnalysis3.cs index 9d9b606..534012b 100644 --- a/FrmHDMAnalysis3.cs +++ b/FrmHDMAnalysis3.cs @@ -45,7 +45,7 @@ table.Columns.Add("编号", typeof(string)); table.Columns.Add("管线类型", typeof(string)); table.Columns.Add("管线编码", typeof(string)); - table.Columns.Add("管径_毫米", typeof(string)); + table.Columns.Add("管径", typeof(string)); table.Columns.Add("材质", typeof(string)); table.Columns.Add("管线埋深", typeof(string)); @@ -72,7 +72,7 @@ string pipeType = feature.Dataset == null ? "" : feature.Dataset.Caption; string number = Convert.ToString(i + 1); string material = feature.GetFieldAsString("材质"); - string diameter = feature.GetFieldAsString("管径_毫米"); + string diameter = feature.GetFieldAsString("管径"); table.Rows.Add(number, pipeType, feature.Name, diameter, material, Convert.ToDecimal(coor.Z).ToString("f2")); chart1.Series["管线"].Points[i].LegendText = number; if (feature.Geometry.Style.GetType() == typeof(GSOPipeLineStyle3D)) @@ -87,7 +87,7 @@ chart1.Series["管线"].Points[i].MarkerBorderWidth = 3; //边框的宽度 chart1.Series["管线"].Points[i].MarkerColor = Color.Transparent; - chart1.Series["管线"].Points[i].MarkerSize = Convert.ToInt32(Math.Floor((feature.GetFieldAsDouble("管径_毫米") / 0.35 + + chart1.Series["管线"].Points[i].MarkerSize = Convert.ToInt32(Math.Floor((feature.GetFieldAsDouble("管径") / 0.35 + chart1.Series["管线"].Points[i].MarkerBorderWidth) / 100.0)); i++; } @@ -141,7 +141,7 @@ "#hor-minimalist-b tbody tr:hover td {" + "color:#000099;}" + "" + - "" + + "
管线类型管线编码管径_毫米
" + "" + "
管线类型管线编码管径材质管线埋深
" + row[1] + "" + row[2] + diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 48ac35f..b3ae59c 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -187,7 +187,7 @@ if (tempDown != null) downLimit = Convert.ToDouble(tempDown); if (upLimit == null && downLimit == null) continue;//空行过滤 //获取符合条件的管线 - FeaturesClassfyResult result = service.GetPipesInfoByValueSection(polygon, layer, downLimit, upLimit, "管径_毫米"); + FeaturesClassfyResult result = service.GetPipesInfoByValueSection(polygon, layer, downLimit, upLimit, "管径"); DataGridViewRow row = new DataGridViewRow(); int index = dataGridViewX1.Rows.Add(row); row = dataGridViewX1.Rows[index]; diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 66ffda3..b08ccc4 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -90,6 +90,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -238,6 +239,15 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); @@ -337,15 +347,6 @@ this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -517,7 +518,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -528,6 +528,7 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); @@ -536,7 +537,6 @@ this.ribbonPanel12.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -956,6 +956,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2152,6 +2164,135 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar3); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + 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; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + 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.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.buttonItemPasswordReset}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 1; + // + // + // + 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; + // + // btn_user_info + // + this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // buttonItemPasswordReset + // + this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); + this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; + this.buttonItemPasswordReset.SubItemsExpandWidth = 14; + this.buttonItemPasswordReset.Text = "重置密码"; + this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -3392,135 +3533,6 @@ this.buttonItem14.Text = "导出施工图"; this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar3); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); - // - // - // - 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; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - 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.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.buttonItemPasswordReset}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 1; - // - // - // - 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; - // - // btn_user_info - // - this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // buttonItemPasswordReset - // - this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); - this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; - this.buttonItemPasswordReset.SubItemsExpandWidth = 14; - this.buttonItemPasswordReset.Text = "重置密码"; - this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -4458,7 +4470,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(42664, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(43258, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4552,7 +4564,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(42663, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(43257, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5738,18 +5750,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5792,6 +5792,7 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); @@ -5800,7 +5801,6 @@ this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); diff --git a/MarkInfo.cs b/MarkInfo.cs index c762669..bbb15ac 100644 --- a/MarkInfo.cs +++ b/MarkInfo.cs @@ -228,7 +228,7 @@ centerPoint.Y = point3d.Y; centerPoint.Z = point3d.Z; - String desc0 = "管径：" + resFeature.GetFieldAsFloat("管径_毫米") + "毫米"; + String desc0 = "管径：" + resFeature.GetFieldAsFloat("管径") + "毫米"; MarkInfo markInfo0 = new MarkInfo(); markInfo0.Desc = desc0; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 2e8580d..dca9f26 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -1,10 +1,10 @@  LocaSpace三维地下管线信息系统 - test - szhtdb2 - 192.168.0.101 - test + fuzhou + szgh + 127.0.0.1 + fuzhou 192.168.0.203 1500 http://127.0.0.1/images/