diff --git a/MainFrm.cs b/MainFrm.cs index 9301949..651ca49 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -171,7 +171,7 @@ { MenuSet(); } - + } public void MenuSet() @@ -474,11 +474,11 @@ //加载两个地球数据 private void loadData() { - //Thread t1 = new Thread(doLoadDataForGlobalControl); - //t1.IsBackground = true; - //t1.Name = "doLoadDataForGlobalControl"; - //t1.Start(); - doLoadDataForGlobalControl(); + Thread t1 = new Thread(doLoadDataForGlobalControl); + t1.IsBackground = true; + t1.Name = "doLoadDataForGlobalControl"; + t1.Start(); + //doLoadDataForGlobalControl(); } private void connectServer() @@ -497,10 +497,10 @@ { try { - FrmLoading frmLoading = new FrmLoading(); - frmLoading.Show(); + //FrmLoading frmLoading = new FrmLoading(); + //frmLoading.Show(); - frmLoading.Text = "加载lrc文件"; + //frmLoading.Text = "加载lrc文件"; String lrcMap = Application.StartupPath + "\\lrc\\tianditu.lrc"; String lrcBz = Application.StartupPath + "\\lrc\\biaozhu.lrc"; String lrcDl = Application.StartupPath + "\\lrc\\daolu.lrc"; @@ -517,7 +517,7 @@ globeControl1.Globe.Layers.MoveDown(10000); //加载实测管线数据 - frmLoading.Text = "加载实测管线数据"; + //frmLoading.Text = "加载实测管线数据"; Debug.WriteLine("加载实测管线数据"); Utility.dataSource = globeControl1.Globe.DataManager.OpenOracleDataSource( @@ -534,8 +534,8 @@ if (dataset != null && Utility.layerNameSet.Contains(dataset.Caption)) { dataset.Caption = dataset.Name; - Debug.WriteLine(dataset.Name); - frmLoading.Text = "加载"+ dataset.Name; + //frmLoading.Text = "加载" + dataset.Name; + Debug.WriteLine("加载" + dataset.Name); globeControl1.Globe.Layers.Add(dataset); } } @@ -548,7 +548,7 @@ //隐藏红线图层 GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (layer != null) layer.Visible = false; - frmLoading.Text = "加载规划数据"; + //frmLoading.Text = "加载规划数据"; Debug.WriteLine("加载规划数据"); //globleControl1中加载规划数据 GSODataSource ghDS = @@ -563,8 +563,8 @@ { dataset.Caption = dataset.Name; globeControl1.Globe.Layers.Add(dataset); - Debug.WriteLine(dataset.Name); - frmLoading.Text = "加载" + dataset.Name; + //frmLoading.Text = "加载" + dataset.Name; + Debug.WriteLine("加载" + dataset.Name); globeControl1.Globe.Layers[0].Visible = false; } } @@ -583,8 +583,8 @@ Utility.layerNameSet.Contains(dataset.Caption)) { dataset.Caption = dataset.Name; - Debug.WriteLine(dataset.Name); - frmLoading.Text = "加载" + dataset.Name; + //frmLoading.Text = "加载" + dataset.Name; + Debug.WriteLine("加载" + dataset.Name); globeControl1.Globe.Layers.Add(dataset); globeControl1.Globe.Layers[0].Visible = false; @@ -597,7 +597,7 @@ { connectServer(); }); - frmLoading.Close(); + //frmLoading.Close(); } catch (Exception ex) { @@ -683,7 +683,7 @@ x = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[0]); y = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[1]); z = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[2]); - + jumpToCameraState(x, y, z); } @@ -694,7 +694,7 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - for (int i=0;i private void 删除ToolStripMenuItem2_Click(object sender, EventArgs e) { + Debug.WriteLine("删除ToolStripMenuItem2_Click"); TreeNode node = layerTree.SelectedNode; if (node == null || node.Parent == null) return; if (node.Parent.Text.Trim() == "临时图层") @@ -1155,21 +1156,21 @@ switch (trackflag) { case "valvequery": - FrmValveStatistics frm = new FrmValveStatistics(globeControl1, polygon, InitDataGridViewX1,pageControl); + FrmValveStatistics frm = new FrmValveStatistics(globeControl1, polygon, InitDataGridViewX1, pageControl); frm.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; break; case "PipelineDistanceStatistics": - FrmAllPipelineStatis frm1 = new FrmAllPipelineStatis(globeControl1, polygon, InitDataGridViewX1, Utility.m_PipelineLayerNames,pageControl); + FrmAllPipelineStatis frm1 = new FrmAllPipelineStatis(globeControl1, polygon, InitDataGridViewX1, Utility.m_PipelineLayerNames, pageControl); frm1.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; break; case "PipelineSpatialQuery": - FrmAllPipelineStatis.ShowForm(globeControl1, polygon, InitDataGridViewX1, Utility.m_PipelineLayerNames,pageControl); + FrmAllPipelineStatis.ShowForm(globeControl1, polygon, InitDataGridViewX1, Utility.m_PipelineLayerNames, pageControl); globeControl1.Globe.ClearAnalysis(); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -1198,9 +1199,9 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; break; case "pipeStatistic"://管径分类 - trackflag = null; - FrmpipeDiametergather.ShowForm(globeControl1, Utility.m_PipelineLayerNames, polygon); - globeControl1.Globe.Action = EnumAction3D.ActionNull; + trackflag = null; + FrmpipeDiametergather.ShowForm(globeControl1, Utility.m_PipelineLayerNames, polygon); + globeControl1.Globe.Action = EnumAction3D.ActionNull; break; case "pipePointStatistic"://管点分类 trackflag = null; @@ -1283,6 +1284,7 @@ /// void globeControl1_MouseDoubleClick(object sender, MouseEventArgs e) { + Debug.WriteLine("globeControl1_MouseDoubleClick"); if (e.Button != MouseButtons.Left) return; if (enumDesignMode == EnumDesignMode.AddPipe @@ -1382,6 +1384,7 @@ /// void globeControl1_MouseClick(object sender, MouseEventArgs e) { + Debug.WriteLine("globeControl1_MouseClick"); if (e.Button == MouseButtons.Left) { if (globeControl1.Globe.Action == EnumAction3D.VisibilityAnalysis) @@ -1714,11 +1717,11 @@ { string[] param = { "," }; string[] fieldNames = queryFields.Split(param, StringSplitOptions.RemoveEmptyEntries); - for (int j = 0; j < fieldNames.Length; ) + for (int j = 0; j < fieldNames.Length;) { - int count = 0; - string tmpStr = ""; - while (count<2&&j
" + value + "
"; - count ++; + count++; } j++; } @@ -1773,7 +1776,7 @@ { GSOLayer gsoLayer = node.Tag as GSOLayer; if (gsoLayer != null && gsoLayer.IsDestLayerFeatureAdd()) return node; - } + } } } else @@ -1890,7 +1893,7 @@ } void changeOpaque(int opaqueValue) - { + { globeControl1.Globe.GroundOpaque = 100 - opaqueValue; GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(Utility.roadLayerName);//("180fd"); if (layer != null) layer.Opaque = 100 - opaqueValue; @@ -2483,7 +2486,7 @@ GSOFeature selectedFeature = dataGridViewX2.Rows[i].Tag as GSOFeature; if (selectedFeature == null) continue; selectState = 1; - VerticalDistanceAnalysis(selectedFeature,Utility.m_PipelineLayerNames,dJingJuBiaoZhun); + VerticalDistanceAnalysis(selectedFeature, Utility.m_PipelineLayerNames, dJingJuBiaoZhun); } } else if (checkBoxX2.Checked) // 选择图层 @@ -2771,7 +2774,7 @@ MessageBox.Show("没有不符合净距标准的管线！", "提示"); } - for (int i = 0; i < Utility.m_PipelineLayerNames.Count&&featCount.Count>0; i++) + for (int i = 0; i < Utility.m_PipelineLayerNames.Count && featCount.Count > 0; i++) { if (featCount.ContainsKey(Utility.m_PipelineLayerNames[i]) && featLenth.ContainsKey(Utility.m_PipelineLayerNames[i])) @@ -2794,9 +2797,9 @@ /// private void HorizontalDistanceAnalysis(GSOFeature selectedFeature, List _pipelineLayerNames, double dis) { - - Dictionary featureMap = DoublePanelAnalysis.HorizontalDistanceAnalysis(globeControl1,selectedFeature, - _pipelineLayerNames, dis); + + Dictionary featureMap = DoublePanelAnalysis.HorizontalDistanceAnalysis(globeControl1, selectedFeature, + _pipelineLayerNames, dis); if (featureMap == null) { selectState = 0; @@ -2895,8 +2898,8 @@ GSOFeature selectedFeature = dataGridViewX4.Rows[i].Tag as GSOFeature; if (selectedFeature == null) continue; selectState = 1; -// VerticalDistanceAnalysis("碰撞分析", selectedFeature, Utility.m_PipelineLayerNames, 0, 0.0); - CollisionAnalysis(selectedFeature,Utility.m_PipelineLayerNames); + // VerticalDistanceAnalysis("碰撞分析", selectedFeature, Utility.m_PipelineLayerNames, 0, 0.0); + CollisionAnalysis(selectedFeature, Utility.m_PipelineLayerNames); } } else if (checkBoxX4.Checked) // 选择图层 @@ -2910,7 +2913,7 @@ { selectState = 1; CollisionAnalysis(feats[i], Utility.m_PipelineLayerNames); -// VerticalDistanceAnalysis("碰撞分析", feats[i], Utility.m_PipelineLayerNames, 0, 0.0); + // VerticalDistanceAnalysis("碰撞分析", feats[i], Utility.m_PipelineLayerNames, 0, 0.0); } } @@ -3062,7 +3065,7 @@ { GSOFeature rowFeature = dataGridViewX6.Rows[i].Tag as GSOFeature; if (rowFeature == null) continue; - string featureName = isFeatureContainsBianhao(rowFeature) ? rowFeature.GetValue(featureIDFieldName).ToString() : rowFeature.Name; + string featureName = isFeatureContainsBianhao(rowFeature) ? rowFeature.GetValue(featureIDFieldName).ToString() : rowFeature.Name; GSOGeoPolyline3D line = rowFeature.Geometry as GSOGeoPolyline3D; if (line == null) @@ -3102,7 +3105,7 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(comboBoxEx3.SelectedItem.ToString()); GSOFeatureLayer flayer = layer as GSOFeatureLayer; - if (flayer == null)return; + if (flayer == null) return; GSOFeatures feats = flayer.GetAllFeatures(); for (int i = 0; i < feats.Length; i++) { @@ -3443,7 +3446,7 @@ { MessageBox.Show("表格内容为空！", "提示"); } - } + } /// /// 碰撞分析功能界面中 选择管线复选框 选中状态改变事件处理 /// @@ -3504,7 +3507,7 @@ dataGridViewX4.Rows.Clear(); dataGridViewX5.Rows.Clear(); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(comboBoxEx2.SelectedItem.ToString()); - + GSOFeatureLayer flayer = layer as GSOFeatureLayer; if (flayer == null) return; GSOFeatures feats = flayer.GetAllFeatures(); @@ -3686,7 +3689,7 @@ if (selectedFeature != null) { selectState = 1; -// VerticalDistanceAnalysis("间距分析", selectedFeature, Utility.m_PipelineLayerNames, dVerticalJingJuBiaoZhun, dHorizontalJingJuBiaoZhun);//分析 + // VerticalDistanceAnalysis("间距分析", selectedFeature, Utility.m_PipelineLayerNames, dVerticalJingJuBiaoZhun, dHorizontalJingJuBiaoZhun);//分析 } } } @@ -3717,7 +3720,7 @@ for (int i = 0; i < feats.Length; i++) { selectState = 1; -// VerticalDistanceAnalysis("间距分析", feats[i], Utility.m_PipelineLayerNames, dVerticalJingJuBiaoZhun, dHorizontalJingJuBiaoZhun);//分析 + // VerticalDistanceAnalysis("间距分析", feats[i], Utility.m_PipelineLayerNames, dVerticalJingJuBiaoZhun, dHorizontalJingJuBiaoZhun);//分析 } } if (featCount.Count > 0) @@ -4057,7 +4060,7 @@ private GSOFeatures getSelectedFeatures() { GSOFeatures feats = new GSOFeatures(); - + if (globeControl1.Globe.SelObjectCount == 0) { feats = null; @@ -4106,7 +4109,7 @@ //日志记录 LogManager.saveLog(Utility.userName, buttonItemSH2.Text); GSOFeatures feats = getSelectedFeatures(); - + if (feats == null) { MessageBox.Show("请选择管段！", "提示"); @@ -4149,7 +4152,7 @@ MessageBox.Show("请选择管段！", "提示"); return; } - FormVer frm = new FormVer(feats, globeControl1,layerTemp); + FormVer frm = new FormVer(feats, globeControl1, layerTemp); frm.Show(); } @@ -4199,14 +4202,14 @@ objRes = layer; if (layer == null) return objRes; CheckDatasetGeoReference(layer.Dataset, strDataPath); -// CheckDatasetGeoReference(layer.Dataset, strDataPath); + // CheckDatasetGeoReference(layer.Dataset, strDataPath); TreeNode node = new TreeNode(); node.Tag = layer; node.Text = layer.Dataset.Caption; node.ImageIndex = 0; node.SelectedImageIndex = 0; node.Checked = layer.Visible; - layerManagerNode.Nodes.Insert(0, node); + layerManagerNode.Nodes.Insert(0, node); newlayername = layer.Caption; } else @@ -4231,7 +4234,7 @@ } return objRes; } - + /// /// 根据指定图层创建图层节点并将节点添加到图层管理节点的子节点集合中 /// @@ -4240,17 +4243,17 @@ { if (layer == null) return; CheckDatasetGeoReference(layer.Dataset, ""); - TreeUtils.AddNodeToManagerNode(layerManagerNode,layer); -// TreeNode node = new TreeNode(); -// node.Tag = layer; -// node.Text = layer.Dataset.Caption; -// node.ImageIndex = 0; -// node.SelectedImageIndex = 0; -// node.Checked = layer.Visible; -// -// if (layerManagerNode.Nodes.Contains(node)) return; -// layerManagerNode.Nodes.Insert(0, node); -// layerManagerNode.Expand(); + TreeUtils.AddNodeToManagerNode(layerManagerNode, layer); + // TreeNode node = new TreeNode(); + // node.Tag = layer; + // node.Text = layer.Dataset.Caption; + // node.ImageIndex = 0; + // node.SelectedImageIndex = 0; + // node.Checked = layer.Visible; + // + // if (layerManagerNode.Nodes.Contains(node)) return; + // layerManagerNode.Nodes.Insert(0, node); + // layerManagerNode.Expand(); } /// @@ -4260,8 +4263,8 @@ /// private void layerMarkerTree_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) { - if (e.Button != MouseButtons.Right||e.Node.Parent==null) return; - if (e.Node.Parent.Text.Equals("标注管理") ) + if (e.Button != MouseButtons.Right || e.Node.Parent == null) return; + if (e.Node.Parent.Text.Equals("标注管理")) { layerMarkerTree.SelectedNode = e.Node; contextMenuStrip2.Show(layerMarkerTree, e.X, e.Y); @@ -4275,7 +4278,7 @@ } else { - if (!(e.Node.Tag is GSOFeature)||e.Node.Parent.Parent==null) return; + if (!(e.Node.Tag is GSOFeature) || e.Node.Parent.Parent == null) return; if (e.Node.Parent.Parent.Text.Equals("标注管理")) { layerMarkerTree.SelectedNode = e.Node; @@ -4308,11 +4311,11 @@ // 只将类型为内存数据集的图层列出，如果是其它类型的数据集可能数据量太大，没发显示在树控件中 if (layer.Dataset is GSOFeatureDataset) { - TreeUtils.AddNodesMatchFeatures(node,layer.GetAllFeatures()); + TreeUtils.AddNodesMatchFeatures(node, layer.GetAllFeatures()); } } } - + /// /// 标注管理、传感器管理 图层目录树的右键菜单中的 移除所有 菜单 /// @@ -4338,10 +4341,10 @@ if (e.Action != TreeViewAction.Unknown) { //wxl优化标注管理树形结构 - TreeUtils.TreeNodeCheckedChange(globeControl1,e.Node); + TreeUtils.TreeNodeCheckedChange(globeControl1, e.Node); } } - + /// /// 标注管理、传感器管理 目录树中的feature节点的右键菜单中的 删除 菜单 /// @@ -4363,6 +4366,7 @@ /// private void buttonItem127_Click_2(object sender, EventArgs e) { + Debug.WriteLine("一键审核-打开数据"); LogManager.saveLog(Utility.userName, "打开数据"); try @@ -4387,7 +4391,7 @@ { //addNodeToLayerManagerNode(frm.rukuLayer); - TreeUtils.AddNodeToManagerNode(layerManagerNode,frm.rukuLayer); + TreeUtils.AddNodeToManagerNode(layerManagerNode, frm.rukuLayer); } } catch (Exception ex) @@ -4404,7 +4408,7 @@ private void buttonItem130_Click_1(object sender, EventArgs e) { LogManager.saveLog(Utility.userName, "导出审核图"); - + Point pt1 = new Point(Convert.ToInt32(0), Convert.ToInt32(0)); Point pt2 = new Point(Convert.ToInt32(panelEx5.Width), Convert.ToInt32(panelEx5.Height)); @@ -4448,6 +4452,7 @@ /// private void buttonItem128_Click(object sender, EventArgs e) { + Debug.WriteLine("buttonItem128_Click"); LogManager.saveLog(Utility.userName, buttonItem128.Text); if (boolfrmShResult) {//关闭等待窗口，否则会一直存在下去 @@ -4707,13 +4712,13 @@ /// /// private void 关键字查询ToolStripMenuItem_Click(object sender, EventArgs e) - { + { LogManager.saveLog(Utility.userName, "关键字查询"); FrmKeywordQuery.ShowForm(globeControl1, Utility.m_PipelineLayerNames, InitDataGridViewX1); } - - + + /// /// 编号查询 /// @@ -4728,7 +4733,7 @@ pageControl.nextpage = nextpage; pageControl.prepage = prepage; pageControl.pageinfo = pageinfo; -// pageControl.toolStripFeatureLength = toolStripFeatureLength; + // pageControl.toolStripFeatureLength = toolStripFeatureLength; pageControl.toolStripNumbers = toolStripNumbers; FrmCodingQuery.ShowForm(globeControl1, Utility.m_PipelineLayerNames, InitDataGridViewX1, pageControl); } @@ -4789,7 +4794,7 @@ pageControl.nextpage = nextpage; pageControl.prepage = prepage; pageControl.pageinfo = pageinfo; - FrmMaterialSel.ShowForm(globeControl1, Utility.m_PipelineLayerNames, InitDataGridViewX1,pageControl); + FrmMaterialSel.ShowForm(globeControl1, Utility.m_PipelineLayerNames, InitDataGridViewX1, pageControl); } /// /// 基本查询 @@ -4913,7 +4918,7 @@ pageControl.nextpage = nextpage; pageControl.prepage = prepage; pageControl.pageinfo = pageinfo; - FrmAllPipelineStatis frm = new FrmAllPipelineStatis(globeControl1, null, InitDataGridViewX1, Utility.m_PipelineLayerNames,pageControl); + FrmAllPipelineStatis frm = new FrmAllPipelineStatis(globeControl1, null, InitDataGridViewX1, Utility.m_PipelineLayerNames, pageControl); frm.Show(this); } /// @@ -4975,7 +4980,7 @@ pageControl.nextpage = nextpage; pageControl.prepage = prepage; pageControl.pageinfo = pageinfo; - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(globeControl1, null, InitDataGridViewX1,pageControl); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(globeControl1, null, InitDataGridViewX1, pageControl); frm.Show(this); } /// @@ -5105,7 +5110,7 @@ private void 附属物分类统计ToolStripMenuItem_Click(object sender, EventArgs e) { LogManager.saveLog(Utility.userName, "附属物分类汇总"); - + Debug.WriteLine("附属物分类统计全区域统计"); FrmAccessoriesgather.ShowForm(globeControl1, Utility.instrumenLayerNames, null); } /// @@ -6666,14 +6671,14 @@ globeControl1.Globe.GetSelectObject(i, out f, out layer); if (layer != null) globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); - bool result = FeatureTools.DeleteFeature(f); + bool result = FeatureTools.DeleteFeature(f); if (result) delSuccessCount++; globeControl1.Refresh(); - + } - MessageBox.Show("成功删除"+delSuccessCount+"个模型！", "提示"); + MessageBox.Show("成功删除" + delSuccessCount + "个模型！", "提示"); globeControl1.Globe.Action = EnumAction3D.ActionNull; } @@ -6683,7 +6688,9 @@ /// private void buttonItemHX2_Click(object sender, EventArgs e) { + Debug.WriteLine("红线审核按钮"); LogManager.saveLog(Utility.userName, buttonItemHX2.Text); + // 清空红线审核结果 RedLineAnalysisTool.redLineResultList.Clear(); GSOFeatures selectFeatures = new GSOFeatures(); @@ -6693,6 +6700,7 @@ MessageBox.Show("请选择地块红线", "提示"); return; } + // 选择红线 for (int i = 0; i < globeControl1.Globe.SelObjectCount; i++) { GSOFeature feature = null; @@ -6701,9 +6709,11 @@ } try { + // 分析 RedLineAnalysisTool.redLineResultList = RedLineAnalysisTool.Anaylysis(selectFeatures, Utility.m_PipelineLayerNames, globeControl1); + // 加入到显示表格中 if (RedLineAnalysisTool.redLineResultList == null || RedLineAnalysisTool.redLineResultList.Count != 0) addRedLineDataToDataGridView(RedLineAnalysisTool.redLineResultList, dataGridViewX1); else @@ -6716,9 +6726,21 @@ catch (Exception ex) { redSH = false; - LogHelper.Debug("",ex); + LogHelper.Debug("", ex); } } + + /// 红线管理 + /// + /// + /// + private void hongxianMange_Click(object sender, EventArgs e) + { + Debug.WriteLine("红线管理"); + LogManager.saveLog(Utility.userName, hongxianMange.Text); + FrmHongXianManage form = new FrmHongXianManage(globeControl1, layerTree); + form.ShowDialog(); + } void addRedLineDataToDataGridView(List dt, DataGridView dataGridView) { DataTable table = new DataTable(); @@ -6756,6 +6778,7 @@ /// private void toolStripDropDownButton3_Click(object sender, EventArgs e) { + // 红线审核导出 if (dataGridViewX1.Rows.Count == 0) { MessageBox.Show("表格内容为空！", "提示"); @@ -6834,6 +6857,7 @@ /// private void buttonItemHX1_Click(object sender, EventArgs e) { + Debug.WriteLine("buttonItemHX1_Click"); LogManager.saveLog(Utility.userName, buttonItemHX1.Text); GSODataSource dataSpace = globeControl1.Globe.DataManager.OpenOracleDataSource(Utility.DBServer.Trim() + "/" + Utility.dbdatabase.Trim(), "", "", Utility.userID, Utility.DBPassword); @@ -6903,8 +6927,10 @@ } IModelBuilder modelBuilder = new RedLineBuilder(); - - modelBuilder.batchInsert(dataSpace, redDt, redFeatures, Color.Red); + string fileName = ""; + string[] temp = strDataPath.Split('\\'); + fileName = temp[temp.Length - 1].Split('.')[0]; + modelBuilder.batchInsert(dataSpace, redDt, redFeatures, Color.Red, fileName); } #endregion @@ -7203,6 +7229,7 @@ /// private void buttonItemGHRK_Click(object sender, EventArgs e) { + Debug.WriteLine("规划数据入库"); LogManager.saveLog(Utility.userName, buttonItemGHRK.Text); FrmGHRK ghrk = new FrmGHRK(globeControl1, layerManagerNode); @@ -7257,7 +7284,7 @@ frm.ShowDialog(); } } - + //文档管理 操作 private void btn_document_info_Click(object sender, EventArgs e) { @@ -7351,7 +7378,7 @@ newlayer.AddFeature(feature); } newlayer.Save(); - newlayer.SaveAs(dlg.FileName); + newlayer.SaveAs(dlg.FileName); newlayer.Dataset.DataSource.RemoveDataset(newlayer.Dataset); globeControl1.Globe.Layers.Remove(newlayer); MessageBox.Show("导出CAD完成！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); @@ -7470,7 +7497,7 @@ } private void pictureBox1_Paint(object sender, PaintEventArgs e) - { + { string welcomeUser = "欢迎您:" + Utility.userName; e.Graphics.DrawString(welcomeUser, new Font("宋体", 12), new SolidBrush(Color.Black), Width - 180, 50); } diff --git a/MainFrm.cs b/MainFrm.cs index 9301949..651ca49 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -171,7 +171,7 @@ { MenuSet(); } - + } public void MenuSet() @@ -474,11 +474,11 @@ //加载两个地球数据 private void loadData() { - //Thread t1 = new Thread(doLoadDataForGlobalControl); - //t1.IsBackground = true; - //t1.Name = "doLoadDataForGlobalControl"; - //t1.Start(); - doLoadDataForGlobalControl(); + Thread t1 = new Thread(doLoadDataForGlobalControl); + t1.IsBackground = true; + t1.Name = "doLoadDataForGlobalControl"; + t1.Start(); + //doLoadDataForGlobalControl(); } private void connectServer() @@ -497,10 +497,10 @@ { try { - FrmLoading frmLoading = new FrmLoading(); - frmLoading.Show(); + //FrmLoading frmLoading = new FrmLoading(); + //frmLoading.Show(); - frmLoading.Text = "加载lrc文件"; + //frmLoading.Text = "加载lrc文件"; String lrcMap = Application.StartupPath + "\\lrc\\tianditu.lrc"; String lrcBz = Application.StartupPath + "\\lrc\\biaozhu.lrc"; String lrcDl = Application.StartupPath + "\\lrc\\daolu.lrc"; @@ -517,7 +517,7 @@ globeControl1.Globe.Layers.MoveDown(10000); //加载实测管线数据 - frmLoading.Text = "加载实测管线数据"; + //frmLoading.Text = "加载实测管线数据"; Debug.WriteLine("加载实测管线数据"); Utility.dataSource = globeControl1.Globe.DataManager.OpenOracleDataSource( @@ -534,8 +534,8 @@ if (dataset != null && Utility.layerNameSet.Contains(dataset.Caption)) { dataset.Caption = dataset.Name; - Debug.WriteLine(dataset.Name); - frmLoading.Text = "加载"+ dataset.Name; + //frmLoading.Text = "加载" + dataset.Name; + Debug.WriteLine("加载" + dataset.Name); globeControl1.Globe.Layers.Add(dataset); } } @@ -548,7 +548,7 @@ //隐藏红线图层 GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("红线"); if (layer != null) layer.Visible = false; - frmLoading.Text = "加载规划数据"; + //frmLoading.Text = "加载规划数据"; Debug.WriteLine("加载规划数据"); //globleControl1中加载规划数据 GSODataSource ghDS = @@ -563,8 +563,8 @@ { dataset.Caption = dataset.Name; globeControl1.Globe.Layers.Add(dataset); - Debug.WriteLine(dataset.Name); - frmLoading.Text = "加载" + dataset.Name; + //frmLoading.Text = "加载" + dataset.Name; + Debug.WriteLine("加载" + dataset.Name); globeControl1.Globe.Layers[0].Visible = false; } } @@ -583,8 +583,8 @@ Utility.layerNameSet.Contains(dataset.Caption)) { dataset.Caption = dataset.Name; - Debug.WriteLine(dataset.Name); - frmLoading.Text = "加载" + dataset.Name; + //frmLoading.Text = "加载" + dataset.Name; + Debug.WriteLine("加载" + dataset.Name); globeControl1.Globe.Layers.Add(dataset); globeControl1.Globe.Layers[0].Visible = false; @@ -597,7 +597,7 @@ { connectServer(); }); - frmLoading.Close(); + //frmLoading.Close(); } catch (Exception ex) { @@ -683,7 +683,7 @@ x = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[0]); y = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[1]); z = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[2]); - + jumpToCameraState(x, y, z); } @@ -694,7 +694,7 @@ if (e.Layer == null || !e.Layer.Caption.Equals(Utility.roadLayerName)) return; foreach (TreeNode layerTreeNode in layerTree.Nodes) { - for (int i=0;i private void 删除ToolStripMenuItem2_Click(object sender, EventArgs e) { + Debug.WriteLine("删除ToolStripMenuItem2_Click"); TreeNode node = layerTree.SelectedNode; if (node == null || node.Parent == null) return; if (node.Parent.Text.Trim() == "临时图层") @@ -1155,21 +1156,21 @@ switch (trackflag) { case "valvequery": - FrmValveStatistics frm = new FrmValveStatistics(globeControl1, polygon, InitDataGridViewX1,pageControl); + FrmValveStatistics frm = new FrmValveStatistics(globeControl1, polygon, InitDataGridViewX1, pageControl); frm.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; break; case "PipelineDistanceStatistics": - FrmAllPipelineStatis frm1 = new FrmAllPipelineStatis(globeControl1, polygon, InitDataGridViewX1, Utility.m_PipelineLayerNames,pageControl); + FrmAllPipelineStatis frm1 = new FrmAllPipelineStatis(globeControl1, polygon, InitDataGridViewX1, Utility.m_PipelineLayerNames, pageControl); frm1.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; break; case "PipelineSpatialQuery": - FrmAllPipelineStatis.ShowForm(globeControl1, polygon, InitDataGridViewX1, Utility.m_PipelineLayerNames,pageControl); + FrmAllPipelineStatis.ShowForm(globeControl1, polygon, InitDataGridViewX1, Utility.m_PipelineLayerNames, pageControl); globeControl1.Globe.ClearAnalysis(); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -1198,9 +1199,9 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; break; case "pipeStatistic"://管径分类 - trackflag = null; - FrmpipeDiametergather.ShowForm(globeControl1, Utility.m_PipelineLayerNames, polygon); - globeControl1.Globe.Action = EnumAction3D.ActionNull; + trackflag = null; + FrmpipeDiametergather.ShowForm(globeControl1, Utility.m_PipelineLayerNames, polygon); + globeControl1.Globe.Action = EnumAction3D.ActionNull; break; case "pipePointStatistic"://管点分类 trackflag = null; @@ -1283,6 +1284,7 @@ /// void globeControl1_MouseDoubleClick(object sender, MouseEventArgs e) { + Debug.WriteLine("globeControl1_MouseDoubleClick"); if (e.Button != MouseButtons.Left) return; if (enumDesignMode == EnumDesignMode.AddPipe @@ -1382,6 +1384,7 @@ /// void globeControl1_MouseClick(object sender, MouseEventArgs e) { + Debug.WriteLine("globeControl1_MouseClick"); if (e.Button == MouseButtons.Left) { if (globeControl1.Globe.Action == EnumAction3D.VisibilityAnalysis) @@ -1714,11 +1717,11 @@ { string[] param = { "," }; string[] fieldNames = queryFields.Split(param, StringSplitOptions.RemoveEmptyEntries); - for (int j = 0; j < fieldNames.Length; ) + for (int j = 0; j < fieldNames.Length;) { - int count = 0; - string tmpStr = ""; - while (count<2&&j
" + value + "
"; - count ++; + count++; } j++; } @@ -1773,7 +1776,7 @@ { GSOLayer gsoLayer = node.Tag as GSOLayer; if (gsoLayer != null && gsoLayer.IsDestLayerFeatureAdd()) return node; - } + } } } else @@ -1890,7 +1893,7 @@ } void changeOpaque(int opaqueValue) - { + { globeControl1.Globe.GroundOpaque = 100 - opaqueValue; GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(Utility.roadLayerName);//("180fd"); if (layer != null) layer.Opaque = 100 - opaqueValue; @@ -2483,7 +2486,7 @@ GSOFeature selectedFeature = dataGridViewX2.Rows[i].Tag as GSOFeature; if (selectedFeature == null) continue; selectState = 1; - VerticalDistanceAnalysis(selectedFeature,Utility.m_PipelineLayerNames,dJingJuBiaoZhun); + VerticalDistanceAnalysis(selectedFeature, Utility.m_PipelineLayerNames, dJingJuBiaoZhun); } } else if (checkBoxX2.Checked) // 选择图层 @@ -2771,7 +2774,7 @@ MessageBox.Show("没有不符合净距标准的管线！", "提示"); } - for (int i = 0; i < Utility.m_PipelineLayerNames.Count&&featCount.Count>0; i++) + for (int i = 0; i < Utility.m_PipelineLayerNames.Count && featCount.Count > 0; i++) { if (featCount.ContainsKey(Utility.m_PipelineLayerNames[i]) && featLenth.ContainsKey(Utility.m_PipelineLayerNames[i])) @@ -2794,9 +2797,9 @@ /// private void HorizontalDistanceAnalysis(GSOFeature selectedFeature, List _pipelineLayerNames, double dis) { - - Dictionary featureMap = DoublePanelAnalysis.HorizontalDistanceAnalysis(globeControl1,selectedFeature, - _pipelineLayerNames, dis); + + Dictionary featureMap = DoublePanelAnalysis.HorizontalDistanceAnalysis(globeControl1, selectedFeature, + _pipelineLayerNames, dis); if (featureMap == null) { selectState = 0; @@ -2895,8 +2898,8 @@ GSOFeature selectedFeature = dataGridViewX4.Rows[i].Tag as GSOFeature; if (selectedFeature == null) continue; selectState = 1; -// VerticalDistanceAnalysis("碰撞分析", selectedFeature, Utility.m_PipelineLayerNames, 0, 0.0); - CollisionAnalysis(selectedFeature,Utility.m_PipelineLayerNames); + // VerticalDistanceAnalysis("碰撞分析", selectedFeature, Utility.m_PipelineLayerNames, 0, 0.0); + CollisionAnalysis(selectedFeature, Utility.m_PipelineLayerNames); } } else if (checkBoxX4.Checked) // 选择图层 @@ -2910,7 +2913,7 @@ { selectState = 1; CollisionAnalysis(feats[i], Utility.m_PipelineLayerNames); -// VerticalDistanceAnalysis("碰撞分析", feats[i], Utility.m_PipelineLayerNames, 0, 0.0); + // VerticalDistanceAnalysis("碰撞分析", feats[i], Utility.m_PipelineLayerNames, 0, 0.0); } } @@ -3062,7 +3065,7 @@ { GSOFeature rowFeature = dataGridViewX6.Rows[i].Tag as GSOFeature; if (rowFeature == null) continue; - string featureName = isFeatureContainsBianhao(rowFeature) ? rowFeature.GetValue(featureIDFieldName).ToString() : rowFeature.Name; + string featureName = isFeatureContainsBianhao(rowFeature) ? rowFeature.GetValue(featureIDFieldName).ToString() : rowFeature.Name; GSOGeoPolyline3D line = rowFeature.Geometry as GSOGeoPolyline3D; if (line == null) @@ -3102,7 +3105,7 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(comboBoxEx3.SelectedItem.ToString()); GSOFeatureLayer flayer = layer as GSOFeatureLayer; - if (flayer == null)return; + if (flayer == null) return; GSOFeatures feats = flayer.GetAllFeatures(); for (int i = 0; i < feats.Length; i++) { @@ -3443,7 +3446,7 @@ { MessageBox.Show("表格内容为空！", "提示"); } - } + } /// /// 碰撞分析功能界面中 选择管线复选框 选中状态改变事件处理 /// @@ -3504,7 +3507,7 @@ dataGridViewX4.Rows.Clear(); dataGridViewX5.Rows.Clear(); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(comboBoxEx2.SelectedItem.ToString()); - + GSOFeatureLayer flayer = layer as GSOFeatureLayer; if (flayer == null) return; GSOFeatures feats = flayer.GetAllFeatures(); @@ -3686,7 +3689,7 @@ if (selectedFeature != null) { selectState = 1; -// VerticalDistanceAnalysis("间距分析", selectedFeature, Utility.m_PipelineLayerNames, dVerticalJingJuBiaoZhun, dHorizontalJingJuBiaoZhun);//分析 + // VerticalDistanceAnalysis("间距分析", selectedFeature, Utility.m_PipelineLayerNames, dVerticalJingJuBiaoZhun, dHorizontalJingJuBiaoZhun);//分析 } } } @@ -3717,7 +3720,7 @@ for (int i = 0; i < feats.Length; i++) { selectState = 1; -// VerticalDistanceAnalysis("间距分析", feats[i], Utility.m_PipelineLayerNames, dVerticalJingJuBiaoZhun, dHorizontalJingJuBiaoZhun);//分析 + // VerticalDistanceAnalysis("间距分析", feats[i], Utility.m_PipelineLayerNames, dVerticalJingJuBiaoZhun, dHorizontalJingJuBiaoZhun);//分析 } } if (featCount.Count > 0) @@ -4057,7 +4060,7 @@ private GSOFeatures getSelectedFeatures() { GSOFeatures feats = new GSOFeatures(); - + if (globeControl1.Globe.SelObjectCount == 0) { feats = null; @@ -4106,7 +4109,7 @@ //日志记录 LogManager.saveLog(Utility.userName, buttonItemSH2.Text); GSOFeatures feats = getSelectedFeatures(); - + if (feats == null) { MessageBox.Show("请选择管段！", "提示"); @@ -4149,7 +4152,7 @@ MessageBox.Show("请选择管段！", "提示"); return; } - FormVer frm = new FormVer(feats, globeControl1,layerTemp); + FormVer frm = new FormVer(feats, globeControl1, layerTemp); frm.Show(); } @@ -4199,14 +4202,14 @@ objRes = layer; if (layer == null) return objRes; CheckDatasetGeoReference(layer.Dataset, strDataPath); -// CheckDatasetGeoReference(layer.Dataset, strDataPath); + // CheckDatasetGeoReference(layer.Dataset, strDataPath); TreeNode node = new TreeNode(); node.Tag = layer; node.Text = layer.Dataset.Caption; node.ImageIndex = 0; node.SelectedImageIndex = 0; node.Checked = layer.Visible; - layerManagerNode.Nodes.Insert(0, node); + layerManagerNode.Nodes.Insert(0, node); newlayername = layer.Caption; } else @@ -4231,7 +4234,7 @@ } return objRes; } - + /// /// 根据指定图层创建图层节点并将节点添加到图层管理节点的子节点集合中 /// @@ -4240,17 +4243,17 @@ { if (layer == null) return; CheckDatasetGeoReference(layer.Dataset, ""); - TreeUtils.AddNodeToManagerNode(layerManagerNode,layer); -// TreeNode node = new TreeNode(); -// node.Tag = layer; -// node.Text = layer.Dataset.Caption; -// node.ImageIndex = 0; -// node.SelectedImageIndex = 0; -// node.Checked = layer.Visible; -// -// if (layerManagerNode.Nodes.Contains(node)) return; -// layerManagerNode.Nodes.Insert(0, node); -// layerManagerNode.Expand(); + TreeUtils.AddNodeToManagerNode(layerManagerNode, layer); + // TreeNode node = new TreeNode(); + // node.Tag = layer; + // node.Text = layer.Dataset.Caption; + // node.ImageIndex = 0; + // node.SelectedImageIndex = 0; + // node.Checked = layer.Visible; + // + // if (layerManagerNode.Nodes.Contains(node)) return; + // layerManagerNode.Nodes.Insert(0, node); + // layerManagerNode.Expand(); } /// @@ -4260,8 +4263,8 @@ /// private void layerMarkerTree_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) { - if (e.Button != MouseButtons.Right||e.Node.Parent==null) return; - if (e.Node.Parent.Text.Equals("标注管理") ) + if (e.Button != MouseButtons.Right || e.Node.Parent == null) return; + if (e.Node.Parent.Text.Equals("标注管理")) { layerMarkerTree.SelectedNode = e.Node; contextMenuStrip2.Show(layerMarkerTree, e.X, e.Y); @@ -4275,7 +4278,7 @@ } else { - if (!(e.Node.Tag is GSOFeature)||e.Node.Parent.Parent==null) return; + if (!(e.Node.Tag is GSOFeature) || e.Node.Parent.Parent == null) return; if (e.Node.Parent.Parent.Text.Equals("标注管理")) { layerMarkerTree.SelectedNode = e.Node; @@ -4308,11 +4311,11 @@ // 只将类型为内存数据集的图层列出，如果是其它类型的数据集可能数据量太大，没发显示在树控件中 if (layer.Dataset is GSOFeatureDataset) { - TreeUtils.AddNodesMatchFeatures(node,layer.GetAllFeatures()); + TreeUtils.AddNodesMatchFeatures(node, layer.GetAllFeatures()); } } } - + /// /// 标注管理、传感器管理 图层目录树的右键菜单中的 移除所有 菜单 /// @@ -4338,10 +4341,10 @@ if (e.Action != TreeViewAction.Unknown) { //wxl优化标注管理树形结构 - TreeUtils.TreeNodeCheckedChange(globeControl1,e.Node); + TreeUtils.TreeNodeCheckedChange(globeControl1, e.Node); } } - + /// /// 标注管理、传感器管理 目录树中的feature节点的右键菜单中的 删除 菜单 /// @@ -4363,6 +4366,7 @@ /// private void buttonItem127_Click_2(object sender, EventArgs e) { + Debug.WriteLine("一键审核-打开数据"); LogManager.saveLog(Utility.userName, "打开数据"); try @@ -4387,7 +4391,7 @@ { //addNodeToLayerManagerNode(frm.rukuLayer); - TreeUtils.AddNodeToManagerNode(layerManagerNode,frm.rukuLayer); + TreeUtils.AddNodeToManagerNode(layerManagerNode, frm.rukuLayer); } } catch (Exception ex) @@ -4404,7 +4408,7 @@ private void buttonItem130_Click_1(object sender, EventArgs e) { LogManager.saveLog(Utility.userName, "导出审核图"); - + Point pt1 = new Point(Convert.ToInt32(0), Convert.ToInt32(0)); Point pt2 = new Point(Convert.ToInt32(panelEx5.Width), Convert.ToInt32(panelEx5.Height)); @@ -4448,6 +4452,7 @@ /// private void buttonItem128_Click(object sender, EventArgs e) { + Debug.WriteLine("buttonItem128_Click"); LogManager.saveLog(Utility.userName, buttonItem128.Text); if (boolfrmShResult) {//关闭等待窗口，否则会一直存在下去 @@ -4707,13 +4712,13 @@ /// /// private void 关键字查询ToolStripMenuItem_Click(object sender, EventArgs e) - { + { LogManager.saveLog(Utility.userName, "关键字查询"); FrmKeywordQuery.ShowForm(globeControl1, Utility.m_PipelineLayerNames, InitDataGridViewX1); } - - + + /// /// 编号查询 /// @@ -4728,7 +4733,7 @@ pageControl.nextpage = nextpage; pageControl.prepage = prepage; pageControl.pageinfo = pageinfo; -// pageControl.toolStripFeatureLength = toolStripFeatureLength; + // pageControl.toolStripFeatureLength = toolStripFeatureLength; pageControl.toolStripNumbers = toolStripNumbers; FrmCodingQuery.ShowForm(globeControl1, Utility.m_PipelineLayerNames, InitDataGridViewX1, pageControl); } @@ -4789,7 +4794,7 @@ pageControl.nextpage = nextpage; pageControl.prepage = prepage; pageControl.pageinfo = pageinfo; - FrmMaterialSel.ShowForm(globeControl1, Utility.m_PipelineLayerNames, InitDataGridViewX1,pageControl); + FrmMaterialSel.ShowForm(globeControl1, Utility.m_PipelineLayerNames, InitDataGridViewX1, pageControl); } /// /// 基本查询 @@ -4913,7 +4918,7 @@ pageControl.nextpage = nextpage; pageControl.prepage = prepage; pageControl.pageinfo = pageinfo; - FrmAllPipelineStatis frm = new FrmAllPipelineStatis(globeControl1, null, InitDataGridViewX1, Utility.m_PipelineLayerNames,pageControl); + FrmAllPipelineStatis frm = new FrmAllPipelineStatis(globeControl1, null, InitDataGridViewX1, Utility.m_PipelineLayerNames, pageControl); frm.Show(this); } /// @@ -4975,7 +4980,7 @@ pageControl.nextpage = nextpage; pageControl.prepage = prepage; pageControl.pageinfo = pageinfo; - FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(globeControl1, null, InitDataGridViewX1,pageControl); + FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(globeControl1, null, InitDataGridViewX1, pageControl); frm.Show(this); } /// @@ -5105,7 +5110,7 @@ private void 附属物分类统计ToolStripMenuItem_Click(object sender, EventArgs e) { LogManager.saveLog(Utility.userName, "附属物分类汇总"); - + Debug.WriteLine("附属物分类统计全区域统计"); FrmAccessoriesgather.ShowForm(globeControl1, Utility.instrumenLayerNames, null); } /// @@ -6666,14 +6671,14 @@ globeControl1.Globe.GetSelectObject(i, out f, out layer); if (layer != null) globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); - bool result = FeatureTools.DeleteFeature(f); + bool result = FeatureTools.DeleteFeature(f); if (result) delSuccessCount++; globeControl1.Refresh(); - + } - MessageBox.Show("成功删除"+delSuccessCount+"个模型！", "提示"); + MessageBox.Show("成功删除" + delSuccessCount + "个模型！", "提示"); globeControl1.Globe.Action = EnumAction3D.ActionNull; } @@ -6683,7 +6688,9 @@ /// private void buttonItemHX2_Click(object sender, EventArgs e) { + Debug.WriteLine("红线审核按钮"); LogManager.saveLog(Utility.userName, buttonItemHX2.Text); + // 清空红线审核结果 RedLineAnalysisTool.redLineResultList.Clear(); GSOFeatures selectFeatures = new GSOFeatures(); @@ -6693,6 +6700,7 @@ MessageBox.Show("请选择地块红线", "提示"); return; } + // 选择红线 for (int i = 0; i < globeControl1.Globe.SelObjectCount; i++) { GSOFeature feature = null; @@ -6701,9 +6709,11 @@ } try { + // 分析 RedLineAnalysisTool.redLineResultList = RedLineAnalysisTool.Anaylysis(selectFeatures, Utility.m_PipelineLayerNames, globeControl1); + // 加入到显示表格中 if (RedLineAnalysisTool.redLineResultList == null || RedLineAnalysisTool.redLineResultList.Count != 0) addRedLineDataToDataGridView(RedLineAnalysisTool.redLineResultList, dataGridViewX1); else @@ -6716,9 +6726,21 @@ catch (Exception ex) { redSH = false; - LogHelper.Debug("",ex); + LogHelper.Debug("", ex); } } + + /// 红线管理 + /// + /// + /// + private void hongxianMange_Click(object sender, EventArgs e) + { + Debug.WriteLine("红线管理"); + LogManager.saveLog(Utility.userName, hongxianMange.Text); + FrmHongXianManage form = new FrmHongXianManage(globeControl1, layerTree); + form.ShowDialog(); + } void addRedLineDataToDataGridView(List dt, DataGridView dataGridView) { DataTable table = new DataTable(); @@ -6756,6 +6778,7 @@ /// private void toolStripDropDownButton3_Click(object sender, EventArgs e) { + // 红线审核导出 if (dataGridViewX1.Rows.Count == 0) { MessageBox.Show("表格内容为空！", "提示"); @@ -6834,6 +6857,7 @@ /// private void buttonItemHX1_Click(object sender, EventArgs e) { + Debug.WriteLine("buttonItemHX1_Click"); LogManager.saveLog(Utility.userName, buttonItemHX1.Text); GSODataSource dataSpace = globeControl1.Globe.DataManager.OpenOracleDataSource(Utility.DBServer.Trim() + "/" + Utility.dbdatabase.Trim(), "", "", Utility.userID, Utility.DBPassword); @@ -6903,8 +6927,10 @@ } IModelBuilder modelBuilder = new RedLineBuilder(); - - modelBuilder.batchInsert(dataSpace, redDt, redFeatures, Color.Red); + string fileName = ""; + string[] temp = strDataPath.Split('\\'); + fileName = temp[temp.Length - 1].Split('.')[0]; + modelBuilder.batchInsert(dataSpace, redDt, redFeatures, Color.Red, fileName); } #endregion @@ -7203,6 +7229,7 @@ /// private void buttonItemGHRK_Click(object sender, EventArgs e) { + Debug.WriteLine("规划数据入库"); LogManager.saveLog(Utility.userName, buttonItemGHRK.Text); FrmGHRK ghrk = new FrmGHRK(globeControl1, layerManagerNode); @@ -7257,7 +7284,7 @@ frm.ShowDialog(); } } - + //文档管理 操作 private void btn_document_info_Click(object sender, EventArgs e) { @@ -7351,7 +7378,7 @@ newlayer.AddFeature(feature); } newlayer.Save(); - newlayer.SaveAs(dlg.FileName); + newlayer.SaveAs(dlg.FileName); newlayer.Dataset.DataSource.RemoveDataset(newlayer.Dataset); globeControl1.Globe.Layers.Remove(newlayer); MessageBox.Show("导出CAD完成！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); @@ -7470,7 +7497,7 @@ } private void pictureBox1_Paint(object sender, PaintEventArgs e) - { + { string welcomeUser = "欢迎您:" + Utility.userName; e.Graphics.DrawString(welcomeUser, new Font("宋体", 12), new SolidBrush(Color.Black), Width - 180, 50); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 275eae2..2cd6aa8 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -267,6 +267,7 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.hongxianMange = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -713,6 +714,7 @@ // statusStrip1 // this.statusStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(207)))), ((int)(((byte)(221)))), ((int)(((byte)(238))))); + this.statusStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatusLabel4, this.statusLabel, @@ -727,12 +729,12 @@ // toolStripStatusLabel4 // this.toolStripStatusLabel4.Name = "toolStripStatusLabel4"; - this.toolStripStatusLabel4.Size = new System.Drawing.Size(0, 17); + this.toolStripStatusLabel4.Size = new System.Drawing.Size(0, 15); // // statusLabel // this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(1313, 17); + this.statusLabel.Size = new System.Drawing.Size(1313, 15); this.statusLabel.Spring = true; // // toolStripDropDownButton1 @@ -741,7 +743,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(64, 28); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -1057,13 +1059,14 @@ // // RightScreenToolMenu // + this.RightScreenToolMenu.ImageScalingSize = new System.Drawing.Size(24, 24); this.RightScreenToolMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.管纵数据ToolStripMenuItem, this.验线数据ToolStripMenuItem, this.验线数据ToolStripMenuItem1, this.清除管纵数据ToolStripMenuItem1}); this.RightScreenToolMenu.Name = "RightScreenToolMenu"; - this.RightScreenToolMenu.Size = new System.Drawing.Size(149, 92); + this.RightScreenToolMenu.Size = new System.Drawing.Size(189, 124); // // 管纵数据ToolStripMenuItem // @@ -1076,79 +1079,80 @@ this.二十四米停车带ToolStripMenuItem, this.二十六米大堤路ToolStripMenuItem}); this.管纵数据ToolStripMenuItem.Name = "管纵数据ToolStripMenuItem"; - this.管纵数据ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.管纵数据ToolStripMenuItem.Size = new System.Drawing.Size(188, 30); this.管纵数据ToolStripMenuItem.Text = "管纵数据"; // // 五十米主干道ToolStripMenuItem // this.五十米主干道ToolStripMenuItem.Name = "五十米主干道ToolStripMenuItem"; - this.五十米主干道ToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.五十米主干道ToolStripMenuItem.Size = new System.Drawing.Size(204, 34); this.五十米主干道ToolStripMenuItem.Text = "50米主干道"; this.五十米主干道ToolStripMenuItem.Click += new System.EventHandler(this.五十米主干道ToolStripMenuItem_Click); // // 三十六米次干道ToolStripMenuItem // this.三十六米次干道ToolStripMenuItem.Name = "三十六米次干道ToolStripMenuItem"; - this.三十六米次干道ToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.三十六米次干道ToolStripMenuItem.Size = new System.Drawing.Size(204, 34); this.三十六米次干道ToolStripMenuItem.Text = "36米次干道"; this.三十六米次干道ToolStripMenuItem.Click += new System.EventHandler(this.三十六米次干道ToolStripMenuItem_Click); // // 四十二米次干道ToolStripMenuItem // this.四十二米次干道ToolStripMenuItem.Name = "四十二米次干道ToolStripMenuItem"; - this.四十二米次干道ToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.四十二米次干道ToolStripMenuItem.Size = new System.Drawing.Size(204, 34); this.四十二米次干道ToolStripMenuItem.Text = "42米次干道"; this.四十二米次干道ToolStripMenuItem.Click += new System.EventHandler(this.四十二米次干道ToolStripMenuItem_Click); // // 二十四米一块板ToolStripMenuItem // this.二十四米一块板ToolStripMenuItem.Name = "二十四米一块板ToolStripMenuItem"; - this.二十四米一块板ToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.二十四米一块板ToolStripMenuItem.Size = new System.Drawing.Size(204, 34); this.二十四米一块板ToolStripMenuItem.Text = "24米一块板"; this.二十四米一块板ToolStripMenuItem.Click += new System.EventHandler(this.二十四米一块板ToolStripMenuItem_Click); // // 二十四米三块板ToolStripMenuItem // this.二十四米三块板ToolStripMenuItem.Name = "二十四米三块板ToolStripMenuItem"; - this.二十四米三块板ToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.二十四米三块板ToolStripMenuItem.Size = new System.Drawing.Size(204, 34); this.二十四米三块板ToolStripMenuItem.Text = "24米三块板"; this.二十四米三块板ToolStripMenuItem.Click += new System.EventHandler(this.二十四米三块板ToolStripMenuItem_Click); // // 二十四米停车带ToolStripMenuItem // this.二十四米停车带ToolStripMenuItem.Name = "二十四米停车带ToolStripMenuItem"; - this.二十四米停车带ToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.二十四米停车带ToolStripMenuItem.Size = new System.Drawing.Size(204, 34); this.二十四米停车带ToolStripMenuItem.Text = "24米停车带"; this.二十四米停车带ToolStripMenuItem.Click += new System.EventHandler(this.二十四米停车带ToolStripMenuItem_Click); // // 二十六米大堤路ToolStripMenuItem // this.二十六米大堤路ToolStripMenuItem.Name = "二十六米大堤路ToolStripMenuItem"; - this.二十六米大堤路ToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.二十六米大堤路ToolStripMenuItem.Size = new System.Drawing.Size(204, 34); this.二十六米大堤路ToolStripMenuItem.Text = "26米大堤路"; this.二十六米大堤路ToolStripMenuItem.Click += new System.EventHandler(this.二十六米大堤路ToolStripMenuItem_Click); // // 验线数据ToolStripMenuItem // this.验线数据ToolStripMenuItem.Name = "验线数据ToolStripMenuItem"; - this.验线数据ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.验线数据ToolStripMenuItem.Size = new System.Drawing.Size(188, 30); this.验线数据ToolStripMenuItem.Text = "放线数据"; // // 验线数据ToolStripMenuItem1 // this.验线数据ToolStripMenuItem1.Name = "验线数据ToolStripMenuItem1"; - this.验线数据ToolStripMenuItem1.Size = new System.Drawing.Size(148, 22); + this.验线数据ToolStripMenuItem1.Size = new System.Drawing.Size(188, 30); this.验线数据ToolStripMenuItem1.Text = "验线数据"; // // 清除管纵数据ToolStripMenuItem1 // this.清除管纵数据ToolStripMenuItem1.Name = "清除管纵数据ToolStripMenuItem1"; - this.清除管纵数据ToolStripMenuItem1.Size = new System.Drawing.Size(148, 22); + this.清除管纵数据ToolStripMenuItem1.Size = new System.Drawing.Size(188, 30); this.清除管纵数据ToolStripMenuItem1.Text = "清除管纵数据"; this.清除管纵数据ToolStripMenuItem1.Click += new System.EventHandler(this.清除管纵数据ToolStripMenuItem_Click); // // toolRightMenu // + this.toolRightMenu.ImageScalingSize = new System.Drawing.Size(24, 24); this.toolRightMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.量算ToolStripMenuItem, this.编辑ToolStripMenuItem, @@ -1164,7 +1168,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(149, 290); + this.toolRightMenu.Size = new System.Drawing.Size(189, 394); // // 量算ToolStripMenuItem // @@ -1177,55 +1181,55 @@ this.水平面积ToolStripMenuItem1, this.地表面积ToolStripMenuItem1}); this.量算ToolStripMenuItem.Name = "量算ToolStripMenuItem"; - this.量算ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.量算ToolStripMenuItem.Size = new System.Drawing.Size(188, 30); this.量算ToolStripMenuItem.Text = "量算"; // // 水平距离ToolStripMenuItem1 // this.水平距离ToolStripMenuItem1.Name = "水平距离ToolStripMenuItem1"; - this.水平距离ToolStripMenuItem1.Size = new System.Drawing.Size(124, 22); + this.水平距离ToolStripMenuItem1.Size = new System.Drawing.Size(182, 34); this.水平距离ToolStripMenuItem1.Text = "水平距离"; this.水平距离ToolStripMenuItem1.Click += new System.EventHandler(this.水平距离ToolStripMenuItem1_Click); // // 垂直距离ToolStripMenuItem1 // this.垂直距离ToolStripMenuItem1.Name = "垂直距离ToolStripMenuItem1"; - this.垂直距离ToolStripMenuItem1.Size = new System.Drawing.Size(124, 22); + this.垂直距离ToolStripMenuItem1.Size = new System.Drawing.Size(182, 34); this.垂直距离ToolStripMenuItem1.Text = "垂直距离"; this.垂直距离ToolStripMenuItem1.Click += new System.EventHandler(this.垂直距离ToolStripMenuItem1_Click); // // 空间距离ToolStripMenuItem1 // this.空间距离ToolStripMenuItem1.Name = "空间距离ToolStripMenuItem1"; - this.空间距离ToolStripMenuItem1.Size = new System.Drawing.Size(124, 22); + this.空间距离ToolStripMenuItem1.Size = new System.Drawing.Size(182, 34); this.空间距离ToolStripMenuItem1.Text = "空间距离"; this.空间距离ToolStripMenuItem1.Click += new System.EventHandler(this.空间距离ToolStripMenuItem1_Click); // // 地表距离ToolStripMenuItem1 // this.地表距离ToolStripMenuItem1.Name = "地表距离ToolStripMenuItem1"; - this.地表距离ToolStripMenuItem1.Size = new System.Drawing.Size(124, 22); + this.地表距离ToolStripMenuItem1.Size = new System.Drawing.Size(182, 34); this.地表距离ToolStripMenuItem1.Text = "地表距离"; this.地表距离ToolStripMenuItem1.Click += new System.EventHandler(this.地表距离ToolStripMenuItem1_Click); // // 高度量算ToolStripMenuItem1 // this.高度量算ToolStripMenuItem1.Name = "高度量算ToolStripMenuItem1"; - this.高度量算ToolStripMenuItem1.Size = new System.Drawing.Size(124, 22); + this.高度量算ToolStripMenuItem1.Size = new System.Drawing.Size(182, 34); this.高度量算ToolStripMenuItem1.Text = "高度量算"; this.高度量算ToolStripMenuItem1.Click += new System.EventHandler(this.高度量算ToolStripMenuItem1_Click); // // 水平面积ToolStripMenuItem1 // this.水平面积ToolStripMenuItem1.Name = "水平面积ToolStripMenuItem1"; - this.水平面积ToolStripMenuItem1.Size = new System.Drawing.Size(124, 22); + this.水平面积ToolStripMenuItem1.Size = new System.Drawing.Size(182, 34); this.水平面积ToolStripMenuItem1.Text = "水平面积"; this.水平面积ToolStripMenuItem1.Click += new System.EventHandler(this.水平面积ToolStripMenuItem1_Click); // // 地表面积ToolStripMenuItem1 // this.地表面积ToolStripMenuItem1.Name = "地表面积ToolStripMenuItem1"; - this.地表面积ToolStripMenuItem1.Size = new System.Drawing.Size(124, 22); + this.地表面积ToolStripMenuItem1.Size = new System.Drawing.Size(182, 34); this.地表面积ToolStripMenuItem1.Text = "地表面积"; this.地表面积ToolStripMenuItem1.Click += new System.EventHandler(this.地表面积ToolStripMenuItem1_Click); // @@ -1240,34 +1244,34 @@ this.前进ToolStripMenuItem, this.后退ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(188, 30); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem // this.平移对象ToolStripMenuItem.Name = "平移对象ToolStripMenuItem"; - this.平移对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.平移对象ToolStripMenuItem.Size = new System.Drawing.Size(182, 34); this.平移对象ToolStripMenuItem.Text = "平移对象"; this.平移对象ToolStripMenuItem.Click += new System.EventHandler(this.平移对象ToolStripMenuItem_Click); // // 升降对象ToolStripMenuItem1 // this.升降对象ToolStripMenuItem1.Name = "升降对象ToolStripMenuItem1"; - this.升降对象ToolStripMenuItem1.Size = new System.Drawing.Size(124, 22); + this.升降对象ToolStripMenuItem1.Size = new System.Drawing.Size(182, 34); this.升降对象ToolStripMenuItem1.Text = "升降对象"; this.升降对象ToolStripMenuItem1.Click += new System.EventHandler(this.升降对象ToolStripMenuItem1_Click); // // 旋转对象ToolStripMenuItem // this.旋转对象ToolStripMenuItem.Name = "旋转对象ToolStripMenuItem"; - this.旋转对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.旋转对象ToolStripMenuItem.Size = new System.Drawing.Size(182, 34); this.旋转对象ToolStripMenuItem.Text = "旋转对象"; this.旋转对象ToolStripMenuItem.Click += new System.EventHandler(this.旋转对象ToolStripMenuItem_Click); // // 连接管段ToolStripMenuItem // this.连接管段ToolStripMenuItem.Name = "连接管段ToolStripMenuItem"; - this.连接管段ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.连接管段ToolStripMenuItem.Size = new System.Drawing.Size(182, 34); this.连接管段ToolStripMenuItem.Text = "连接管段"; this.连接管段ToolStripMenuItem.Click += new System.EventHandler(this.连接管段ToolStripMenuItem_Click); // @@ -1277,34 +1281,34 @@ this.导出CADToolStripMenuItem, this.导出文件ToolStripMenuItem1}); this.导出文件ToolStripMenuItem.Name = "导出文件ToolStripMenuItem"; - this.导出文件ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.导出文件ToolStripMenuItem.Size = new System.Drawing.Size(182, 34); this.导出文件ToolStripMenuItem.Text = "导出文件"; // // 导出CADToolStripMenuItem // this.导出CADToolStripMenuItem.Name = "导出CADToolStripMenuItem"; - this.导出CADToolStripMenuItem.Size = new System.Drawing.Size(125, 22); + this.导出CADToolStripMenuItem.Size = new System.Drawing.Size(185, 34); this.导出CADToolStripMenuItem.Text = "导出CAD"; this.导出CADToolStripMenuItem.Click += new System.EventHandler(this.导出CADToolStripMenuItem_Click); // // 导出文件ToolStripMenuItem1 // this.导出文件ToolStripMenuItem1.Name = "导出文件ToolStripMenuItem1"; - this.导出文件ToolStripMenuItem1.Size = new System.Drawing.Size(125, 22); + this.导出文件ToolStripMenuItem1.Size = new System.Drawing.Size(185, 34); this.导出文件ToolStripMenuItem1.Text = "导出矢量"; this.导出文件ToolStripMenuItem1.Click += new System.EventHandler(this.导出文件ToolStripMenuItem1_Click); // // 前进ToolStripMenuItem // this.前进ToolStripMenuItem.Name = "前进ToolStripMenuItem"; - this.前进ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.前进ToolStripMenuItem.Size = new System.Drawing.Size(182, 34); this.前进ToolStripMenuItem.Text = "前进"; this.前进ToolStripMenuItem.Click += new System.EventHandler(this.前进ToolStripMenuItem_Click); // // 后退ToolStripMenuItem // this.后退ToolStripMenuItem.Name = "后退ToolStripMenuItem"; - this.后退ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.后退ToolStripMenuItem.Size = new System.Drawing.Size(182, 34); this.后退ToolStripMenuItem.Text = "后退"; this.后退ToolStripMenuItem.Click += new System.EventHandler(this.后退ToolStripMenuItem_Click); // @@ -1316,34 +1320,34 @@ this.绕中心点飞行ToolStripMenuItem, this.绕眼睛飞行ToolStripMenuItem}); this.飞行ToolStripMenuItem.Name = "飞行ToolStripMenuItem"; - this.飞行ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.飞行ToolStripMenuItem.Size = new System.Drawing.Size(188, 30); this.飞行ToolStripMenuItem.Text = "飞行"; // // 自定义飞行ToolStripMenuItem // this.自定义飞行ToolStripMenuItem.Name = "自定义飞行ToolStripMenuItem"; - this.自定义飞行ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.自定义飞行ToolStripMenuItem.Size = new System.Drawing.Size(218, 34); this.自定义飞行ToolStripMenuItem.Text = "自定义飞行"; this.自定义飞行ToolStripMenuItem.Click += new System.EventHandler(this.自定义飞行ToolStripMenuItem_Click); // // 飞行到目标点ToolStripMenuItem // this.飞行到目标点ToolStripMenuItem.Name = "飞行到目标点ToolStripMenuItem"; - this.飞行到目标点ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.飞行到目标点ToolStripMenuItem.Size = new System.Drawing.Size(218, 34); this.飞行到目标点ToolStripMenuItem.Text = "飞行到目标点"; this.飞行到目标点ToolStripMenuItem.Click += new System.EventHandler(this.飞行到目标点ToolStripMenuItem_Click); // // 绕中心点飞行ToolStripMenuItem // this.绕中心点飞行ToolStripMenuItem.Name = "绕中心点飞行ToolStripMenuItem"; - this.绕中心点飞行ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.绕中心点飞行ToolStripMenuItem.Size = new System.Drawing.Size(218, 34); this.绕中心点飞行ToolStripMenuItem.Text = "绕中心点飞行"; this.绕中心点飞行ToolStripMenuItem.Click += new System.EventHandler(this.绕中心点飞行ToolStripMenuItem_Click); // // 绕眼睛飞行ToolStripMenuItem // this.绕眼睛飞行ToolStripMenuItem.Name = "绕眼睛飞行ToolStripMenuItem"; - this.绕眼睛飞行ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.绕眼睛飞行ToolStripMenuItem.Size = new System.Drawing.Size(218, 34); this.绕眼睛飞行ToolStripMenuItem.Text = "绕眼睛飞行"; this.绕眼睛飞行ToolStripMenuItem.Click += new System.EventHandler(this.绕眼睛飞行ToolStripMenuItem_Click); // @@ -1361,76 +1365,76 @@ this.属性标注ToolStripMenuItem, this.标注管理ToolStripMenuItem}); this.标注ToolStripMenuItem.Name = "标注ToolStripMenuItem"; - this.标注ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.标注ToolStripMenuItem.Size = new System.Drawing.Size(188, 30); this.标注ToolStripMenuItem.Text = "标注"; // // 标高标注ToolStripMenuItem // this.标高标注ToolStripMenuItem.Name = "标高标注ToolStripMenuItem"; - this.标高标注ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.标高标注ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.标高标注ToolStripMenuItem.Text = "标高标注"; this.标高标注ToolStripMenuItem.Click += new System.EventHandler(this.标高标注ToolStripMenuItem_Click); // // 管径标注ToolStripMenuItem // this.管径标注ToolStripMenuItem.Name = "管径标注ToolStripMenuItem"; - this.管径标注ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.管径标注ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.管径标注ToolStripMenuItem.Text = "管径标注"; this.管径标注ToolStripMenuItem.Click += new System.EventHandler(this.管径标注ToolStripMenuItem_Click); // // 埋深标注ToolStripMenuItem // this.埋深标注ToolStripMenuItem.Name = "埋深标注ToolStripMenuItem"; - this.埋深标注ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.埋深标注ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.埋深标注ToolStripMenuItem.Text = "埋深标注"; this.埋深标注ToolStripMenuItem.Click += new System.EventHandler(this.埋深标注ToolStripMenuItem_Click); // // 坐标标注ToolStripMenuItem // this.坐标标注ToolStripMenuItem.Name = "坐标标注ToolStripMenuItem"; - this.坐标标注ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.坐标标注ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.坐标标注ToolStripMenuItem.Text = "坐标标注"; this.坐标标注ToolStripMenuItem.Click += new System.EventHandler(this.坐标标注ToolStripMenuItem_Click); // // 距离标注ToolStripMenuItem // this.距离标注ToolStripMenuItem.Name = "距离标注ToolStripMenuItem"; - this.距离标注ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.距离标注ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.距离标注ToolStripMenuItem.Text = "距离标注"; this.距离标注ToolStripMenuItem.Click += new System.EventHandler(this.距离标注ToolStripMenuItem_Click); // // 自定义标注ToolStripMenuItem // this.自定义标注ToolStripMenuItem.Name = "自定义标注ToolStripMenuItem"; - this.自定义标注ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.自定义标注ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.自定义标注ToolStripMenuItem.Text = "自定义标注"; this.自定义标注ToolStripMenuItem.Click += new System.EventHandler(this.自定义标注ToolStripMenuItem_Click); // // 扯旗标注ToolStripMenuItem // this.扯旗标注ToolStripMenuItem.Name = "扯旗标注ToolStripMenuItem"; - this.扯旗标注ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.扯旗标注ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.扯旗标注ToolStripMenuItem.Text = "扯旗标注"; this.扯旗标注ToolStripMenuItem.Click += new System.EventHandler(this.扯旗标注ToolStripMenuItem_Click); // // 坡度标注ToolStripMenuItem // this.坡度标注ToolStripMenuItem.Name = "坡度标注ToolStripMenuItem"; - this.坡度标注ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.坡度标注ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.坡度标注ToolStripMenuItem.Text = "坡度标注"; this.坡度标注ToolStripMenuItem.Click += new System.EventHandler(this.坡度标注ToolStripMenuItem_Click); // // 属性标注ToolStripMenuItem // this.属性标注ToolStripMenuItem.Name = "属性标注ToolStripMenuItem"; - this.属性标注ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.属性标注ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.属性标注ToolStripMenuItem.Text = "属性标注"; this.属性标注ToolStripMenuItem.Click += new System.EventHandler(this.属性标注ToolStripMenuItem_Click); // // 标注管理ToolStripMenuItem // this.标注管理ToolStripMenuItem.Name = "标注管理ToolStripMenuItem"; - this.标注管理ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.标注管理ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.标注管理ToolStripMenuItem.Text = "标注管理"; this.标注管理ToolStripMenuItem.Click += new System.EventHandler(this.标注管理ToolStripMenuItem_Click); // @@ -1447,69 +1451,69 @@ this.关联查询ToolStripMenuItem, this.关键字查询ToolStripMenuItem}); this.查询ToolStripMenuItem.Name = "查询ToolStripMenuItem"; - this.查询ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.查询ToolStripMenuItem.Size = new System.Drawing.Size(188, 30); this.查询ToolStripMenuItem.Text = "查询"; // // 编号查询ToolStripMenuItem // this.编号查询ToolStripMenuItem.Name = "编号查询ToolStripMenuItem"; - this.编号查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.编号查询ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.编号查询ToolStripMenuItem.Text = "编号查询"; this.编号查询ToolStripMenuItem.Click += new System.EventHandler(this.编号查询ToolStripMenuItem_Click); // // 坐标查询ToolStripMenuItem // this.坐标查询ToolStripMenuItem.Name = "坐标查询ToolStripMenuItem"; - this.坐标查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.坐标查询ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.坐标查询ToolStripMenuItem.Text = "坐标查询"; this.坐标查询ToolStripMenuItem.Click += new System.EventHandler(this.坐标查询ToolStripMenuItem_Click); // // 附属物查询ToolStripMenuItem // this.附属物查询ToolStripMenuItem.Name = "附属物查询ToolStripMenuItem"; - this.附属物查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.附属物查询ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.附属物查询ToolStripMenuItem.Text = "配件查询"; this.附属物查询ToolStripMenuItem.Click += new System.EventHandler(this.附属物查询ToolStripMenuItem_Click); // // 管径查询ToolStripMenuItem // this.管径查询ToolStripMenuItem.Name = "管径查询ToolStripMenuItem"; - this.管径查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.管径查询ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.管径查询ToolStripMenuItem.Text = "管径查询"; this.管径查询ToolStripMenuItem.Click += new System.EventHandler(this.管径查询ToolStripMenuItem_Click); // // 材质查询ToolStripMenuItem // this.材质查询ToolStripMenuItem.Name = "材质查询ToolStripMenuItem"; - this.材质查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.材质查询ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.材质查询ToolStripMenuItem.Text = "材质查询"; this.材质查询ToolStripMenuItem.Click += new System.EventHandler(this.材质查询ToolStripMenuItem_Click); // // 基本查询ToolStripMenuItem // this.基本查询ToolStripMenuItem.Name = "基本查询ToolStripMenuItem"; - this.基本查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.基本查询ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.基本查询ToolStripMenuItem.Text = "基本查询"; this.基本查询ToolStripMenuItem.Click += new System.EventHandler(this.基本查询ToolStripMenuItem_Click); // // 复合查询ToolStripMenuItem // this.复合查询ToolStripMenuItem.Name = "复合查询ToolStripMenuItem"; - this.复合查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.复合查询ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.复合查询ToolStripMenuItem.Text = "复合查询"; this.复合查询ToolStripMenuItem.Click += new System.EventHandler(this.复合查询ToolStripMenuItem_Click); // // 关联查询ToolStripMenuItem // this.关联查询ToolStripMenuItem.Name = "关联查询ToolStripMenuItem"; - this.关联查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.关联查询ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.关联查询ToolStripMenuItem.Text = "关联查询"; this.关联查询ToolStripMenuItem.Click += new System.EventHandler(this.关联查询ToolStripMenuItem_Click); // // 关键字查询ToolStripMenuItem // this.关键字查询ToolStripMenuItem.Name = "关键字查询ToolStripMenuItem"; - this.关键字查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.关键字查询ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.关键字查询ToolStripMenuItem.Text = "关键字查询"; this.关键字查询ToolStripMenuItem.Click += new System.EventHandler(this.关键字查询ToolStripMenuItem_Click); // @@ -1526,69 +1530,69 @@ this.附属物分类统计ToolStripMenuItem, this.标识器分类统计ToolStripMenuItem}); this.全区域统计ToolStripMenuItem.Name = "全区域统计ToolStripMenuItem"; - this.全区域统计ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.全区域统计ToolStripMenuItem.Size = new System.Drawing.Size(188, 30); this.全区域统计ToolStripMenuItem.Text = "全区域统计"; // // 管线长度统计ToolStripMenuItem // this.管线长度统计ToolStripMenuItem.Name = "管线长度统计ToolStripMenuItem"; - this.管线长度统计ToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.管线长度统计ToolStripMenuItem.Size = new System.Drawing.Size(236, 34); this.管线长度统计ToolStripMenuItem.Text = "管线长度统计"; this.管线长度统计ToolStripMenuItem.Click += new System.EventHandler(this.管线长度统计ToolStripMenuItem_Click); // // 阀门数量统计ToolStripMenuItem // this.阀门数量统计ToolStripMenuItem.Name = "阀门数量统计ToolStripMenuItem"; - this.阀门数量统计ToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.阀门数量统计ToolStripMenuItem.Size = new System.Drawing.Size(236, 34); this.阀门数量统计ToolStripMenuItem.Text = "阀门数量统计"; this.阀门数量统计ToolStripMenuItem.Click += new System.EventHandler(this.阀门数量统计ToolStripMenuItem_Click); // // 井盖数量统计ToolStripMenuItem // this.井盖数量统计ToolStripMenuItem.Name = "井盖数量统计ToolStripMenuItem"; - this.井盖数量统计ToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.井盖数量统计ToolStripMenuItem.Size = new System.Drawing.Size(236, 34); this.井盖数量统计ToolStripMenuItem.Text = "井盖数量统计"; this.井盖数量统计ToolStripMenuItem.Click += new System.EventHandler(this.井盖数量统计ToolStripMenuItem_Click); // // 管径分段统计ToolStripMenuItem // this.管径分段统计ToolStripMenuItem.Name = "管径分段统计ToolStripMenuItem"; - this.管径分段统计ToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.管径分段统计ToolStripMenuItem.Size = new System.Drawing.Size(236, 34); this.管径分段统计ToolStripMenuItem.Text = "管径分段统计"; this.管径分段统计ToolStripMenuItem.Click += new System.EventHandler(this.管径分段统计ToolStripMenuItem_Click); // // 埋深分段统计ToolStripMenuItem // this.埋深分段统计ToolStripMenuItem.Name = "埋深分段统计ToolStripMenuItem"; - this.埋深分段统计ToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.埋深分段统计ToolStripMenuItem.Size = new System.Drawing.Size(236, 34); this.埋深分段统计ToolStripMenuItem.Text = "埋深分段统计"; this.埋深分段统计ToolStripMenuItem.Click += new System.EventHandler(this.埋深分段统计ToolStripMenuItem_Click); // // 管径分类统计ToolStripMenuItem // this.管径分类统计ToolStripMenuItem.Name = "管径分类统计ToolStripMenuItem"; - this.管径分类统计ToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.管径分类统计ToolStripMenuItem.Size = new System.Drawing.Size(236, 34); this.管径分类统计ToolStripMenuItem.Text = "管径分类统计"; this.管径分类统计ToolStripMenuItem.Click += new System.EventHandler(this.管径分类统计ToolStripMenuItem_Click); // // 材质分类统计ToolStripMenuItem // this.材质分类统计ToolStripMenuItem.Name = "材质分类统计ToolStripMenuItem"; - this.材质分类统计ToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.材质分类统计ToolStripMenuItem.Size = new System.Drawing.Size(236, 34); this.材质分类统计ToolStripMenuItem.Text = "材质分类统计"; this.材质分类统计ToolStripMenuItem.Click += new System.EventHandler(this.材质分类统计ToolStripMenuItem_Click); // // 附属物分类统计ToolStripMenuItem // this.附属物分类统计ToolStripMenuItem.Name = "附属物分类统计ToolStripMenuItem"; - this.附属物分类统计ToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.附属物分类统计ToolStripMenuItem.Size = new System.Drawing.Size(236, 34); this.附属物分类统计ToolStripMenuItem.Text = "附属物分类统计"; this.附属物分类统计ToolStripMenuItem.Click += new System.EventHandler(this.附属物分类统计ToolStripMenuItem_Click); // // 标识器分类统计ToolStripMenuItem // this.标识器分类统计ToolStripMenuItem.Name = "标识器分类统计ToolStripMenuItem"; - this.标识器分类统计ToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.标识器分类统计ToolStripMenuItem.Size = new System.Drawing.Size(236, 34); this.标识器分类统计ToolStripMenuItem.Text = "标识器分类统计"; this.标识器分类统计ToolStripMenuItem.Click += new System.EventHandler(this.标识器分类统计ToolStripMenuItem_Click); // @@ -1605,69 +1609,69 @@ this.附属物分类统计ToolStripMenuItem1, this.标识器分类统计ToolStripMenuItem1}); this.绘制区域统计ToolStripMenuItem.Name = "绘制区域统计ToolStripMenuItem"; - this.绘制区域统计ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.绘制区域统计ToolStripMenuItem.Size = new System.Drawing.Size(188, 30); this.绘制区域统计ToolStripMenuItem.Text = "绘制区域统计"; // // 管线长度统计ToolStripMenuItem1 // this.管线长度统计ToolStripMenuItem1.Name = "管线长度统计ToolStripMenuItem1"; - this.管线长度统计ToolStripMenuItem1.Size = new System.Drawing.Size(160, 22); + this.管线长度统计ToolStripMenuItem1.Size = new System.Drawing.Size(236, 34); this.管线长度统计ToolStripMenuItem1.Text = "管线长度统计"; this.管线长度统计ToolStripMenuItem1.Click += new System.EventHandler(this.管线长度统计ToolStripMenuItem1_Click); // // 阀门数量统计ToolStripMenuItem1 // this.阀门数量统计ToolStripMenuItem1.Name = "阀门数量统计ToolStripMenuItem1"; - this.阀门数量统计ToolStripMenuItem1.Size = new System.Drawing.Size(160, 22); + this.阀门数量统计ToolStripMenuItem1.Size = new System.Drawing.Size(236, 34); this.阀门数量统计ToolStripMenuItem1.Text = "阀门数量统计"; this.阀门数量统计ToolStripMenuItem1.Click += new System.EventHandler(this.阀门数量统计ToolStripMenuItem1_Click); // // 井盖数量统计ToolStripMenuItem1 // this.井盖数量统计ToolStripMenuItem1.Name = "井盖数量统计ToolStripMenuItem1"; - this.井盖数量统计ToolStripMenuItem1.Size = new System.Drawing.Size(160, 22); + this.井盖数量统计ToolStripMenuItem1.Size = new System.Drawing.Size(236, 34); this.井盖数量统计ToolStripMenuItem1.Text = "井盖数量统计"; this.井盖数量统计ToolStripMenuItem1.Click += new System.EventHandler(this.井盖数量统计ToolStripMenuItem1_Click); // // 管径分段统计ToolStripMenuItem1 // this.管径分段统计ToolStripMenuItem1.Name = "管径分段统计ToolStripMenuItem1"; - this.管径分段统计ToolStripMenuItem1.Size = new System.Drawing.Size(160, 22); + this.管径分段统计ToolStripMenuItem1.Size = new System.Drawing.Size(236, 34); this.管径分段统计ToolStripMenuItem1.Text = "管径分段统计"; this.管径分段统计ToolStripMenuItem1.Click += new System.EventHandler(this.管径分段统计ToolStripMenuItem1_Click); // // 埋深分段统计ToolStripMenuItem1 // this.埋深分段统计ToolStripMenuItem1.Name = "埋深分段统计ToolStripMenuItem1"; - this.埋深分段统计ToolStripMenuItem1.Size = new System.Drawing.Size(160, 22); + this.埋深分段统计ToolStripMenuItem1.Size = new System.Drawing.Size(236, 34); this.埋深分段统计ToolStripMenuItem1.Text = "埋深分段统计"; this.埋深分段统计ToolStripMenuItem1.Click += new System.EventHandler(this.埋深分段统计ToolStripMenuItem1_Click); // // 管径分类统计ToolStripMenuItem1 // this.管径分类统计ToolStripMenuItem1.Name = "管径分类统计ToolStripMenuItem1"; - this.管径分类统计ToolStripMenuItem1.Size = new System.Drawing.Size(160, 22); + this.管径分类统计ToolStripMenuItem1.Size = new System.Drawing.Size(236, 34); this.管径分类统计ToolStripMenuItem1.Text = "管径分类统计"; this.管径分类统计ToolStripMenuItem1.Click += new System.EventHandler(this.管径分类统计ToolStripMenuItem1_Click); // // 材质分类统计ToolStripMenuItem1 // this.材质分类统计ToolStripMenuItem1.Name = "材质分类统计ToolStripMenuItem1"; - this.材质分类统计ToolStripMenuItem1.Size = new System.Drawing.Size(160, 22); + this.材质分类统计ToolStripMenuItem1.Size = new System.Drawing.Size(236, 34); this.材质分类统计ToolStripMenuItem1.Text = "材质分类统计"; this.材质分类统计ToolStripMenuItem1.Click += new System.EventHandler(this.材质分类统计ToolStripMenuItem1_Click); // // 附属物分类统计ToolStripMenuItem1 // this.附属物分类统计ToolStripMenuItem1.Name = "附属物分类统计ToolStripMenuItem1"; - this.附属物分类统计ToolStripMenuItem1.Size = new System.Drawing.Size(160, 22); + this.附属物分类统计ToolStripMenuItem1.Size = new System.Drawing.Size(236, 34); this.附属物分类统计ToolStripMenuItem1.Text = "附属物分类统计"; this.附属物分类统计ToolStripMenuItem1.Click += new System.EventHandler(this.附属物分类统计ToolStripMenuItem1_Click); // // 标识器分类统计ToolStripMenuItem1 // this.标识器分类统计ToolStripMenuItem1.Name = "标识器分类统计ToolStripMenuItem1"; - this.标识器分类统计ToolStripMenuItem1.Size = new System.Drawing.Size(160, 22); + this.标识器分类统计ToolStripMenuItem1.Size = new System.Drawing.Size(236, 34); this.标识器分类统计ToolStripMenuItem1.Text = "标识器分类统计"; this.标识器分类统计ToolStripMenuItem1.Click += new System.EventHandler(this.标识器分类统计ToolStripMenuItem1_Click); // @@ -1677,20 +1681,20 @@ this.横断面分析ToolStripMenuItem, this.纵断面分析ToolStripMenuItem}); this.断面分析ToolStripMenuItem.Name = "断面分析ToolStripMenuItem"; - this.断面分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.断面分析ToolStripMenuItem.Size = new System.Drawing.Size(188, 30); this.断面分析ToolStripMenuItem.Text = "断面分析"; // // 横断面分析ToolStripMenuItem // this.横断面分析ToolStripMenuItem.Name = "横断面分析ToolStripMenuItem"; - this.横断面分析ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.横断面分析ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.横断面分析ToolStripMenuItem.Text = "横断面分析"; this.横断面分析ToolStripMenuItem.Click += new System.EventHandler(this.横断面分析ToolStripMenuItem_Click); // // 纵断面分析ToolStripMenuItem // this.纵断面分析ToolStripMenuItem.Name = "纵断面分析ToolStripMenuItem"; - this.纵断面分析ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.纵断面分析ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.纵断面分析ToolStripMenuItem.Text = "纵断面分析"; this.纵断面分析ToolStripMenuItem.Click += new System.EventHandler(this.纵断面分析ToolStripMenuItem_Click); // @@ -1705,55 +1709,55 @@ this.连通分析ToolStripMenuItem, this.爆管分析ToolStripMenuItem}); this.拓扑分析ToolStripMenuItem.Name = "拓扑分析ToolStripMenuItem"; - this.拓扑分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.拓扑分析ToolStripMenuItem.Size = new System.Drawing.Size(188, 30); this.拓扑分析ToolStripMenuItem.Text = "拓扑分析"; // // 创建拓扑ToolStripMenuItem // this.创建拓扑ToolStripMenuItem.Name = "创建拓扑ToolStripMenuItem"; - this.创建拓扑ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.创建拓扑ToolStripMenuItem.Size = new System.Drawing.Size(182, 34); this.创建拓扑ToolStripMenuItem.Text = "创建拓扑"; this.创建拓扑ToolStripMenuItem.Click += new System.EventHandler(this.创建拓扑ToolStripMenuItem_Click); // // 上游分析ToolStripMenuItem // this.上游分析ToolStripMenuItem.Name = "上游分析ToolStripMenuItem"; - this.上游分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.上游分析ToolStripMenuItem.Size = new System.Drawing.Size(182, 34); this.上游分析ToolStripMenuItem.Text = "上游分析"; this.上游分析ToolStripMenuItem.Click += new System.EventHandler(this.上游分析ToolStripMenuItem_Click); // // 下游分析ToolStripMenuItem // this.下游分析ToolStripMenuItem.Name = "下游分析ToolStripMenuItem"; - this.下游分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.下游分析ToolStripMenuItem.Size = new System.Drawing.Size(182, 34); this.下游分析ToolStripMenuItem.Text = "下游分析"; this.下游分析ToolStripMenuItem.Click += new System.EventHandler(this.下游分析ToolStripMenuItem_Click); // // 流向分析ToolStripMenuItem // this.流向分析ToolStripMenuItem.Name = "流向分析ToolStripMenuItem"; - this.流向分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.流向分析ToolStripMenuItem.Size = new System.Drawing.Size(182, 34); this.流向分析ToolStripMenuItem.Text = "流向分析"; this.流向分析ToolStripMenuItem.Click += new System.EventHandler(this.流向分析ToolStripMenuItem_Click); // // 关阀分析ToolStripMenuItem // this.关阀分析ToolStripMenuItem.Name = "关阀分析ToolStripMenuItem"; - this.关阀分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.关阀分析ToolStripMenuItem.Size = new System.Drawing.Size(182, 34); this.关阀分析ToolStripMenuItem.Text = "关阀分析"; this.关阀分析ToolStripMenuItem.Click += new System.EventHandler(this.关阀分析ToolStripMenuItem_Click); // // 连通分析ToolStripMenuItem // this.连通分析ToolStripMenuItem.Name = "连通分析ToolStripMenuItem"; - this.连通分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.连通分析ToolStripMenuItem.Size = new System.Drawing.Size(182, 34); this.连通分析ToolStripMenuItem.Text = "连通分析"; this.连通分析ToolStripMenuItem.Click += new System.EventHandler(this.连通分析ToolStripMenuItem_Click); // // 爆管分析ToolStripMenuItem // this.爆管分析ToolStripMenuItem.Name = "爆管分析ToolStripMenuItem"; - this.爆管分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.爆管分析ToolStripMenuItem.Size = new System.Drawing.Size(182, 34); this.爆管分析ToolStripMenuItem.Text = "爆管分析"; this.爆管分析ToolStripMenuItem.Click += new System.EventHandler(this.爆管分析ToolStripMenuItem_Click); // @@ -1764,27 +1768,27 @@ this.挖方量分析ToolStripMenuItem, this.沿线开挖ToolStripMenuItem}); this.开挖分析ToolStripMenuItem.Name = "开挖分析ToolStripMenuItem"; - this.开挖分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.开挖分析ToolStripMenuItem.Size = new System.Drawing.Size(188, 30); this.开挖分析ToolStripMenuItem.Text = "开挖分析"; // // 多边形开挖ToolStripMenuItem // this.多边形开挖ToolStripMenuItem.Name = "多边形开挖ToolStripMenuItem"; - this.多边形开挖ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.多边形开挖ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.多边形开挖ToolStripMenuItem.Text = "多边形开挖"; this.多边形开挖ToolStripMenuItem.Click += new System.EventHandler(this.多边形开挖ToolStripMenuItem_Click); // // 挖方量分析ToolStripMenuItem // this.挖方量分析ToolStripMenuItem.Name = "挖方量分析ToolStripMenuItem"; - this.挖方量分析ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.挖方量分析ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.挖方量分析ToolStripMenuItem.Text = "挖方量分析"; this.挖方量分析ToolStripMenuItem.Click += new System.EventHandler(this.挖方量分析ToolStripMenuItem_Click); // // 沿线开挖ToolStripMenuItem // this.沿线开挖ToolStripMenuItem.Name = "沿线开挖ToolStripMenuItem"; - this.沿线开挖ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.沿线开挖ToolStripMenuItem.Size = new System.Drawing.Size(200, 34); this.沿线开挖ToolStripMenuItem.Text = "沿线开挖"; this.沿线开挖ToolStripMenuItem.Click += new System.EventHandler(this.沿线开挖ToolStripMenuItem_Click); // @@ -1795,27 +1799,27 @@ this.可视域分析ToolStripMenuItem, this.可视包络分析ToolStripMenuItem}); this.视域分析ToolStripMenuItem.Name = "视域分析ToolStripMenuItem"; - this.视域分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.视域分析ToolStripMenuItem.Size = new System.Drawing.Size(188, 30); this.视域分析ToolStripMenuItem.Text = "视域分析"; // // 通视分析ToolStripMenuItem // this.通视分析ToolStripMenuItem.Name = "通视分析ToolStripMenuItem"; - this.通视分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.通视分析ToolStripMenuItem.Size = new System.Drawing.Size(218, 34); this.通视分析ToolStripMenuItem.Text = "通视分析"; this.通视分析ToolStripMenuItem.Click += new System.EventHandler(this.通视分析ToolStripMenuItem_Click); // // 可视域分析ToolStripMenuItem // this.可视域分析ToolStripMenuItem.Name = "可视域分析ToolStripMenuItem"; - this.可视域分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.可视域分析ToolStripMenuItem.Size = new System.Drawing.Size(218, 34); this.可视域分析ToolStripMenuItem.Text = "可视域分析"; this.可视域分析ToolStripMenuItem.Click += new System.EventHandler(this.可视域分析ToolStripMenuItem_Click); // // 可视包络分析ToolStripMenuItem // this.可视包络分析ToolStripMenuItem.Name = "可视包络分析ToolStripMenuItem"; - this.可视包络分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.可视包络分析ToolStripMenuItem.Size = new System.Drawing.Size(218, 34); this.可视包络分析ToolStripMenuItem.Text = "可视包络分析"; this.可视包络分析ToolStripMenuItem.Click += new System.EventHandler(this.可视包络分析ToolStripMenuItem_Click); // @@ -1826,34 +1830,34 @@ this.缓冲区分析ToolStripMenuItem, this.无源淹没分析ToolStripMenuItem}); this.区域分析ToolStripMenuItem.Name = "区域分析ToolStripMenuItem"; - this.区域分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.区域分析ToolStripMenuItem.Size = new System.Drawing.Size(188, 30); this.区域分析ToolStripMenuItem.Text = "区域分析"; // // 附属物分析ToolStripMenuItem // this.附属物分析ToolStripMenuItem.Name = "附属物分析ToolStripMenuItem"; - this.附属物分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.附属物分析ToolStripMenuItem.Size = new System.Drawing.Size(218, 34); this.附属物分析ToolStripMenuItem.Text = "配件分析"; this.附属物分析ToolStripMenuItem.Click += new System.EventHandler(this.附属物分析ToolStripMenuItem_Click); // // 缓冲区分析ToolStripMenuItem // this.缓冲区分析ToolStripMenuItem.Name = "缓冲区分析ToolStripMenuItem"; - this.缓冲区分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.缓冲区分析ToolStripMenuItem.Size = new System.Drawing.Size(218, 34); this.缓冲区分析ToolStripMenuItem.Text = "缓冲区分析"; this.缓冲区分析ToolStripMenuItem.Click += new System.EventHandler(this.缓冲区分析ToolStripMenuItem_Click); // // 无源淹没分析ToolStripMenuItem // this.无源淹没分析ToolStripMenuItem.Name = "无源淹没分析ToolStripMenuItem"; - this.无源淹没分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.无源淹没分析ToolStripMenuItem.Size = new System.Drawing.Size(218, 34); this.无源淹没分析ToolStripMenuItem.Text = "无源淹没分析"; this.无源淹没分析ToolStripMenuItem.Click += new System.EventHandler(this.无源淹没分析ToolStripMenuItem_Click); // // 清除分析ToolStripMenuItem // this.清除分析ToolStripMenuItem.Name = "清除分析ToolStripMenuItem"; - this.清除分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.清除分析ToolStripMenuItem.Size = new System.Drawing.Size(188, 30); this.清除分析ToolStripMenuItem.Text = "清除分析"; this.清除分析ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemClear_Click); // @@ -1863,6 +1867,7 @@ // // layerNodeContexMenu // + this.layerNodeContexMenu.ImageScalingSize = new System.Drawing.Size(24, 24); this.layerNodeContexMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.RefreshLayerFeatureListMenuItem, this.MoveUp, @@ -1878,40 +1883,40 @@ this.MenuItemVisiblePixelSize, this.LayerFlyMenuItem}); this.layerNodeContexMenu.Name = "layerNodeContexMenu"; - this.layerNodeContexMenu.Size = new System.Drawing.Size(149, 290); + this.layerNodeContexMenu.Size = new System.Drawing.Size(189, 394); // // RefreshLayerFeatureListMenuItem // this.RefreshLayerFeatureListMenuItem.Name = "RefreshLayerFeatureListMenuItem"; - this.RefreshLayerFeatureListMenuItem.Size = new System.Drawing.Size(148, 22); + this.RefreshLayerFeatureListMenuItem.Size = new System.Drawing.Size(188, 30); this.RefreshLayerFeatureListMenuItem.Text = "刷新列表"; this.RefreshLayerFeatureListMenuItem.Visible = false; // // MoveUp // this.MoveUp.Name = "MoveUp"; - this.MoveUp.Size = new System.Drawing.Size(148, 22); + this.MoveUp.Size = new System.Drawing.Size(188, 30); this.MoveUp.Text = "上移"; this.MoveUp.Visible = false; // // MoveDown // this.MoveDown.Name = "MoveDown"; - this.MoveDown.Size = new System.Drawing.Size(148, 22); + this.MoveDown.Size = new System.Drawing.Size(188, 30); this.MoveDown.Text = "下移"; this.MoveDown.Visible = false; // // RemoveLayer // this.RemoveLayer.Name = "RemoveLayer"; - this.RemoveLayer.Size = new System.Drawing.Size(148, 22); + this.RemoveLayer.Size = new System.Drawing.Size(188, 30); this.RemoveLayer.Text = "移除图层"; this.RemoveLayer.Visible = false; // // FeatureAddLayerMenuItem // this.FeatureAddLayerMenuItem.Name = "FeatureAddLayerMenuItem"; - this.FeatureAddLayerMenuItem.Size = new System.Drawing.Size(148, 22); + this.FeatureAddLayerMenuItem.Size = new System.Drawing.Size(188, 30); this.FeatureAddLayerMenuItem.Text = "目标图层"; this.FeatureAddLayerMenuItem.Visible = false; this.FeatureAddLayerMenuItem.Click += new System.EventHandler(this.FeatureAddLayerMenuItem_Click); @@ -1919,56 +1924,56 @@ // LayerSelectableMenuItem // this.LayerSelectableMenuItem.Name = "LayerSelectableMenuItem"; - this.LayerSelectableMenuItem.Size = new System.Drawing.Size(148, 22); + this.LayerSelectableMenuItem.Size = new System.Drawing.Size(188, 30); this.LayerSelectableMenuItem.Text = "可选择"; this.LayerSelectableMenuItem.Click += new System.EventHandler(this.LayerSelectableMenuItem_Click); // // LayerEditableMenuItem // this.LayerEditableMenuItem.Name = "LayerEditableMenuItem"; - this.LayerEditableMenuItem.Size = new System.Drawing.Size(148, 22); + this.LayerEditableMenuItem.Size = new System.Drawing.Size(188, 30); this.LayerEditableMenuItem.Text = "可编辑"; this.LayerEditableMenuItem.Click += new System.EventHandler(this.LayerEditableMenuItem_Click); // // SaveLayerMenuItem // this.SaveLayerMenuItem.Name = "SaveLayerMenuItem"; - this.SaveLayerMenuItem.Size = new System.Drawing.Size(148, 22); + this.SaveLayerMenuItem.Size = new System.Drawing.Size(188, 30); this.SaveLayerMenuItem.Text = "保存"; this.SaveLayerMenuItem.Click += new System.EventHandler(this.SaveLayerMenuItem_Click); // // SaveAsLayerMenuItem // this.SaveAsLayerMenuItem.Name = "SaveAsLayerMenuItem"; - this.SaveAsLayerMenuItem.Size = new System.Drawing.Size(148, 22); + this.SaveAsLayerMenuItem.Size = new System.Drawing.Size(188, 30); this.SaveAsLayerMenuItem.Text = "另存为..."; this.SaveAsLayerMenuItem.Visible = false; // // LayerOpaqueMenuItem // this.LayerOpaqueMenuItem.Name = "LayerOpaqueMenuItem"; - this.LayerOpaqueMenuItem.Size = new System.Drawing.Size(148, 22); + this.LayerOpaqueMenuItem.Size = new System.Drawing.Size(188, 30); this.LayerOpaqueMenuItem.Text = "图层透明度"; this.LayerOpaqueMenuItem.Visible = false; // // MenuItemObjectVisibleDist // this.MenuItemObjectVisibleDist.Name = "MenuItemObjectVisibleDist"; - this.MenuItemObjectVisibleDist.Size = new System.Drawing.Size(148, 22); + this.MenuItemObjectVisibleDist.Size = new System.Drawing.Size(188, 30); this.MenuItemObjectVisibleDist.Text = "对象可见距离"; this.MenuItemObjectVisibleDist.Visible = false; // // MenuItemVisiblePixelSize // this.MenuItemVisiblePixelSize.Name = "MenuItemVisiblePixelSize"; - this.MenuItemVisiblePixelSize.Size = new System.Drawing.Size(148, 22); + this.MenuItemVisiblePixelSize.Size = new System.Drawing.Size(188, 30); this.MenuItemVisiblePixelSize.Text = "对象可见像素"; this.MenuItemVisiblePixelSize.Visible = false; // // LayerFlyMenuItem // this.LayerFlyMenuItem.Name = "LayerFlyMenuItem"; - this.LayerFlyMenuItem.Size = new System.Drawing.Size(148, 22); + this.LayerFlyMenuItem.Size = new System.Drawing.Size(188, 30); this.LayerFlyMenuItem.Text = "定位"; this.LayerFlyMenuItem.Visible = false; this.LayerFlyMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); @@ -2037,37 +2042,39 @@ // // contextMenuStrip2 // + this.contextMenuStrip2.ImageScalingSize = new System.Drawing.Size(24, 24); this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripMenuItem1, this.删除ToolStripMenuItem1}); this.contextMenuStrip2.Name = "cmsMarker"; - this.contextMenuStrip2.Size = new System.Drawing.Size(125, 48); + this.contextMenuStrip2.Size = new System.Drawing.Size(153, 64); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(124, 22); + this.toolStripMenuItem1.Size = new System.Drawing.Size(152, 30); this.toolStripMenuItem1.Text = "刷新列表"; this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click); // // 删除ToolStripMenuItem1 // this.删除ToolStripMenuItem1.Name = "删除ToolStripMenuItem1"; - this.删除ToolStripMenuItem1.Size = new System.Drawing.Size(124, 22); + this.删除ToolStripMenuItem1.Size = new System.Drawing.Size(152, 30); this.删除ToolStripMenuItem1.Text = "移除所有"; this.删除ToolStripMenuItem1.Click += new System.EventHandler(this.删除ToolStripMenuItem1_Click); // // contextMenuStrip3 // + this.contextMenuStrip3.ImageScalingSize = new System.Drawing.Size(24, 24); this.contextMenuStrip3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripMenuItem2}); this.contextMenuStrip3.Name = "cmsMarker"; - this.contextMenuStrip3.Size = new System.Drawing.Size(101, 26); + this.contextMenuStrip3.Size = new System.Drawing.Size(117, 34); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(100, 22); + this.toolStripMenuItem2.Size = new System.Drawing.Size(116, 30); this.toolStripMenuItem2.Text = "删除"; this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // @@ -2083,39 +2090,40 @@ // // contextMenuStripDeleteLayerNode // + this.contextMenuStripDeleteLayerNode.ImageScalingSize = new System.Drawing.Size(24, 24); this.contextMenuStripDeleteLayerNode.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.删除ToolStripMenuItem2, this.可编辑ToolStripMenuItem, this.保存ToolStripMenuItem, this.定位ToolStripMenuItem}); this.contextMenuStripDeleteLayerNode.Name = "contextMenuStripDeleteLayerNode"; - this.contextMenuStripDeleteLayerNode.Size = new System.Drawing.Size(113, 92); + this.contextMenuStripDeleteLayerNode.Size = new System.Drawing.Size(135, 124); // // 删除ToolStripMenuItem2 // this.删除ToolStripMenuItem2.Name = "删除ToolStripMenuItem2"; - this.删除ToolStripMenuItem2.Size = new System.Drawing.Size(112, 22); + this.删除ToolStripMenuItem2.Size = new System.Drawing.Size(134, 30); this.删除ToolStripMenuItem2.Text = "删除"; this.删除ToolStripMenuItem2.Click += new System.EventHandler(this.删除ToolStripMenuItem2_Click); // // 可编辑ToolStripMenuItem // this.可编辑ToolStripMenuItem.Name = "可编辑ToolStripMenuItem"; - this.可编辑ToolStripMenuItem.Size = new System.Drawing.Size(112, 22); + this.可编辑ToolStripMenuItem.Size = new System.Drawing.Size(134, 30); this.可编辑ToolStripMenuItem.Text = "可编辑"; this.可编辑ToolStripMenuItem.Click += new System.EventHandler(this.可编辑ToolStripMenuItem_Click); // // 保存ToolStripMenuItem // this.保存ToolStripMenuItem.Name = "保存ToolStripMenuItem"; - this.保存ToolStripMenuItem.Size = new System.Drawing.Size(112, 22); + this.保存ToolStripMenuItem.Size = new System.Drawing.Size(134, 30); this.保存ToolStripMenuItem.Text = "保存"; this.保存ToolStripMenuItem.Click += new System.EventHandler(this.保存ToolStripMenuItem_Click); // // 定位ToolStripMenuItem // this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(112, 22); + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(134, 30); this.定位ToolStripMenuItem.Text = "定位"; this.定位ToolStripMenuItem.Visible = false; this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); @@ -2207,6 +2215,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = true; this.ribbonPanel1.Click += new System.EventHandler(this.ribbonPanel1_Click); // // ribbonBar21 @@ -2231,7 +2240,8 @@ this.buttonItem91, this.btnlegendSet, this.buttonItem89, - this.btnOutputJPG}); + this.btnOutputJPG + }); this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; this.ribbonBar21.Size = new System.Drawing.Size(514, 59); @@ -2296,6 +2306,7 @@ this.btnOutputJPG.SubItemsExpandWidth = 14; this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // // ribbonPanel15 // @@ -3006,6 +3017,7 @@ this.buttonItemHX1, this.buttonItemHX2, this.buttonItemDCTP, + this.hongxianMange, this.sliderItem3}); this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; @@ -3043,6 +3055,15 @@ this.buttonItemHX2.Text = "红线审核"; this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); // + // 红线管理 + // + this.hongxianMange.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.hongxianMange.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.hongxianMange.Name = "hongxianMange"; + this.hongxianMange.SubItemsExpandWidth = 14; + this.hongxianMange.Text = "红线管理"; + this.hongxianMange.Click += new System.EventHandler(this.hongxianMange_Click); + // // buttonItemDCTP // this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); @@ -3807,14 +3828,16 @@ dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewX1.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX1.RowHeadersWidth = 62; this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(1125, 61); + this.dataGridViewX1.Size = new System.Drawing.Size(1125, 52); this.dataGridViewX1.TabIndex = 13; this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); // // statusStrip2 // this.statusStrip2.BackColor = System.Drawing.Color.WhiteSmoke; + this.statusStrip2.ImageScalingSize = new System.Drawing.Size(24, 24); this.statusStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripNumbers, this.toolStripStatusLabel5, @@ -3829,9 +3852,9 @@ this.pageinfo, this.toolStripStatusLabel11, this.toolStripDropDownButton3}); - this.statusStrip2.Location = new System.Drawing.Point(0, 66); + this.statusStrip2.Location = new System.Drawing.Point(0, 57); this.statusStrip2.Name = "statusStrip2"; - this.statusStrip2.Size = new System.Drawing.Size(1125, 26); + this.statusStrip2.Size = new System.Drawing.Size(1125, 35); this.statusStrip2.SizingGrip = false; this.statusStrip2.TabIndex = 12; this.statusStrip2.Text = "statusStrip2"; @@ -3839,107 +3862,107 @@ // toolStripNumbers // this.toolStripNumbers.Name = "toolStripNumbers"; - this.toolStripNumbers.Size = new System.Drawing.Size(56, 21); + this.toolStripNumbers.Size = new System.Drawing.Size(82, 28); this.toolStripNumbers.Text = "管线类型"; // // toolStripStatusLabel5 // this.toolStripStatusLabel5.Name = "toolStripStatusLabel5"; - this.toolStripStatusLabel5.Size = new System.Drawing.Size(15, 21); + this.toolStripStatusLabel5.Size = new System.Drawing.Size(20, 28); this.toolStripStatusLabel5.Text = " |"; // // firstpage // this.firstpage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); this.firstpage.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) - | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) - | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); + | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) + | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); this.firstpage.BorderStyle = System.Windows.Forms.Border3DStyle.RaisedOuter; this.firstpage.Name = "firstpage"; - this.firstpage.Size = new System.Drawing.Size(36, 21); + this.firstpage.Size = new System.Drawing.Size(50, 28); this.firstpage.Text = "首页"; // // toolStripStatusLabel3 // this.toolStripStatusLabel3.Name = "toolStripStatusLabel3"; - this.toolStripStatusLabel3.Size = new System.Drawing.Size(11, 21); + this.toolStripStatusLabel3.Size = new System.Drawing.Size(15, 28); this.toolStripStatusLabel3.Text = "|"; // // prepage // this.prepage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); this.prepage.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) - | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) - | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); + | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) + | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); this.prepage.BorderStyle = System.Windows.Forms.Border3DStyle.RaisedOuter; this.prepage.Name = "prepage"; - this.prepage.Size = new System.Drawing.Size(48, 21); + this.prepage.Size = new System.Drawing.Size(68, 28); this.prepage.Text = "上一页"; // // toolStripStatusLabel7 // this.toolStripStatusLabel7.Name = "toolStripStatusLabel7"; - this.toolStripStatusLabel7.Size = new System.Drawing.Size(11, 21); + this.toolStripStatusLabel7.Size = new System.Drawing.Size(15, 28); this.toolStripStatusLabel7.Text = "|"; // // nextpage // this.nextpage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); this.nextpage.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) - | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) - | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); + | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) + | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); this.nextpage.BorderStyle = System.Windows.Forms.Border3DStyle.RaisedOuter; this.nextpage.Name = "nextpage"; - this.nextpage.Size = new System.Drawing.Size(48, 21); + this.nextpage.Size = new System.Drawing.Size(68, 28); this.nextpage.Text = "下一页"; // // toolStripStatusLabel9 // this.toolStripStatusLabel9.Name = "toolStripStatusLabel9"; - this.toolStripStatusLabel9.Size = new System.Drawing.Size(11, 21); + this.toolStripStatusLabel9.Size = new System.Drawing.Size(15, 28); this.toolStripStatusLabel9.Text = "|"; // // lastpage // this.lastpage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); this.lastpage.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) - | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) - | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); + | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) + | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); this.lastpage.BorderStyle = System.Windows.Forms.Border3DStyle.RaisedOuter; this.lastpage.Name = "lastpage"; - this.lastpage.Size = new System.Drawing.Size(36, 21); + this.lastpage.Size = new System.Drawing.Size(50, 28); this.lastpage.Text = "末页"; // // toolStripStatusLabel1 // this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(11, 21); + this.toolStripStatusLabel1.Size = new System.Drawing.Size(15, 28); this.toolStripStatusLabel1.Text = "|"; // // pageinfo // this.pageinfo.Name = "pageinfo"; - this.pageinfo.Size = new System.Drawing.Size(37, 21); + this.pageinfo.Size = new System.Drawing.Size(54, 28); this.pageinfo.Text = "共*页"; // // toolStripStatusLabel11 // this.toolStripStatusLabel11.Name = "toolStripStatusLabel11"; - this.toolStripStatusLabel11.Size = new System.Drawing.Size(11, 21); + this.toolStripStatusLabel11.Size = new System.Drawing.Size(15, 28); this.toolStripStatusLabel11.Text = "|"; // // toolStripDropDownButton3 // this.toolStripDropDownButton3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(246)))), ((int)(((byte)(253))))); this.toolStripDropDownButton3.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) - | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) - | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); + | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) + | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); this.toolStripDropDownButton3.BorderStyle = System.Windows.Forms.Border3DStyle.RaisedInner; this.toolStripDropDownButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.toolStripDropDownButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton3.Image"))); this.toolStripDropDownButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton3.Name = "toolStripDropDownButton3"; - this.toolStripDropDownButton3.Size = new System.Drawing.Size(75, 21); + this.toolStripDropDownButton3.Size = new System.Drawing.Size(108, 28); this.toolStripDropDownButton3.Text = "导出xls文件"; this.toolStripDropDownButton3.Visible = false; this.toolStripDropDownButton3.Click += new System.EventHandler(this.toolStripDropDownButton3_Click); @@ -3984,6 +4007,7 @@ this.miniToolStrip.AutoSize = false; this.miniToolStrip.BackColor = System.Drawing.Color.WhiteSmoke; this.miniToolStrip.Dock = System.Windows.Forms.DockStyle.None; + this.miniToolStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.miniToolStrip.Location = new System.Drawing.Point(0, 0); this.miniToolStrip.Name = "miniToolStrip"; this.miniToolStrip.Size = new System.Drawing.Size(1125, 22); @@ -4090,7 +4114,7 @@ // this.textBoxHorizontalDistance.Location = new System.Drawing.Point(99, 104); this.textBoxHorizontalDistance.Name = "textBoxHorizontalDistance"; - this.textBoxHorizontalDistance.Size = new System.Drawing.Size(81, 21); + this.textBoxHorizontalDistance.Size = new System.Drawing.Size(81, 28); this.textBoxHorizontalDistance.TabIndex = 19; this.textBoxHorizontalDistance.Text = "1"; // @@ -4139,7 +4163,7 @@ // this.textBoxVerticalDistance.Location = new System.Drawing.Point(99, 71); this.textBoxVerticalDistance.Name = "textBoxVerticalDistance"; - this.textBoxVerticalDistance.Size = new System.Drawing.Size(81, 21); + this.textBoxVerticalDistance.Size = new System.Drawing.Size(81, 28); this.textBoxVerticalDistance.TabIndex = 15; this.textBoxVerticalDistance.Text = "1"; // @@ -4161,7 +4185,7 @@ this.dataGridViewLineList.AllowUserToAddRows = false; this.dataGridViewLineList.AllowUserToDeleteRows = false; this.dataGridViewLineList.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + | System.Windows.Forms.AnchorStyles.Right))); this.dataGridViewLineList.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; @@ -4196,6 +4220,7 @@ dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewLineList.RowHeadersDefaultCellStyle = dataGridViewCellStyle6; this.dataGridViewLineList.RowHeadersVisible = false; + this.dataGridViewLineList.RowHeadersWidth = 62; this.dataGridViewLineList.RowTemplate.Height = 23; this.dataGridViewLineList.Size = new System.Drawing.Size(0, 92); this.dataGridViewLineList.TabIndex = 11; @@ -4217,10 +4242,10 @@ // listBoxStasticsResult // this.listBoxStasticsResult.FormattingEnabled = true; - this.listBoxStasticsResult.ItemHeight = 12; + this.listBoxStasticsResult.ItemHeight = 18; this.listBoxStasticsResult.Location = new System.Drawing.Point(7, 458); this.listBoxStasticsResult.Name = "listBoxStasticsResult"; - this.listBoxStasticsResult.Size = new System.Drawing.Size(198, 16); + this.listBoxStasticsResult.Size = new System.Drawing.Size(198, 4); this.listBoxStasticsResult.TabIndex = 0; // // labelX5 @@ -4268,7 +4293,7 @@ this.dataGridViewAnalysisResult.AllowUserToAddRows = false; this.dataGridViewAnalysisResult.AllowUserToDeleteRows = false; this.dataGridViewAnalysisResult.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + | System.Windows.Forms.AnchorStyles.Right))); this.dataGridViewAnalysisResult.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; @@ -4307,6 +4332,7 @@ dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewAnalysisResult.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; this.dataGridViewAnalysisResult.RowHeadersVisible = false; + this.dataGridViewAnalysisResult.RowHeadersWidth = 62; this.dataGridViewAnalysisResult.RowTemplate.Height = 23; this.dataGridViewAnalysisResult.Size = new System.Drawing.Size(0, 127); this.dataGridViewAnalysisResult.TabIndex = 5; @@ -4393,6 +4419,7 @@ this.comboBoxLayer.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.Enabled = false; + this.comboBoxLayer.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; this.comboBoxLayer.Location = new System.Drawing.Point(80, 38); @@ -4508,7 +4535,7 @@ // this.textBoxX2.Location = new System.Drawing.Point(83, 67); this.textBoxX2.Name = "textBoxX2"; - this.textBoxX2.Size = new System.Drawing.Size(81, 21); + this.textBoxX2.Size = new System.Drawing.Size(81, 28); this.textBoxX2.TabIndex = 15; this.textBoxX2.Text = "1"; // @@ -4530,7 +4557,7 @@ this.dataGridViewX2.AllowUserToAddRows = false; this.dataGridViewX2.AllowUserToDeleteRows = false; this.dataGridViewX2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + | System.Windows.Forms.AnchorStyles.Right))); this.dataGridViewX2.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; @@ -4565,8 +4592,9 @@ dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; + this.dataGridViewX2.RowHeadersWidth = 62; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(59890, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(60484, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4586,10 +4614,10 @@ // listBox1 // this.listBox1.FormattingEnabled = true; - this.listBox1.ItemHeight = 12; + this.listBox1.ItemHeight = 18; this.listBox1.Location = new System.Drawing.Point(11, 430); this.listBox1.Name = "listBox1"; - this.listBox1.Size = new System.Drawing.Size(198, 16); + this.listBox1.Size = new System.Drawing.Size(198, 4); this.listBox1.TabIndex = 0; // // labelX2 @@ -4637,7 +4665,7 @@ this.dataGridViewX3.AllowUserToAddRows = false; this.dataGridViewX3.AllowUserToDeleteRows = false; this.dataGridViewX3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + | System.Windows.Forms.AnchorStyles.Right))); this.dataGridViewX3.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control; @@ -4675,8 +4703,9 @@ dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; + this.dataGridViewX3.RowHeadersWidth = 62; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(59889, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(60483, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -4754,6 +4783,7 @@ this.comboBoxEx1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxEx1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxEx1.Enabled = false; + this.comboBoxEx1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.comboBoxEx1.FormattingEnabled = true; this.comboBoxEx1.ItemHeight = 15; this.comboBoxEx1.Location = new System.Drawing.Point(83, 34); @@ -4892,7 +4922,7 @@ // this.textBoxX4.Location = new System.Drawing.Point(81, 393); this.textBoxX4.Name = "textBoxX4"; - this.textBoxX4.Size = new System.Drawing.Size(87, 21); + this.textBoxX4.Size = new System.Drawing.Size(87, 28); this.textBoxX4.TabIndex = 16; this.textBoxX4.Text = "1"; // @@ -4914,7 +4944,7 @@ this.dataGridViewX8.AllowUserToAddRows = false; this.dataGridViewX8.AllowUserToDeleteRows = false; this.dataGridViewX8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + | System.Windows.Forms.AnchorStyles.Right))); this.dataGridViewX8.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control; @@ -4949,6 +4979,7 @@ dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewX8.RowHeadersDefaultCellStyle = dataGridViewCellStyle18; this.dataGridViewX8.RowHeadersVisible = false; + this.dataGridViewX8.RowHeadersWidth = 62; this.dataGridViewX8.RowTemplate.Height = 23; this.dataGridViewX8.Size = new System.Drawing.Size(0, 92); this.dataGridViewX8.TabIndex = 11; @@ -4970,10 +5001,10 @@ // listBox3 // this.listBox3.FormattingEnabled = true; - this.listBox3.ItemHeight = 12; + this.listBox3.ItemHeight = 18; this.listBox3.Location = new System.Drawing.Point(8, 761); this.listBox3.Name = "listBox3"; - this.listBox3.Size = new System.Drawing.Size(195, 16); + this.listBox3.Size = new System.Drawing.Size(195, 4); this.listBox3.TabIndex = 0; // // labelX11 @@ -5022,7 +5053,7 @@ this.dataGridViewX9.AllowUserToAddRows = false; this.dataGridViewX9.AllowUserToDeleteRows = false; this.dataGridViewX9.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + | System.Windows.Forms.AnchorStyles.Right))); this.dataGridViewX9.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; @@ -5060,6 +5091,7 @@ dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewX9.RowHeadersDefaultCellStyle = dataGridViewCellStyle21; this.dataGridViewX9.RowHeadersVisible = false; + this.dataGridViewX9.RowHeadersWidth = 62; this.dataGridViewX9.RowTemplate.Height = 23; this.dataGridViewX9.Size = new System.Drawing.Size(0, 127); this.dataGridViewX9.TabIndex = 5; @@ -5150,6 +5182,7 @@ this.comboBoxEx4.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxEx4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxEx4.Enabled = false; + this.comboBoxEx4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.comboBoxEx4.FormattingEnabled = true; this.comboBoxEx4.ItemHeight = 15; this.comboBoxEx4.Location = new System.Drawing.Point(81, 361); @@ -5313,10 +5346,10 @@ // listBox2 // this.listBox2.FormattingEnabled = true; - this.listBox2.ItemHeight = 12; + this.listBox2.ItemHeight = 18; this.listBox2.Location = new System.Drawing.Point(9, 389); this.listBox2.Name = "listBox2"; - this.listBox2.Size = new System.Drawing.Size(192, 16); + this.listBox2.Size = new System.Drawing.Size(192, 4); this.listBox2.TabIndex = 0; // // dataGridViewX4 @@ -5324,7 +5357,7 @@ this.dataGridViewX4.AllowUserToAddRows = false; this.dataGridViewX4.AllowUserToDeleteRows = false; this.dataGridViewX4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + | System.Windows.Forms.AnchorStyles.Right))); this.dataGridViewX4.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; @@ -5359,6 +5392,7 @@ dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewX4.RowHeadersDefaultCellStyle = dataGridViewCellStyle24; this.dataGridViewX4.RowHeadersVisible = false; + this.dataGridViewX4.RowHeadersWidth = 62; this.dataGridViewX4.RowTemplate.Height = 23; this.dataGridViewX4.Size = new System.Drawing.Size(0, 92); this.dataGridViewX4.TabIndex = 3; @@ -5423,7 +5457,7 @@ this.dataGridViewX5.AllowUserToAddRows = false; this.dataGridViewX5.AllowUserToDeleteRows = false; this.dataGridViewX5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + | System.Windows.Forms.AnchorStyles.Right))); this.dataGridViewX5.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control; @@ -5460,6 +5494,7 @@ dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewX5.RowHeadersDefaultCellStyle = dataGridViewCellStyle27; this.dataGridViewX5.RowHeadersVisible = false; + this.dataGridViewX5.RowHeadersWidth = 62; this.dataGridViewX5.RowTemplate.Height = 23; this.dataGridViewX5.Size = new System.Drawing.Size(0, 127); this.dataGridViewX5.TabIndex = 5; @@ -5516,6 +5551,7 @@ this.comboBoxEx2.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxEx2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxEx2.Enabled = false; + this.comboBoxEx2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.comboBoxEx2.FormattingEnabled = true; this.comboBoxEx2.ItemHeight = 15; this.comboBoxEx2.Location = new System.Drawing.Point(85, 32); @@ -5620,7 +5656,7 @@ // this.textBoxX3.Location = new System.Drawing.Point(80, 57); this.textBoxX3.Name = "textBoxX3"; - this.textBoxX3.Size = new System.Drawing.Size(86, 21); + this.textBoxX3.Size = new System.Drawing.Size(86, 28); this.textBoxX3.TabIndex = 16; this.textBoxX3.Text = "1"; // @@ -5642,7 +5678,7 @@ this.dataGridViewX6.AllowUserToAddRows = false; this.dataGridViewX6.AllowUserToDeleteRows = false; this.dataGridViewX6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + | System.Windows.Forms.AnchorStyles.Right))); this.dataGridViewX6.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control; @@ -5677,6 +5713,7 @@ dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewX6.RowHeadersDefaultCellStyle = dataGridViewCellStyle30; this.dataGridViewX6.RowHeadersVisible = false; + this.dataGridViewX6.RowHeadersWidth = 62; this.dataGridViewX6.RowTemplate.Height = 23; this.dataGridViewX6.Size = new System.Drawing.Size(0, 92); this.dataGridViewX6.TabIndex = 3; @@ -5741,7 +5778,7 @@ this.dataGridViewX7.AllowUserToAddRows = false; this.dataGridViewX7.AllowUserToDeleteRows = false; this.dataGridViewX7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + | System.Windows.Forms.AnchorStyles.Right))); this.dataGridViewX7.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control; @@ -5777,6 +5814,7 @@ dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewX7.RowHeadersDefaultCellStyle = dataGridViewCellStyle33; this.dataGridViewX7.RowHeadersVisible = false; + this.dataGridViewX7.RowHeadersWidth = 62; this.dataGridViewX7.RowTemplate.Height = 23; this.dataGridViewX7.Size = new System.Drawing.Size(0, 127); this.dataGridViewX7.TabIndex = 5; @@ -5835,6 +5873,7 @@ this.comboBoxEx3.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxEx3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxEx3.Enabled = false; + this.comboBoxEx3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.comboBoxEx3.FormattingEnabled = true; this.comboBoxEx3.ItemHeight = 15; this.comboBoxEx3.Location = new System.Drawing.Point(80, 28); @@ -5978,6 +6017,7 @@ this.Controls.Add(this.dockSite6); this.Controls.Add(this.dockSite7); this.Controls.Add(this.dockSite8); + this.DoubleBuffered = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.IsMdiContainer = true; this.KeyPreview = true; @@ -6074,6 +6114,7 @@ private ButtonItem btnlegendSet; private ButtonItem buttonItem1; private ButtonItem btnOutputJPG; + private ButtonItem hongxianMange; private RibbonTabItem ribbonTabItem1; private ButtonItem buttonItem19; private SideBar sideBar1;