diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index c8e0001..41f3338 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index c8e0001..41f3338 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/MainFrm.cs b/MainFrm.cs
index 9bfb70e..d6345f9 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -130,8 +130,8 @@
FrmWait frmWait = null;//一键审核等待窗口
//FrmWait frmWait2 = null;//文档操作等待窗口
- float mouseDownX1,mouseDownY1;
- float mouseDownX2,mouseDownY2;
+ float mouseDownX1, mouseDownY1;
+ float mouseDownX2, mouseDownY2;
///
///
///
@@ -188,7 +188,7 @@
RigthMenuSet();
MenuSet();
-
+
}
///
/// 右屏中添加管纵图片
@@ -731,7 +731,7 @@
}
else
{
-
+
if (Utility.userRole.IndexOf("用户管理") < 0)
{
btn_user_info.Visible = false;
@@ -943,7 +943,7 @@
sliderItem1.Value = optiValue;
sliderItem2.Value = optiValue;
sliderItem3.Value = optiValue;
-
+
}
//初始化地球控件
@@ -1134,8 +1134,8 @@
Thread t1 = new Thread(new ThreadStart(doLoadDataForGlobalControl1));
t1.IsBackground = true;
t1.Start();
-
-
+
+
}
delegate void LoadDataForGlobalControl();
@@ -1412,14 +1412,14 @@
this.initMarkerTree();
this.initLayout();
this.loadData();
-
-
+
+
double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]);
double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]);
double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]);
jumpToCameraState(x, y, z);
-
+
}
#endregion
@@ -2132,7 +2132,7 @@
globeControl1.SwapBuffer();
Point pt1 = new Point(Convert.ToInt32(e.StartPos.X), Convert.ToInt32(e.StartPos.Y));
Point pt2 = new Point(Convert.ToInt32(e.EndPos.X), Convert.ToInt32(e.EndPos.Y));
-
+
/*Point pt = getUpperLeftPoint(pt1, pt2);
Image myImg = new Bitmap(Convert.ToInt32(e.Rect.Width), Convert.ToInt32(e.Rect.Height));
Graphics g = Graphics.FromImage(myImg);
@@ -2340,18 +2340,18 @@
{
if (e.Button == MouseButtons.Right && e.Node.Tag.ToString().Contains("|"))
{
-
+
if (e.Node.Tag.ToString().Split('|')[0] == "locaserver")
{
-
+
foreach (ToolStripItem item in layerNodeContexMenu.Items)
{
item.Visible = false;
}
return;
-
+
}
-
+
if (e.Node.Tag.ToString().Split('|')[0] == "new")
{
LayerEditableMenuItem.Enabled = true;
@@ -2418,7 +2418,7 @@
GSOLayer layer = node.Tag as GSOLayer;
//globeControl1.Globe.Layers.Remove(layer);
- for (int i = globeControl1.Globe.Layers.Count-1; i >=0; i--)
+ for (int i = globeControl1.Globe.Layers.Count - 1; i >= 0; i--)
{
if (globeControl1.Globe.Layers[i].Caption == layer.Caption)
{
@@ -2526,7 +2526,7 @@
private void layerTree_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEventArgs e)
{
- if(this.layerTree.SelectedNode!=null)
+ if (this.layerTree.SelectedNode != null)
{
if (this.layerTree.SelectedNode.Tag.ToString().Contains("|"))
{
@@ -2547,7 +2547,8 @@
}
globeControl1.Refresh();
}
- else {
+ else
+ {
double x = layer.LatLonBounds.Center.X;
double y = layer.LatLonBounds.Center.Y;
globeControl1.Globe.FlyToPosition(new GSOPoint3d(x, y, 0), EnumAltitudeMode.Absolute);
@@ -2652,12 +2653,12 @@
void globeControl1_TrackPolylineEndEvent(object sender, TrackPolylineEndEventArgs e)
{
//横断面分析、道路横断面分析
- if (trackPolylineEndMode == EnumTrackPolylineEndMode.HDM_Analysis||
+ if (trackPolylineEndMode == EnumTrackPolylineEndMode.HDM_Analysis ||
trackPolylineEndMode == EnumTrackPolylineEndMode.DLDM_Analysis)
{
Dictionary hdmDic = SectionAnalysisTool.HDMAnalysis(this.globeControl1,
e.Polyline, this.m_PipelineLayerNames);
- FrmHDMAnalysis3 frm = new FrmHDMAnalysis3(hdmDic, this.globeControl1,
+ FrmHDMAnalysis3 frm = new FrmHDMAnalysis3(hdmDic, this.globeControl1,
trackPolylineEndMode);
frm.Show(this);
}
@@ -2894,7 +2895,7 @@
switch (trackflag)
{
case "valvequery":
- FrmValveStatistics frm = new FrmValveStatistics(globeControl1,polygon, new DataGridViewDelegate(InitDataGridViewX1));
+ FrmValveStatistics frm = new FrmValveStatistics(globeControl1, polygon, new DataGridViewDelegate(InitDataGridViewX1));
frm.Show(this);
//panelEx6.Visible = true;
toolStripFeatureLength.Text = "";
@@ -2902,15 +2903,15 @@
break;
case "PipelineDistanceStatistics":
-
+
FrmAllPipelineStatis frm1 = new FrmAllPipelineStatis(globeControl1, polygon, new DataGridViewDelegate(InitDataGridViewX1), m_PipelineLayerNames);
frm1.Show(this);
globeControl1.Globe.Action = EnumAction3D.ActionNull;
break;
case "PipelineSpatialQuery":
-
- FrmAllPipelineStatis.ShowForm(globeControl1,polygon,new DataGridViewDelegate(InitDataGridViewX1),m_PipelineLayerNames);
+
+ FrmAllPipelineStatis.ShowForm(globeControl1, polygon, new DataGridViewDelegate(InitDataGridViewX1), m_PipelineLayerNames);
globeControl1.Globe.ClearAnalysis();
globeControl1.Globe.Action = EnumAction3D.ActionNull;
@@ -2970,7 +2971,7 @@
//listBSQ.Add(bsqFeatures);
//FrmBSQDuoBianXingStatis bsqFrm = new FrmBSQDuoBianXingStatis(workWellLen, globeControl1, listBSQ);
- FrmBSQStatis bsqFrm = new FrmBSQStatis(globeControl1,e.Polygon);
+ FrmBSQStatis bsqFrm = new FrmBSQStatis(globeControl1, e.Polygon);
bsqFrm.Show(this);
globeControl1.Globe.Action = EnumAction3D.ActionNull;
break;
@@ -3088,7 +3089,7 @@
{
if (e.Button == MouseButtons.Left)
{
-
+
if (m_AddPipeLine == true && globeControl1.Globe.Action == EnumAction3D.DrawPolyline)//添加管线
{
GSOLayer layerDest = globeControl1.Globe.DestLayerFeatureAdd;
@@ -3271,7 +3272,7 @@
m_isDrawRedPology = false;
globeControl1.Globe.Action = EnumAction3D.ActionNull;
-
+
}
}
@@ -3685,7 +3686,7 @@
///
///
///
- private string GetBubbleInfo(GSOFeature feature,GSOGlobeControl globeControl)
+ private string GetBubbleInfo(GSOFeature feature, GSOGlobeControl globeControl)
{
if (feature == null)
{
@@ -3837,7 +3838,7 @@
{
name2 += "_米";
}
- value2 = dl2.ToString("0.00");
+ value2 = dl2.ToString("0.00");
}
else
{
@@ -4164,7 +4165,7 @@
sideBarPanelItem3.Visible = false;
layerTree.Visible = false;
controlContainerItem3.Visible = false;
-
+
//修改图层管理与标注管理、覆土审查、水平净距分析、垂直净距分析和碰撞分析控件之间的逻辑关系
controlContainerItem5.Visible = false;
sideBar1.Visible = false;
@@ -4186,7 +4187,7 @@
}
*/
Refresh();
-
+
}
}
///
@@ -4239,7 +4240,7 @@
int widthFull = Screen.PrimaryScreen.Bounds.Width;
int heightFull = Screen.PrimaryScreen.Bounds.Height;
-
+
this.FormBorderStyle = FormBorderStyle.None;
this.WindowState = FormWindowState.Normal;
@@ -4549,12 +4550,12 @@
{
double featurelength = PipeLength(currentLayer, 0);// 统计管线的里程数
- toolStripNumbers.Text =currentLayer + " | 共有:" + Convert.ToString(dataCount - 1) + "条记录";
+ toolStripNumbers.Text = currentLayer + " | 共有:" + Convert.ToString(dataCount - 1) + "条记录";
toolStripFeatureLength.Text = " 管线里程:" + featurelength.ToString("0.00") + " 米";
}
else
{
- toolStripNumbers.Text =currentLayer + "| 共有:" + 0 + " 条记录 | ";
+ toolStripNumbers.Text = currentLayer + "| 共有:" + 0 + " 条记录 | ";
}
}
@@ -4707,7 +4708,7 @@
count = 0;
}
}
-
+
///
/// 绘制线 菜单
///
@@ -4885,10 +4886,10 @@
if (globeControl1.Globe.Action != EnumAction3D.NormalHit)
{
buttonItemFX3_6.Checked = false;
- // ClearConnexityAnalysis();
+ // ClearConnexityAnalysis();
buttonItemFX3_5.Checked = false;
- // ClearCloseValvesAnalysis();
+ // ClearCloseValvesAnalysis();
}
if (globeControl1.Globe.Action != EnumAction3D.TrackPolygon)
{
@@ -4909,15 +4910,16 @@
{
e.Cancel = true;
}
- else {
+ else
+ {
globeControl1.Globe.MemoryLayer.SaveAs(Application.StartupPath + "/MyPlace.kml");
}
-
+
//saveLayerList(layerManagerNode.Nodes);
//注销id号为103的热键设定
// UnregisterHotKey(Handle, 103);
}
-
+
///
/// 显示流向 功能
///
@@ -6309,7 +6311,7 @@
globeControl1.Globe.RemoveAllPits();
}
-
+
//}
///
/// 大气层 菜单
@@ -6442,57 +6444,57 @@
///
/// 刷新目录树 功能
///
- private void RefreshDataTree()
- {
- layerTree.Nodes[0].Nodes.Clear();
- Int32 nCount = globeControl1.Globe.DataManager.DataSourceCount;
- Int32 i = 0;
- for (i = 0; i < nCount; i++)
- {
- GSODataSource dataSpace = globeControl1.Globe.DataManager[i];
- TreeNode node = new TreeNode();
- node.Text = dataSpace.Name;
- node.ImageIndex = 0;
- node.SelectedImageIndex = 0;
- node.Checked = true;
- node.Tag = dataSpace;
- Int32 nDatasetCount = dataSpace.DatasetCount;
- for (Int32 j = 0; j < nDatasetCount; j++)
- {
- GSODataset dataset = dataSpace[j];
- TreeNode subNode = new TreeNode();
- subNode.Text = dataset.Name;
- subNode.ImageIndex = 0;
- subNode.SelectedImageIndex = 0;
- subNode.Checked = true;
- subNode.Tag = dataset;
- node.Nodes.Add(subNode);
- }
- layerTree.Nodes[0].Nodes.Add(node);
- }
- }
+ //private void RefreshDataTree()
+ //{
+ // layerTree.Nodes[0].Nodes.Clear();
+ // Int32 nCount = globeControl1.Globe.DataManager.DataSourceCount;
+ // Int32 i = 0;
+ // for (i = 0; i < nCount; i++)
+ // {
+ // GSODataSource dataSpace = globeControl1.Globe.DataManager[i];
+ // TreeNode node = new TreeNode();
+ // node.Text = dataSpace.Name;
+ // node.ImageIndex = 0;
+ // node.SelectedImageIndex = 0;
+ // node.Checked = true;
+ // node.Tag = dataSpace;
+ // Int32 nDatasetCount = dataSpace.DatasetCount;
+ // for (Int32 j = 0; j < nDatasetCount; j++)
+ // {
+ // GSODataset dataset = dataSpace[j];
+ // TreeNode subNode = new TreeNode();
+ // subNode.Text = dataset.Name;
+ // subNode.ImageIndex = 0;
+ // subNode.SelectedImageIndex = 0;
+ // subNode.Checked = true;
+ // subNode.Tag = dataset;
+ // node.Nodes.Add(subNode);
+ // }
+ // layerTree.Nodes[0].Nodes.Add(node);
+ // }
+ //}
///
/// 判断图层是否包含字段列表
///
///
///
- private bool HasFields(string layerName)
- {
- GSOLayer m_layer = globeControl1.Globe.Layers.GetLayerByCaption(layerName);//获取当前选择的layer图层
- if (m_layer == null)
- return false;
- GSOFeatureLayer flayer = m_layer as GSOFeatureLayer;
+ //private bool HasFields(string layerName)
+ //{
+ // GSOLayer m_layer = globeControl1.Globe.Layers.GetLayerByCaption(layerName);//获取当前选择的layer图层
+ // if (m_layer == null)
+ // return false;
+ // GSOFeatureLayer flayer = m_layer as GSOFeatureLayer;
- GSOFeatureDataset _featureDataSet = m_layer.Dataset as GSOFeatureDataset;
- if (_featureDataSet == null)
- return false;
+ // GSOFeatureDataset _featureDataSet = m_layer.Dataset as GSOFeatureDataset;
+ // if (_featureDataSet == null)
+ // return false;
- _featureDataSet.Open();
- if (_featureDataSet.FieldCount > 0)
- return true;
- else
- return false;
- }
+ // _featureDataSet.Open();
+ // if (_featureDataSet.FieldCount > 0)
+ // return true;
+ // else
+ // return false;
+ //}
///
/// 统计指定图层在指定范围内的所有feature对象
@@ -6500,27 +6502,27 @@
///
///
///
- private GSOFeatures Intersect_PointLayer(GSOGeoPolygon3D polygon, string pointLayerName)
- {
- GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pointLayerName);
- if (layer == null)
- return null;
+ //private GSOFeatures Intersect_PointLayer(GSOGeoPolygon3D polygon, string pointLayerName)
+ //{
+ // GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pointLayerName);
+ // if (layer == null)
+ // return null;
- GSOFeatureLayer flayer = layer as GSOFeatureLayer;
- GSOFeatureDataset fdataset = flayer.Dataset as GSOFeatureDataset;
- GSOFeatures feats;
- if (polygon == null)
- {
- feats = flayer.GetAllFeatures();
- }
- else
- {
- feats = flayer.FindFeaturesInPolygon(polygon, false);
- }
+ // GSOFeatureLayer flayer = layer as GSOFeatureLayer;
+ // GSOFeatureDataset fdataset = flayer.Dataset as GSOFeatureDataset;
+ // GSOFeatures feats;
+ // if (polygon == null)
+ // {
+ // feats = flayer.GetAllFeatures();
+ // }
+ // else
+ // {
+ // feats = flayer.FindFeaturesInPolygon(polygon, false);
+ // }
- workWellLen.Add(pointLayerName, feats.Length);
- return feats;
- }
+ // workWellLen.Add(pointLayerName, feats.Length);
+ // return feats;
+ //}
///
/// 碰撞分析功能界面中 选择管线复选框 选中状态改变事件处理
///
@@ -6633,7 +6635,7 @@
}
}
}
-
+
if (globeControl1.Globe.Action == EnumAction3D.SelectObject)
{
globeControl1.Globe.Action = EnumAction3D.ActionNull;
@@ -7928,7 +7930,7 @@
FrmAccessoriesSensor.ShowForm(globeControl1, instrumenLayerNames, 1);
}
-
+
///
/// 碰撞分析 功能界面中 关闭按钮 事件处理
///
@@ -7952,7 +7954,7 @@
}
else
{
- sideBar1.Visible = false;
+ sideBar1.Visible = false;
}
Refresh();
@@ -8632,7 +8634,7 @@
MessageBox.Show("内存过载请清理内存,并重新启动规划分析!", "提示");
return;
}
-
+
}
///
@@ -8695,7 +8697,7 @@
LogManager.saveLog(Utility.userName, this.buttonItem128.Text);
//垂直净距标准
- frmSh = new FrmYJSHTC(globeControl1, globeControl2,layerTree);
+ frmSh = new FrmYJSHTC(globeControl1, globeControl2, layerTree);
if (frmSh.ShowDialog() == DialogResult.OK)
{
@@ -8716,33 +8718,33 @@
double dVerticalJingJuBiaoZhun = 1, dHorizontalJingJuBiaoZhun = 1;
if (frmSh.rukuLayer != null)
{
- #region
+ #region
this.Invoke((EventHandler)delegate
- {
- try
- {
- List managerLayerList = new List();
- for (int i = 0; i < layerManagerNode.Nodes.Count; i++)
- {
- managerLayerList.Add(layerManagerNode.Nodes[i].Text);
- }
- if (!managerLayerList.Contains(frmSh.rukuLayer.Caption))
- {
- TreeNode node = new TreeNode();
- node.Tag = frmSh.rukuLayer;
- node.Text = frmSh.rukuLayer.Dataset.Caption;
- node.ImageIndex = 0;
- node.SelectedImageIndex = 0;
- node.Checked = frmSh.rukuLayer.Visible;
- layerManagerNode.Nodes.Insert(0, node);
- layerManagerNode.Expand();
- }
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message, "提示");
- }
- });
+ {
+ try
+ {
+ List managerLayerList = new List();
+ for (int i = 0; i < layerManagerNode.Nodes.Count; i++)
+ {
+ managerLayerList.Add(layerManagerNode.Nodes[i].Text);
+ }
+ if (!managerLayerList.Contains(frmSh.rukuLayer.Caption))
+ {
+ TreeNode node = new TreeNode();
+ node.Tag = frmSh.rukuLayer;
+ node.Text = frmSh.rukuLayer.Dataset.Caption;
+ node.ImageIndex = 0;
+ node.SelectedImageIndex = 0;
+ node.Checked = frmSh.rukuLayer.Visible;
+ layerManagerNode.Nodes.Insert(0, node);
+ layerManagerNode.Expand();
+ }
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message, "提示");
+ }
+ });
#endregion
shlayername = frmSh.rukuLayer.Name;
@@ -8805,11 +8807,11 @@
}
else
{
-
+
}
}
-
+
///
/// 清除渲染结果
///
@@ -8890,7 +8892,7 @@
private void buttonItem134_Click_1(object sender, EventArgs e)
{
LogManager.saveLog(Utility.userName, "模拟设计修改");
-
+
frmModify = new FrmMnModify(globeControl1, shlayername, shresultLists);
if (boolfrmModify == false)
@@ -9149,7 +9151,7 @@
{
layer.Opaque = 100 - sliderItem1.Value;
}
-
+
optiValue = sliderItem1.Value;
}
///
@@ -9449,9 +9451,9 @@
buttonClearAnalysisResult_Click(null, null);
NetworkAnalysisTool.ClearAllTopAnalysis(this.globeControl1);
- // ClearConnexityAnalysis();//清除连通性分析
- // ClearCloseValvesAnalysis();//清除阀门分析
-
+ // ClearConnexityAnalysis();//清除连通性分析
+ // ClearCloseValvesAnalysis();//清除阀门分析
+
//清除管线间距分析
if (disFeature != null)
{
@@ -9474,7 +9476,7 @@
globeControl1.Globe.UnderGroundFloor.Visible = false;//隐藏地下网格线
- // ClearUpDownTraceAnalysis(); //清除上下游分析
+ // ClearUpDownTraceAnalysis(); //清除上下游分析
globeControl1.Globe.RemoveAllPits();//清除所有坑
string[] markerStrs = new string[9];
@@ -9532,7 +9534,7 @@
//}
//FrmAllPipelineStatis frm = new FrmAllPipelineStatis(0, pipeLineDis, list, globeControl1, new DataGridViewDelegate(InitDataGridViewX1));
- FrmAllPipelineStatis frm = new FrmAllPipelineStatis(globeControl1,null, new DataGridViewDelegate(InitDataGridViewX1), m_PipelineLayerNames);
+ FrmAllPipelineStatis frm = new FrmAllPipelineStatis(globeControl1, null, new DataGridViewDelegate(InitDataGridViewX1), m_PipelineLayerNames);
frm.Show(this);
}
@@ -9604,7 +9606,7 @@
///
///
private void buttonItemTJ3_ALL_Click(object sender, EventArgs e)
- {
+ {
FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(globeControl1, null, new DataGridViewDelegate(InitDataGridViewX1));
frm.Show(this);
}
@@ -9617,7 +9619,7 @@
{
//日志记录
LogManager.saveLog(Utility.userName, "井盖数量统计");
-
+
trackflag = "workwellquery";
globeControl1.Globe.Action = EnumAction3D.TrackPolygon;
globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack;
@@ -9911,7 +9913,7 @@
globeControl1.Globe.TrackPolylineTool.VerticalLineVisible = true;
globeControl1.Globe.TrackPolylineTool.TrackMode = EnumTrackMode.SpaceTrack;
trackPolylineEndMode = EnumTrackPolylineEndMode.HDM_Analysis;
-
+
}
///
/// 纵断面分析
@@ -9920,9 +9922,9 @@
///
private void buttonItemFX2_2_Click(object sender, EventArgs e)
{
- if (globeControl1.Globe.SelObjectCount<1)
+ if (globeControl1.Globe.SelObjectCount < 1)
{
- MessageBox.Show("请选择一条或者多条管线!", "提示", MessageBoxButtons.OK,
+ MessageBox.Show("请选择一条或者多条管线!", "提示", MessageBoxButtons.OK,
MessageBoxIcon.Information);
return;
}
@@ -9968,7 +9970,7 @@
globeControl1.Globe.TrackPolylineTool.VerticalLineVisible = true;
globeControl1.Globe.TrackPolylineTool.TrackMode = EnumTrackMode.SpaceTrack;
trackPolylineEndMode = EnumTrackPolylineEndMode.JXPM_Analysis;
-
+
}
#endregion
@@ -10062,11 +10064,11 @@
GSOLayer valveLayer = globeControl1.Globe.Layers[pipeLayerNamePrefix + "阀门"];
if (valveLayer == null)
{
- MessageBox.Show("无" + pipeLayerNamePrefix+"阀门图层", "提示");
+ MessageBox.Show("无" + pipeLayerNamePrefix + "阀门图层", "提示");
return;
}
- GSOFeatures valveFeats = NetworkAnalysisTool.CloseValvesAnalysis(resFeature,
+ GSOFeatures valveFeats = NetworkAnalysisTool.CloseValvesAnalysis(resFeature,
resLayer, valveLayer);
if (valveFeats != null)
@@ -10074,7 +10076,7 @@
FrmCloseValves frm = new FrmCloseValves(this.globeControl1, valveFeats);
frm.Show(this);
}
- else
+ else
{
MessageBox.Show("未找到关闭阀门");
}
@@ -10094,7 +10096,7 @@
return;
}
GSOFeature selFeat0, selFeat1;
- GSOLayer layer0,layer1;
+ GSOLayer layer0, layer1;
globeControl1.Globe.GetSelectObject(0, out selFeat0, out layer0);
globeControl1.Globe.GetSelectObject(1, out selFeat1, out layer1);
@@ -10114,7 +10116,7 @@
private void buttonItemFX3_7_Click(object sender, EventArgs e)
{
NetworkTraceUpDown(true); //上游追踪:
-
+
GSOFeature selLineFeature = globeControl1.Globe.SelectedObject;
if (selLineFeature == null || selLineFeature.Geometry == null || selLineFeature.Geometry.Type != EnumGeometryType.GeoPolyline3D)
{
@@ -10123,7 +10125,7 @@
}
GSOLayer selLayer = globeControl1.Globe.SelectedObjectLayer;
- NetworkAnalysisTool.ExplodeAnalysis(this.globeControl1,selLineFeature,selLayer);
+ NetworkAnalysisTool.ExplodeAnalysis(this.globeControl1, selLineFeature, selLayer);
this.buttonItemFX3_5_Click(sender, e); //关阀分析:
@@ -10350,7 +10352,7 @@
FrmBufferAnalysisBSQ frm = new FrmBufferAnalysisBSQ(globeControl1, layerTemp, bsqPT);
frm.Show(this);
}
-
+
}
///
/// 附属物分析
@@ -10479,7 +10481,7 @@
buttonItemLS5.Checked = false;
globeControl1.Globe.Action = EnumAction3D.MeasureArea;
globeControl1.Globe.AreaRuler.SpaceMeasure = false;
-
+
}
# region Fan 重构标注代码
@@ -10540,14 +10542,14 @@
return;
}
GSOGeoPolyline3D selLine = resFeature.Geometry as GSOGeoPolyline3D;
- if (selLine[0].Count <=1)
+ if (selLine[0].Count <= 1)
{
- return;
+ return;
}
- MarkTools.getInstance().showMarker(resFeature,
+ MarkTools.getInstance().showMarker(resFeature,
globeControl1, EnumMarkLayer.Mark_Depth, "");
-
+
}
///
/// 坐标标注
@@ -10999,7 +11001,7 @@
}
private int connectServerCount = 0;
-
+
///
/// 还原球到实测库
///
@@ -11078,7 +11080,7 @@
globeControl1.Refresh();
}
-
+
private void buttonItemSPSZ_Click(object sender, EventArgs e)
{
//日志记录
@@ -11563,7 +11565,7 @@
//日志记录
LogManager.saveLog(Utility.userName, this.buttonItemBJ2.Text);
- FrmSetGoalLayer frm = new FrmSetGoalLayer(globeControl1, instrumenLayerNames,"附属物");
+ FrmSetGoalLayer frm = new FrmSetGoalLayer(globeControl1, instrumenLayerNames, "附属物");
if (frm.ShowDialog() == DialogResult.OK)
{
GSOLayer featureAddLayer = TreeNodeFeatureLayer();
@@ -11585,7 +11587,7 @@
//日志记录
LogManager.saveLog(Utility.userName, this.buttonItemBJ3.Text);
- FrmSetGoalLayer frm = new FrmSetGoalLayer(globeControl1, pipefittingLayerNames,"管点");
+ FrmSetGoalLayer frm = new FrmSetGoalLayer(globeControl1, pipefittingLayerNames, "管点");
if (frm.ShowDialog() == DialogResult.OK)
{
GSOLayer featureAddLayer = TreeNodeFeatureLayer();
@@ -12030,7 +12032,7 @@
featsList.Clear();
lineStruct.Clear();
List listPipelineLayers = new List();
-
+
GSOLayer layer = null;
for (int i = 0; i < m_PipelineLayerNames.Count; i++)
{
@@ -12041,17 +12043,17 @@
}
}
//yanxiaowei 重构
- GSOFeatures selectFeatures=new GSOFeatures();
+ GSOFeatures selectFeatures = new GSOFeatures();
for (int i = 0; i < globeControl1.Globe.SelObjectCount; i++)
{
GSOFeature feature = null;
globeControl1.Globe.GetSelectObject(i, out feature, out layer);
selectFeatures.Add(feature);
}
- DataTable table=new DataTable();
+ DataTable table = new DataTable();
- ClassGSOTool.CalculateRedLineResult(out table, redSH, selectFeatures, globeControl1,
- listPipelineLayers,out lineStruct, out featsList);
+ ClassGSOTool.CalculateRedLineResult(out table, redSH, selectFeatures, globeControl1,
+ listPipelineLayers, out lineStruct, out featsList);
if (table.Rows.Count != 0)
AddDatagridView(table);
@@ -12170,7 +12172,7 @@
//自定义lprj文件名,从程序中复制一lprj文件。
string filePath = dlg.FileName;
string lastname = Path.GetFileName(filePath);
-
+
for (int i = 0; i < dlg.FileNames.Length; i++)
{
AddLayerData(dlg.FileNames[i]);
@@ -12291,7 +12293,7 @@
#endregion
}
- #endregion
+ #endregion
}
///
/// 定位
@@ -12302,7 +12304,7 @@
{
LogManager.saveLog(Utility.userName, this.buttonItemLocation.Text);
- FrmFlyToPosition fly = new FrmFlyToPosition(globeControl1,globeControl2);
+ FrmFlyToPosition fly = new FrmFlyToPosition(globeControl1, globeControl2);
fly.Show(this);
}
///
@@ -12314,10 +12316,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800);
globeControl1.Globe.FlyToPointSpeed = 10000000;
@@ -12353,10 +12355,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.Action = EnumAction3D.ActionNull;
dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
@@ -12389,10 +12391,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.Action = EnumAction3D.ActionNull;
//zhanshi = false;
@@ -12452,7 +12454,7 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
@@ -12489,10 +12491,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.Action = EnumAction3D.ActionNull;
panelOfTable.Visible = false;
@@ -12523,10 +12525,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.Action = EnumAction3D.ActionNull;
panelOfTable.Visible = false;
@@ -12559,10 +12561,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.Action = EnumAction3D.ActionNull;
panelOfTable.Visible = false;
@@ -12599,7 +12601,7 @@
//FrmCompareFeature frmCompareFeature = new FrmCompareFeature(globeControl1, globeControl2, layerTemp, layerTemp2,m_PipelineLayerNames,sgPipeLayersNames);
int width = this.Width;
- FrmCompareFeature.ShowForm(globeControl1, globeControl2, layerTemp, layerTemp2, m_PipelineLayerNames, sgPipeLayersNames,width);
+ FrmCompareFeature.ShowForm(globeControl1, globeControl2, layerTemp, layerTemp2, m_PipelineLayerNames, sgPipeLayersNames, width);
//frmCompareFeature.Location = new Point((this.Width - frmCompareFeature.Width)/2,50);
//frmCompareFeature.Show(this);
@@ -12661,7 +12663,7 @@
private void 标识器分类统计ToolStripMenuItem_Click(object sender, EventArgs e)
{
globeControl1.Globe.Action = EnumAction3D.ActionNull;
- FrmBSQStatis bsqStatis = new FrmBSQStatis(globeControl1,null);
+ FrmBSQStatis bsqStatis = new FrmBSQStatis(globeControl1, null);
//FrmBSQStatis bsqStatis = new FrmBSQStatis();
bsqStatis.Show(this);
}
@@ -12985,7 +12987,7 @@
frm.ShowDialog();
}
}
-
+
private void btn_user_role_Click(object sender, EventArgs e)
{
LogManager.saveLog(Utility.userName, this.btn_user_role.Text);
@@ -13100,7 +13102,7 @@
// }
// AddLayerData(strDataPath);
// //globeControl1.Globe.Layers.Add(strDataPath);
-
+
// this.Cursor = Cursors.Default;
// }
// else
@@ -13114,7 +13116,7 @@
// AddLayerData(strDataPath);
// //globeControl1.Globe.Layers.Add(strDataPath);
// }
-
+
//}
//else
//{
@@ -13325,7 +13327,7 @@
lendendGZ24_2.Visible = false;
lendendGZ24_3.Visible = false;
}
- #endregion
+ #endregion
private void buttonItemPasswordReset_Click(object sender, EventArgs e)
{
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index c8e0001..41f3338 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/MainFrm.cs b/MainFrm.cs
index 9bfb70e..d6345f9 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -130,8 +130,8 @@
FrmWait frmWait = null;//一键审核等待窗口
//FrmWait frmWait2 = null;//文档操作等待窗口
- float mouseDownX1,mouseDownY1;
- float mouseDownX2,mouseDownY2;
+ float mouseDownX1, mouseDownY1;
+ float mouseDownX2, mouseDownY2;
///
///
///
@@ -188,7 +188,7 @@
RigthMenuSet();
MenuSet();
-
+
}
///
/// 右屏中添加管纵图片
@@ -731,7 +731,7 @@
}
else
{
-
+
if (Utility.userRole.IndexOf("用户管理") < 0)
{
btn_user_info.Visible = false;
@@ -943,7 +943,7 @@
sliderItem1.Value = optiValue;
sliderItem2.Value = optiValue;
sliderItem3.Value = optiValue;
-
+
}
//初始化地球控件
@@ -1134,8 +1134,8 @@
Thread t1 = new Thread(new ThreadStart(doLoadDataForGlobalControl1));
t1.IsBackground = true;
t1.Start();
-
-
+
+
}
delegate void LoadDataForGlobalControl();
@@ -1412,14 +1412,14 @@
this.initMarkerTree();
this.initLayout();
this.loadData();
-
-
+
+
double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]);
double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]);
double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]);
jumpToCameraState(x, y, z);
-
+
}
#endregion
@@ -2132,7 +2132,7 @@
globeControl1.SwapBuffer();
Point pt1 = new Point(Convert.ToInt32(e.StartPos.X), Convert.ToInt32(e.StartPos.Y));
Point pt2 = new Point(Convert.ToInt32(e.EndPos.X), Convert.ToInt32(e.EndPos.Y));
-
+
/*Point pt = getUpperLeftPoint(pt1, pt2);
Image myImg = new Bitmap(Convert.ToInt32(e.Rect.Width), Convert.ToInt32(e.Rect.Height));
Graphics g = Graphics.FromImage(myImg);
@@ -2340,18 +2340,18 @@
{
if (e.Button == MouseButtons.Right && e.Node.Tag.ToString().Contains("|"))
{
-
+
if (e.Node.Tag.ToString().Split('|')[0] == "locaserver")
{
-
+
foreach (ToolStripItem item in layerNodeContexMenu.Items)
{
item.Visible = false;
}
return;
-
+
}
-
+
if (e.Node.Tag.ToString().Split('|')[0] == "new")
{
LayerEditableMenuItem.Enabled = true;
@@ -2418,7 +2418,7 @@
GSOLayer layer = node.Tag as GSOLayer;
//globeControl1.Globe.Layers.Remove(layer);
- for (int i = globeControl1.Globe.Layers.Count-1; i >=0; i--)
+ for (int i = globeControl1.Globe.Layers.Count - 1; i >= 0; i--)
{
if (globeControl1.Globe.Layers[i].Caption == layer.Caption)
{
@@ -2526,7 +2526,7 @@
private void layerTree_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEventArgs e)
{
- if(this.layerTree.SelectedNode!=null)
+ if (this.layerTree.SelectedNode != null)
{
if (this.layerTree.SelectedNode.Tag.ToString().Contains("|"))
{
@@ -2547,7 +2547,8 @@
}
globeControl1.Refresh();
}
- else {
+ else
+ {
double x = layer.LatLonBounds.Center.X;
double y = layer.LatLonBounds.Center.Y;
globeControl1.Globe.FlyToPosition(new GSOPoint3d(x, y, 0), EnumAltitudeMode.Absolute);
@@ -2652,12 +2653,12 @@
void globeControl1_TrackPolylineEndEvent(object sender, TrackPolylineEndEventArgs e)
{
//横断面分析、道路横断面分析
- if (trackPolylineEndMode == EnumTrackPolylineEndMode.HDM_Analysis||
+ if (trackPolylineEndMode == EnumTrackPolylineEndMode.HDM_Analysis ||
trackPolylineEndMode == EnumTrackPolylineEndMode.DLDM_Analysis)
{
Dictionary hdmDic = SectionAnalysisTool.HDMAnalysis(this.globeControl1,
e.Polyline, this.m_PipelineLayerNames);
- FrmHDMAnalysis3 frm = new FrmHDMAnalysis3(hdmDic, this.globeControl1,
+ FrmHDMAnalysis3 frm = new FrmHDMAnalysis3(hdmDic, this.globeControl1,
trackPolylineEndMode);
frm.Show(this);
}
@@ -2894,7 +2895,7 @@
switch (trackflag)
{
case "valvequery":
- FrmValveStatistics frm = new FrmValveStatistics(globeControl1,polygon, new DataGridViewDelegate(InitDataGridViewX1));
+ FrmValveStatistics frm = new FrmValveStatistics(globeControl1, polygon, new DataGridViewDelegate(InitDataGridViewX1));
frm.Show(this);
//panelEx6.Visible = true;
toolStripFeatureLength.Text = "";
@@ -2902,15 +2903,15 @@
break;
case "PipelineDistanceStatistics":
-
+
FrmAllPipelineStatis frm1 = new FrmAllPipelineStatis(globeControl1, polygon, new DataGridViewDelegate(InitDataGridViewX1), m_PipelineLayerNames);
frm1.Show(this);
globeControl1.Globe.Action = EnumAction3D.ActionNull;
break;
case "PipelineSpatialQuery":
-
- FrmAllPipelineStatis.ShowForm(globeControl1,polygon,new DataGridViewDelegate(InitDataGridViewX1),m_PipelineLayerNames);
+
+ FrmAllPipelineStatis.ShowForm(globeControl1, polygon, new DataGridViewDelegate(InitDataGridViewX1), m_PipelineLayerNames);
globeControl1.Globe.ClearAnalysis();
globeControl1.Globe.Action = EnumAction3D.ActionNull;
@@ -2970,7 +2971,7 @@
//listBSQ.Add(bsqFeatures);
//FrmBSQDuoBianXingStatis bsqFrm = new FrmBSQDuoBianXingStatis(workWellLen, globeControl1, listBSQ);
- FrmBSQStatis bsqFrm = new FrmBSQStatis(globeControl1,e.Polygon);
+ FrmBSQStatis bsqFrm = new FrmBSQStatis(globeControl1, e.Polygon);
bsqFrm.Show(this);
globeControl1.Globe.Action = EnumAction3D.ActionNull;
break;
@@ -3088,7 +3089,7 @@
{
if (e.Button == MouseButtons.Left)
{
-
+
if (m_AddPipeLine == true && globeControl1.Globe.Action == EnumAction3D.DrawPolyline)//添加管线
{
GSOLayer layerDest = globeControl1.Globe.DestLayerFeatureAdd;
@@ -3271,7 +3272,7 @@
m_isDrawRedPology = false;
globeControl1.Globe.Action = EnumAction3D.ActionNull;
-
+
}
}
@@ -3685,7 +3686,7 @@
///
///
///
- private string GetBubbleInfo(GSOFeature feature,GSOGlobeControl globeControl)
+ private string GetBubbleInfo(GSOFeature feature, GSOGlobeControl globeControl)
{
if (feature == null)
{
@@ -3837,7 +3838,7 @@
{
name2 += "_米";
}
- value2 = dl2.ToString("0.00");
+ value2 = dl2.ToString("0.00");
}
else
{
@@ -4164,7 +4165,7 @@
sideBarPanelItem3.Visible = false;
layerTree.Visible = false;
controlContainerItem3.Visible = false;
-
+
//修改图层管理与标注管理、覆土审查、水平净距分析、垂直净距分析和碰撞分析控件之间的逻辑关系
controlContainerItem5.Visible = false;
sideBar1.Visible = false;
@@ -4186,7 +4187,7 @@
}
*/
Refresh();
-
+
}
}
///
@@ -4239,7 +4240,7 @@
int widthFull = Screen.PrimaryScreen.Bounds.Width;
int heightFull = Screen.PrimaryScreen.Bounds.Height;
-
+
this.FormBorderStyle = FormBorderStyle.None;
this.WindowState = FormWindowState.Normal;
@@ -4549,12 +4550,12 @@
{
double featurelength = PipeLength(currentLayer, 0);// 统计管线的里程数
- toolStripNumbers.Text =currentLayer + " | 共有:" + Convert.ToString(dataCount - 1) + "条记录";
+ toolStripNumbers.Text = currentLayer + " | 共有:" + Convert.ToString(dataCount - 1) + "条记录";
toolStripFeatureLength.Text = " 管线里程:" + featurelength.ToString("0.00") + " 米";
}
else
{
- toolStripNumbers.Text =currentLayer + "| 共有:" + 0 + " 条记录 | ";
+ toolStripNumbers.Text = currentLayer + "| 共有:" + 0 + " 条记录 | ";
}
}
@@ -4707,7 +4708,7 @@
count = 0;
}
}
-
+
///
/// 绘制线 菜单
///
@@ -4885,10 +4886,10 @@
if (globeControl1.Globe.Action != EnumAction3D.NormalHit)
{
buttonItemFX3_6.Checked = false;
- // ClearConnexityAnalysis();
+ // ClearConnexityAnalysis();
buttonItemFX3_5.Checked = false;
- // ClearCloseValvesAnalysis();
+ // ClearCloseValvesAnalysis();
}
if (globeControl1.Globe.Action != EnumAction3D.TrackPolygon)
{
@@ -4909,15 +4910,16 @@
{
e.Cancel = true;
}
- else {
+ else
+ {
globeControl1.Globe.MemoryLayer.SaveAs(Application.StartupPath + "/MyPlace.kml");
}
-
+
//saveLayerList(layerManagerNode.Nodes);
//注销id号为103的热键设定
// UnregisterHotKey(Handle, 103);
}
-
+
///
/// 显示流向 功能
///
@@ -6309,7 +6311,7 @@
globeControl1.Globe.RemoveAllPits();
}
-
+
//}
///
/// 大气层 菜单
@@ -6442,57 +6444,57 @@
///
/// 刷新目录树 功能
///
- private void RefreshDataTree()
- {
- layerTree.Nodes[0].Nodes.Clear();
- Int32 nCount = globeControl1.Globe.DataManager.DataSourceCount;
- Int32 i = 0;
- for (i = 0; i < nCount; i++)
- {
- GSODataSource dataSpace = globeControl1.Globe.DataManager[i];
- TreeNode node = new TreeNode();
- node.Text = dataSpace.Name;
- node.ImageIndex = 0;
- node.SelectedImageIndex = 0;
- node.Checked = true;
- node.Tag = dataSpace;
- Int32 nDatasetCount = dataSpace.DatasetCount;
- for (Int32 j = 0; j < nDatasetCount; j++)
- {
- GSODataset dataset = dataSpace[j];
- TreeNode subNode = new TreeNode();
- subNode.Text = dataset.Name;
- subNode.ImageIndex = 0;
- subNode.SelectedImageIndex = 0;
- subNode.Checked = true;
- subNode.Tag = dataset;
- node.Nodes.Add(subNode);
- }
- layerTree.Nodes[0].Nodes.Add(node);
- }
- }
+ //private void RefreshDataTree()
+ //{
+ // layerTree.Nodes[0].Nodes.Clear();
+ // Int32 nCount = globeControl1.Globe.DataManager.DataSourceCount;
+ // Int32 i = 0;
+ // for (i = 0; i < nCount; i++)
+ // {
+ // GSODataSource dataSpace = globeControl1.Globe.DataManager[i];
+ // TreeNode node = new TreeNode();
+ // node.Text = dataSpace.Name;
+ // node.ImageIndex = 0;
+ // node.SelectedImageIndex = 0;
+ // node.Checked = true;
+ // node.Tag = dataSpace;
+ // Int32 nDatasetCount = dataSpace.DatasetCount;
+ // for (Int32 j = 0; j < nDatasetCount; j++)
+ // {
+ // GSODataset dataset = dataSpace[j];
+ // TreeNode subNode = new TreeNode();
+ // subNode.Text = dataset.Name;
+ // subNode.ImageIndex = 0;
+ // subNode.SelectedImageIndex = 0;
+ // subNode.Checked = true;
+ // subNode.Tag = dataset;
+ // node.Nodes.Add(subNode);
+ // }
+ // layerTree.Nodes[0].Nodes.Add(node);
+ // }
+ //}
///
/// 判断图层是否包含字段列表
///
///
///
- private bool HasFields(string layerName)
- {
- GSOLayer m_layer = globeControl1.Globe.Layers.GetLayerByCaption(layerName);//获取当前选择的layer图层
- if (m_layer == null)
- return false;
- GSOFeatureLayer flayer = m_layer as GSOFeatureLayer;
+ //private bool HasFields(string layerName)
+ //{
+ // GSOLayer m_layer = globeControl1.Globe.Layers.GetLayerByCaption(layerName);//获取当前选择的layer图层
+ // if (m_layer == null)
+ // return false;
+ // GSOFeatureLayer flayer = m_layer as GSOFeatureLayer;
- GSOFeatureDataset _featureDataSet = m_layer.Dataset as GSOFeatureDataset;
- if (_featureDataSet == null)
- return false;
+ // GSOFeatureDataset _featureDataSet = m_layer.Dataset as GSOFeatureDataset;
+ // if (_featureDataSet == null)
+ // return false;
- _featureDataSet.Open();
- if (_featureDataSet.FieldCount > 0)
- return true;
- else
- return false;
- }
+ // _featureDataSet.Open();
+ // if (_featureDataSet.FieldCount > 0)
+ // return true;
+ // else
+ // return false;
+ //}
///
/// 统计指定图层在指定范围内的所有feature对象
@@ -6500,27 +6502,27 @@
///
///
///
- private GSOFeatures Intersect_PointLayer(GSOGeoPolygon3D polygon, string pointLayerName)
- {
- GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pointLayerName);
- if (layer == null)
- return null;
+ //private GSOFeatures Intersect_PointLayer(GSOGeoPolygon3D polygon, string pointLayerName)
+ //{
+ // GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pointLayerName);
+ // if (layer == null)
+ // return null;
- GSOFeatureLayer flayer = layer as GSOFeatureLayer;
- GSOFeatureDataset fdataset = flayer.Dataset as GSOFeatureDataset;
- GSOFeatures feats;
- if (polygon == null)
- {
- feats = flayer.GetAllFeatures();
- }
- else
- {
- feats = flayer.FindFeaturesInPolygon(polygon, false);
- }
+ // GSOFeatureLayer flayer = layer as GSOFeatureLayer;
+ // GSOFeatureDataset fdataset = flayer.Dataset as GSOFeatureDataset;
+ // GSOFeatures feats;
+ // if (polygon == null)
+ // {
+ // feats = flayer.GetAllFeatures();
+ // }
+ // else
+ // {
+ // feats = flayer.FindFeaturesInPolygon(polygon, false);
+ // }
- workWellLen.Add(pointLayerName, feats.Length);
- return feats;
- }
+ // workWellLen.Add(pointLayerName, feats.Length);
+ // return feats;
+ //}
///
/// 碰撞分析功能界面中 选择管线复选框 选中状态改变事件处理
///
@@ -6633,7 +6635,7 @@
}
}
}
-
+
if (globeControl1.Globe.Action == EnumAction3D.SelectObject)
{
globeControl1.Globe.Action = EnumAction3D.ActionNull;
@@ -7928,7 +7930,7 @@
FrmAccessoriesSensor.ShowForm(globeControl1, instrumenLayerNames, 1);
}
-
+
///
/// 碰撞分析 功能界面中 关闭按钮 事件处理
///
@@ -7952,7 +7954,7 @@
}
else
{
- sideBar1.Visible = false;
+ sideBar1.Visible = false;
}
Refresh();
@@ -8632,7 +8634,7 @@
MessageBox.Show("内存过载请清理内存,并重新启动规划分析!", "提示");
return;
}
-
+
}
///
@@ -8695,7 +8697,7 @@
LogManager.saveLog(Utility.userName, this.buttonItem128.Text);
//垂直净距标准
- frmSh = new FrmYJSHTC(globeControl1, globeControl2,layerTree);
+ frmSh = new FrmYJSHTC(globeControl1, globeControl2, layerTree);
if (frmSh.ShowDialog() == DialogResult.OK)
{
@@ -8716,33 +8718,33 @@
double dVerticalJingJuBiaoZhun = 1, dHorizontalJingJuBiaoZhun = 1;
if (frmSh.rukuLayer != null)
{
- #region
+ #region
this.Invoke((EventHandler)delegate
- {
- try
- {
- List managerLayerList = new List();
- for (int i = 0; i < layerManagerNode.Nodes.Count; i++)
- {
- managerLayerList.Add(layerManagerNode.Nodes[i].Text);
- }
- if (!managerLayerList.Contains(frmSh.rukuLayer.Caption))
- {
- TreeNode node = new TreeNode();
- node.Tag = frmSh.rukuLayer;
- node.Text = frmSh.rukuLayer.Dataset.Caption;
- node.ImageIndex = 0;
- node.SelectedImageIndex = 0;
- node.Checked = frmSh.rukuLayer.Visible;
- layerManagerNode.Nodes.Insert(0, node);
- layerManagerNode.Expand();
- }
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message, "提示");
- }
- });
+ {
+ try
+ {
+ List managerLayerList = new List();
+ for (int i = 0; i < layerManagerNode.Nodes.Count; i++)
+ {
+ managerLayerList.Add(layerManagerNode.Nodes[i].Text);
+ }
+ if (!managerLayerList.Contains(frmSh.rukuLayer.Caption))
+ {
+ TreeNode node = new TreeNode();
+ node.Tag = frmSh.rukuLayer;
+ node.Text = frmSh.rukuLayer.Dataset.Caption;
+ node.ImageIndex = 0;
+ node.SelectedImageIndex = 0;
+ node.Checked = frmSh.rukuLayer.Visible;
+ layerManagerNode.Nodes.Insert(0, node);
+ layerManagerNode.Expand();
+ }
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message, "提示");
+ }
+ });
#endregion
shlayername = frmSh.rukuLayer.Name;
@@ -8805,11 +8807,11 @@
}
else
{
-
+
}
}
-
+
///
/// 清除渲染结果
///
@@ -8890,7 +8892,7 @@
private void buttonItem134_Click_1(object sender, EventArgs e)
{
LogManager.saveLog(Utility.userName, "模拟设计修改");
-
+
frmModify = new FrmMnModify(globeControl1, shlayername, shresultLists);
if (boolfrmModify == false)
@@ -9149,7 +9151,7 @@
{
layer.Opaque = 100 - sliderItem1.Value;
}
-
+
optiValue = sliderItem1.Value;
}
///
@@ -9449,9 +9451,9 @@
buttonClearAnalysisResult_Click(null, null);
NetworkAnalysisTool.ClearAllTopAnalysis(this.globeControl1);
- // ClearConnexityAnalysis();//清除连通性分析
- // ClearCloseValvesAnalysis();//清除阀门分析
-
+ // ClearConnexityAnalysis();//清除连通性分析
+ // ClearCloseValvesAnalysis();//清除阀门分析
+
//清除管线间距分析
if (disFeature != null)
{
@@ -9474,7 +9476,7 @@
globeControl1.Globe.UnderGroundFloor.Visible = false;//隐藏地下网格线
- // ClearUpDownTraceAnalysis(); //清除上下游分析
+ // ClearUpDownTraceAnalysis(); //清除上下游分析
globeControl1.Globe.RemoveAllPits();//清除所有坑
string[] markerStrs = new string[9];
@@ -9532,7 +9534,7 @@
//}
//FrmAllPipelineStatis frm = new FrmAllPipelineStatis(0, pipeLineDis, list, globeControl1, new DataGridViewDelegate(InitDataGridViewX1));
- FrmAllPipelineStatis frm = new FrmAllPipelineStatis(globeControl1,null, new DataGridViewDelegate(InitDataGridViewX1), m_PipelineLayerNames);
+ FrmAllPipelineStatis frm = new FrmAllPipelineStatis(globeControl1, null, new DataGridViewDelegate(InitDataGridViewX1), m_PipelineLayerNames);
frm.Show(this);
}
@@ -9604,7 +9606,7 @@
///
///
private void buttonItemTJ3_ALL_Click(object sender, EventArgs e)
- {
+ {
FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(globeControl1, null, new DataGridViewDelegate(InitDataGridViewX1));
frm.Show(this);
}
@@ -9617,7 +9619,7 @@
{
//日志记录
LogManager.saveLog(Utility.userName, "井盖数量统计");
-
+
trackflag = "workwellquery";
globeControl1.Globe.Action = EnumAction3D.TrackPolygon;
globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack;
@@ -9911,7 +9913,7 @@
globeControl1.Globe.TrackPolylineTool.VerticalLineVisible = true;
globeControl1.Globe.TrackPolylineTool.TrackMode = EnumTrackMode.SpaceTrack;
trackPolylineEndMode = EnumTrackPolylineEndMode.HDM_Analysis;
-
+
}
///
/// 纵断面分析
@@ -9920,9 +9922,9 @@
///
private void buttonItemFX2_2_Click(object sender, EventArgs e)
{
- if (globeControl1.Globe.SelObjectCount<1)
+ if (globeControl1.Globe.SelObjectCount < 1)
{
- MessageBox.Show("请选择一条或者多条管线!", "提示", MessageBoxButtons.OK,
+ MessageBox.Show("请选择一条或者多条管线!", "提示", MessageBoxButtons.OK,
MessageBoxIcon.Information);
return;
}
@@ -9968,7 +9970,7 @@
globeControl1.Globe.TrackPolylineTool.VerticalLineVisible = true;
globeControl1.Globe.TrackPolylineTool.TrackMode = EnumTrackMode.SpaceTrack;
trackPolylineEndMode = EnumTrackPolylineEndMode.JXPM_Analysis;
-
+
}
#endregion
@@ -10062,11 +10064,11 @@
GSOLayer valveLayer = globeControl1.Globe.Layers[pipeLayerNamePrefix + "阀门"];
if (valveLayer == null)
{
- MessageBox.Show("无" + pipeLayerNamePrefix+"阀门图层", "提示");
+ MessageBox.Show("无" + pipeLayerNamePrefix + "阀门图层", "提示");
return;
}
- GSOFeatures valveFeats = NetworkAnalysisTool.CloseValvesAnalysis(resFeature,
+ GSOFeatures valveFeats = NetworkAnalysisTool.CloseValvesAnalysis(resFeature,
resLayer, valveLayer);
if (valveFeats != null)
@@ -10074,7 +10076,7 @@
FrmCloseValves frm = new FrmCloseValves(this.globeControl1, valveFeats);
frm.Show(this);
}
- else
+ else
{
MessageBox.Show("未找到关闭阀门");
}
@@ -10094,7 +10096,7 @@
return;
}
GSOFeature selFeat0, selFeat1;
- GSOLayer layer0,layer1;
+ GSOLayer layer0, layer1;
globeControl1.Globe.GetSelectObject(0, out selFeat0, out layer0);
globeControl1.Globe.GetSelectObject(1, out selFeat1, out layer1);
@@ -10114,7 +10116,7 @@
private void buttonItemFX3_7_Click(object sender, EventArgs e)
{
NetworkTraceUpDown(true); //上游追踪:
-
+
GSOFeature selLineFeature = globeControl1.Globe.SelectedObject;
if (selLineFeature == null || selLineFeature.Geometry == null || selLineFeature.Geometry.Type != EnumGeometryType.GeoPolyline3D)
{
@@ -10123,7 +10125,7 @@
}
GSOLayer selLayer = globeControl1.Globe.SelectedObjectLayer;
- NetworkAnalysisTool.ExplodeAnalysis(this.globeControl1,selLineFeature,selLayer);
+ NetworkAnalysisTool.ExplodeAnalysis(this.globeControl1, selLineFeature, selLayer);
this.buttonItemFX3_5_Click(sender, e); //关阀分析:
@@ -10350,7 +10352,7 @@
FrmBufferAnalysisBSQ frm = new FrmBufferAnalysisBSQ(globeControl1, layerTemp, bsqPT);
frm.Show(this);
}
-
+
}
///
/// 附属物分析
@@ -10479,7 +10481,7 @@
buttonItemLS5.Checked = false;
globeControl1.Globe.Action = EnumAction3D.MeasureArea;
globeControl1.Globe.AreaRuler.SpaceMeasure = false;
-
+
}
# region Fan 重构标注代码
@@ -10540,14 +10542,14 @@
return;
}
GSOGeoPolyline3D selLine = resFeature.Geometry as GSOGeoPolyline3D;
- if (selLine[0].Count <=1)
+ if (selLine[0].Count <= 1)
{
- return;
+ return;
}
- MarkTools.getInstance().showMarker(resFeature,
+ MarkTools.getInstance().showMarker(resFeature,
globeControl1, EnumMarkLayer.Mark_Depth, "");
-
+
}
///
/// 坐标标注
@@ -10999,7 +11001,7 @@
}
private int connectServerCount = 0;
-
+
///
/// 还原球到实测库
///
@@ -11078,7 +11080,7 @@
globeControl1.Refresh();
}
-
+
private void buttonItemSPSZ_Click(object sender, EventArgs e)
{
//日志记录
@@ -11563,7 +11565,7 @@
//日志记录
LogManager.saveLog(Utility.userName, this.buttonItemBJ2.Text);
- FrmSetGoalLayer frm = new FrmSetGoalLayer(globeControl1, instrumenLayerNames,"附属物");
+ FrmSetGoalLayer frm = new FrmSetGoalLayer(globeControl1, instrumenLayerNames, "附属物");
if (frm.ShowDialog() == DialogResult.OK)
{
GSOLayer featureAddLayer = TreeNodeFeatureLayer();
@@ -11585,7 +11587,7 @@
//日志记录
LogManager.saveLog(Utility.userName, this.buttonItemBJ3.Text);
- FrmSetGoalLayer frm = new FrmSetGoalLayer(globeControl1, pipefittingLayerNames,"管点");
+ FrmSetGoalLayer frm = new FrmSetGoalLayer(globeControl1, pipefittingLayerNames, "管点");
if (frm.ShowDialog() == DialogResult.OK)
{
GSOLayer featureAddLayer = TreeNodeFeatureLayer();
@@ -12030,7 +12032,7 @@
featsList.Clear();
lineStruct.Clear();
List listPipelineLayers = new List();
-
+
GSOLayer layer = null;
for (int i = 0; i < m_PipelineLayerNames.Count; i++)
{
@@ -12041,17 +12043,17 @@
}
}
//yanxiaowei 重构
- GSOFeatures selectFeatures=new GSOFeatures();
+ GSOFeatures selectFeatures = new GSOFeatures();
for (int i = 0; i < globeControl1.Globe.SelObjectCount; i++)
{
GSOFeature feature = null;
globeControl1.Globe.GetSelectObject(i, out feature, out layer);
selectFeatures.Add(feature);
}
- DataTable table=new DataTable();
+ DataTable table = new DataTable();
- ClassGSOTool.CalculateRedLineResult(out table, redSH, selectFeatures, globeControl1,
- listPipelineLayers,out lineStruct, out featsList);
+ ClassGSOTool.CalculateRedLineResult(out table, redSH, selectFeatures, globeControl1,
+ listPipelineLayers, out lineStruct, out featsList);
if (table.Rows.Count != 0)
AddDatagridView(table);
@@ -12170,7 +12172,7 @@
//自定义lprj文件名,从程序中复制一lprj文件。
string filePath = dlg.FileName;
string lastname = Path.GetFileName(filePath);
-
+
for (int i = 0; i < dlg.FileNames.Length; i++)
{
AddLayerData(dlg.FileNames[i]);
@@ -12291,7 +12293,7 @@
#endregion
}
- #endregion
+ #endregion
}
///
/// 定位
@@ -12302,7 +12304,7 @@
{
LogManager.saveLog(Utility.userName, this.buttonItemLocation.Text);
- FrmFlyToPosition fly = new FrmFlyToPosition(globeControl1,globeControl2);
+ FrmFlyToPosition fly = new FrmFlyToPosition(globeControl1, globeControl2);
fly.Show(this);
}
///
@@ -12314,10 +12316,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800);
globeControl1.Globe.FlyToPointSpeed = 10000000;
@@ -12353,10 +12355,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.Action = EnumAction3D.ActionNull;
dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
@@ -12389,10 +12391,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.Action = EnumAction3D.ActionNull;
//zhanshi = false;
@@ -12452,7 +12454,7 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
@@ -12489,10 +12491,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.Action = EnumAction3D.ActionNull;
panelOfTable.Visible = false;
@@ -12523,10 +12525,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.Action = EnumAction3D.ActionNull;
panelOfTable.Visible = false;
@@ -12559,10 +12561,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.Action = EnumAction3D.ActionNull;
panelOfTable.Visible = false;
@@ -12599,7 +12601,7 @@
//FrmCompareFeature frmCompareFeature = new FrmCompareFeature(globeControl1, globeControl2, layerTemp, layerTemp2,m_PipelineLayerNames,sgPipeLayersNames);
int width = this.Width;
- FrmCompareFeature.ShowForm(globeControl1, globeControl2, layerTemp, layerTemp2, m_PipelineLayerNames, sgPipeLayersNames,width);
+ FrmCompareFeature.ShowForm(globeControl1, globeControl2, layerTemp, layerTemp2, m_PipelineLayerNames, sgPipeLayersNames, width);
//frmCompareFeature.Location = new Point((this.Width - frmCompareFeature.Width)/2,50);
//frmCompareFeature.Show(this);
@@ -12661,7 +12663,7 @@
private void 标识器分类统计ToolStripMenuItem_Click(object sender, EventArgs e)
{
globeControl1.Globe.Action = EnumAction3D.ActionNull;
- FrmBSQStatis bsqStatis = new FrmBSQStatis(globeControl1,null);
+ FrmBSQStatis bsqStatis = new FrmBSQStatis(globeControl1, null);
//FrmBSQStatis bsqStatis = new FrmBSQStatis();
bsqStatis.Show(this);
}
@@ -12985,7 +12987,7 @@
frm.ShowDialog();
}
}
-
+
private void btn_user_role_Click(object sender, EventArgs e)
{
LogManager.saveLog(Utility.userName, this.btn_user_role.Text);
@@ -13100,7 +13102,7 @@
// }
// AddLayerData(strDataPath);
// //globeControl1.Globe.Layers.Add(strDataPath);
-
+
// this.Cursor = Cursors.Default;
// }
// else
@@ -13114,7 +13116,7 @@
// AddLayerData(strDataPath);
// //globeControl1.Globe.Layers.Add(strDataPath);
// }
-
+
//}
//else
//{
@@ -13325,7 +13327,7 @@
lendendGZ24_2.Visible = false;
lendendGZ24_3.Visible = false;
}
- #endregion
+ #endregion
private void buttonItemPasswordReset_Click(object sender, EventArgs e)
{
diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe
index 74fa226..064115e 100644
--- a/bin/x86/Debug/Cyberpipe.exe
+++ b/bin/x86/Debug/Cyberpipe.exe
Binary files differ
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index c8e0001..41f3338 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/MainFrm.cs b/MainFrm.cs
index 9bfb70e..d6345f9 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -130,8 +130,8 @@
FrmWait frmWait = null;//一键审核等待窗口
//FrmWait frmWait2 = null;//文档操作等待窗口
- float mouseDownX1,mouseDownY1;
- float mouseDownX2,mouseDownY2;
+ float mouseDownX1, mouseDownY1;
+ float mouseDownX2, mouseDownY2;
///
///
///
@@ -188,7 +188,7 @@
RigthMenuSet();
MenuSet();
-
+
}
///
/// 右屏中添加管纵图片
@@ -731,7 +731,7 @@
}
else
{
-
+
if (Utility.userRole.IndexOf("用户管理") < 0)
{
btn_user_info.Visible = false;
@@ -943,7 +943,7 @@
sliderItem1.Value = optiValue;
sliderItem2.Value = optiValue;
sliderItem3.Value = optiValue;
-
+
}
//初始化地球控件
@@ -1134,8 +1134,8 @@
Thread t1 = new Thread(new ThreadStart(doLoadDataForGlobalControl1));
t1.IsBackground = true;
t1.Start();
-
-
+
+
}
delegate void LoadDataForGlobalControl();
@@ -1412,14 +1412,14 @@
this.initMarkerTree();
this.initLayout();
this.loadData();
-
-
+
+
double x = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[0]);
double y = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[1]);
double z = Convert.ToDouble(Utility.Query_Roads["绿岛"].ToString().Split(',')[2]);
jumpToCameraState(x, y, z);
-
+
}
#endregion
@@ -2132,7 +2132,7 @@
globeControl1.SwapBuffer();
Point pt1 = new Point(Convert.ToInt32(e.StartPos.X), Convert.ToInt32(e.StartPos.Y));
Point pt2 = new Point(Convert.ToInt32(e.EndPos.X), Convert.ToInt32(e.EndPos.Y));
-
+
/*Point pt = getUpperLeftPoint(pt1, pt2);
Image myImg = new Bitmap(Convert.ToInt32(e.Rect.Width), Convert.ToInt32(e.Rect.Height));
Graphics g = Graphics.FromImage(myImg);
@@ -2340,18 +2340,18 @@
{
if (e.Button == MouseButtons.Right && e.Node.Tag.ToString().Contains("|"))
{
-
+
if (e.Node.Tag.ToString().Split('|')[0] == "locaserver")
{
-
+
foreach (ToolStripItem item in layerNodeContexMenu.Items)
{
item.Visible = false;
}
return;
-
+
}
-
+
if (e.Node.Tag.ToString().Split('|')[0] == "new")
{
LayerEditableMenuItem.Enabled = true;
@@ -2418,7 +2418,7 @@
GSOLayer layer = node.Tag as GSOLayer;
//globeControl1.Globe.Layers.Remove(layer);
- for (int i = globeControl1.Globe.Layers.Count-1; i >=0; i--)
+ for (int i = globeControl1.Globe.Layers.Count - 1; i >= 0; i--)
{
if (globeControl1.Globe.Layers[i].Caption == layer.Caption)
{
@@ -2526,7 +2526,7 @@
private void layerTree_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEventArgs e)
{
- if(this.layerTree.SelectedNode!=null)
+ if (this.layerTree.SelectedNode != null)
{
if (this.layerTree.SelectedNode.Tag.ToString().Contains("|"))
{
@@ -2547,7 +2547,8 @@
}
globeControl1.Refresh();
}
- else {
+ else
+ {
double x = layer.LatLonBounds.Center.X;
double y = layer.LatLonBounds.Center.Y;
globeControl1.Globe.FlyToPosition(new GSOPoint3d(x, y, 0), EnumAltitudeMode.Absolute);
@@ -2652,12 +2653,12 @@
void globeControl1_TrackPolylineEndEvent(object sender, TrackPolylineEndEventArgs e)
{
//横断面分析、道路横断面分析
- if (trackPolylineEndMode == EnumTrackPolylineEndMode.HDM_Analysis||
+ if (trackPolylineEndMode == EnumTrackPolylineEndMode.HDM_Analysis ||
trackPolylineEndMode == EnumTrackPolylineEndMode.DLDM_Analysis)
{
Dictionary hdmDic = SectionAnalysisTool.HDMAnalysis(this.globeControl1,
e.Polyline, this.m_PipelineLayerNames);
- FrmHDMAnalysis3 frm = new FrmHDMAnalysis3(hdmDic, this.globeControl1,
+ FrmHDMAnalysis3 frm = new FrmHDMAnalysis3(hdmDic, this.globeControl1,
trackPolylineEndMode);
frm.Show(this);
}
@@ -2894,7 +2895,7 @@
switch (trackflag)
{
case "valvequery":
- FrmValveStatistics frm = new FrmValveStatistics(globeControl1,polygon, new DataGridViewDelegate(InitDataGridViewX1));
+ FrmValveStatistics frm = new FrmValveStatistics(globeControl1, polygon, new DataGridViewDelegate(InitDataGridViewX1));
frm.Show(this);
//panelEx6.Visible = true;
toolStripFeatureLength.Text = "";
@@ -2902,15 +2903,15 @@
break;
case "PipelineDistanceStatistics":
-
+
FrmAllPipelineStatis frm1 = new FrmAllPipelineStatis(globeControl1, polygon, new DataGridViewDelegate(InitDataGridViewX1), m_PipelineLayerNames);
frm1.Show(this);
globeControl1.Globe.Action = EnumAction3D.ActionNull;
break;
case "PipelineSpatialQuery":
-
- FrmAllPipelineStatis.ShowForm(globeControl1,polygon,new DataGridViewDelegate(InitDataGridViewX1),m_PipelineLayerNames);
+
+ FrmAllPipelineStatis.ShowForm(globeControl1, polygon, new DataGridViewDelegate(InitDataGridViewX1), m_PipelineLayerNames);
globeControl1.Globe.ClearAnalysis();
globeControl1.Globe.Action = EnumAction3D.ActionNull;
@@ -2970,7 +2971,7 @@
//listBSQ.Add(bsqFeatures);
//FrmBSQDuoBianXingStatis bsqFrm = new FrmBSQDuoBianXingStatis(workWellLen, globeControl1, listBSQ);
- FrmBSQStatis bsqFrm = new FrmBSQStatis(globeControl1,e.Polygon);
+ FrmBSQStatis bsqFrm = new FrmBSQStatis(globeControl1, e.Polygon);
bsqFrm.Show(this);
globeControl1.Globe.Action = EnumAction3D.ActionNull;
break;
@@ -3088,7 +3089,7 @@
{
if (e.Button == MouseButtons.Left)
{
-
+
if (m_AddPipeLine == true && globeControl1.Globe.Action == EnumAction3D.DrawPolyline)//添加管线
{
GSOLayer layerDest = globeControl1.Globe.DestLayerFeatureAdd;
@@ -3271,7 +3272,7 @@
m_isDrawRedPology = false;
globeControl1.Globe.Action = EnumAction3D.ActionNull;
-
+
}
}
@@ -3685,7 +3686,7 @@
///
///
///
- private string GetBubbleInfo(GSOFeature feature,GSOGlobeControl globeControl)
+ private string GetBubbleInfo(GSOFeature feature, GSOGlobeControl globeControl)
{
if (feature == null)
{
@@ -3837,7 +3838,7 @@
{
name2 += "_米";
}
- value2 = dl2.ToString("0.00");
+ value2 = dl2.ToString("0.00");
}
else
{
@@ -4164,7 +4165,7 @@
sideBarPanelItem3.Visible = false;
layerTree.Visible = false;
controlContainerItem3.Visible = false;
-
+
//修改图层管理与标注管理、覆土审查、水平净距分析、垂直净距分析和碰撞分析控件之间的逻辑关系
controlContainerItem5.Visible = false;
sideBar1.Visible = false;
@@ -4186,7 +4187,7 @@
}
*/
Refresh();
-
+
}
}
///
@@ -4239,7 +4240,7 @@
int widthFull = Screen.PrimaryScreen.Bounds.Width;
int heightFull = Screen.PrimaryScreen.Bounds.Height;
-
+
this.FormBorderStyle = FormBorderStyle.None;
this.WindowState = FormWindowState.Normal;
@@ -4549,12 +4550,12 @@
{
double featurelength = PipeLength(currentLayer, 0);// 统计管线的里程数
- toolStripNumbers.Text =currentLayer + " | 共有:" + Convert.ToString(dataCount - 1) + "条记录";
+ toolStripNumbers.Text = currentLayer + " | 共有:" + Convert.ToString(dataCount - 1) + "条记录";
toolStripFeatureLength.Text = " 管线里程:" + featurelength.ToString("0.00") + " 米";
}
else
{
- toolStripNumbers.Text =currentLayer + "| 共有:" + 0 + " 条记录 | ";
+ toolStripNumbers.Text = currentLayer + "| 共有:" + 0 + " 条记录 | ";
}
}
@@ -4707,7 +4708,7 @@
count = 0;
}
}
-
+
///
/// 绘制线 菜单
///
@@ -4885,10 +4886,10 @@
if (globeControl1.Globe.Action != EnumAction3D.NormalHit)
{
buttonItemFX3_6.Checked = false;
- // ClearConnexityAnalysis();
+ // ClearConnexityAnalysis();
buttonItemFX3_5.Checked = false;
- // ClearCloseValvesAnalysis();
+ // ClearCloseValvesAnalysis();
}
if (globeControl1.Globe.Action != EnumAction3D.TrackPolygon)
{
@@ -4909,15 +4910,16 @@
{
e.Cancel = true;
}
- else {
+ else
+ {
globeControl1.Globe.MemoryLayer.SaveAs(Application.StartupPath + "/MyPlace.kml");
}
-
+
//saveLayerList(layerManagerNode.Nodes);
//注销id号为103的热键设定
// UnregisterHotKey(Handle, 103);
}
-
+
///
/// 显示流向 功能
///
@@ -6309,7 +6311,7 @@
globeControl1.Globe.RemoveAllPits();
}
-
+
//}
///
/// 大气层 菜单
@@ -6442,57 +6444,57 @@
///
/// 刷新目录树 功能
///
- private void RefreshDataTree()
- {
- layerTree.Nodes[0].Nodes.Clear();
- Int32 nCount = globeControl1.Globe.DataManager.DataSourceCount;
- Int32 i = 0;
- for (i = 0; i < nCount; i++)
- {
- GSODataSource dataSpace = globeControl1.Globe.DataManager[i];
- TreeNode node = new TreeNode();
- node.Text = dataSpace.Name;
- node.ImageIndex = 0;
- node.SelectedImageIndex = 0;
- node.Checked = true;
- node.Tag = dataSpace;
- Int32 nDatasetCount = dataSpace.DatasetCount;
- for (Int32 j = 0; j < nDatasetCount; j++)
- {
- GSODataset dataset = dataSpace[j];
- TreeNode subNode = new TreeNode();
- subNode.Text = dataset.Name;
- subNode.ImageIndex = 0;
- subNode.SelectedImageIndex = 0;
- subNode.Checked = true;
- subNode.Tag = dataset;
- node.Nodes.Add(subNode);
- }
- layerTree.Nodes[0].Nodes.Add(node);
- }
- }
+ //private void RefreshDataTree()
+ //{
+ // layerTree.Nodes[0].Nodes.Clear();
+ // Int32 nCount = globeControl1.Globe.DataManager.DataSourceCount;
+ // Int32 i = 0;
+ // for (i = 0; i < nCount; i++)
+ // {
+ // GSODataSource dataSpace = globeControl1.Globe.DataManager[i];
+ // TreeNode node = new TreeNode();
+ // node.Text = dataSpace.Name;
+ // node.ImageIndex = 0;
+ // node.SelectedImageIndex = 0;
+ // node.Checked = true;
+ // node.Tag = dataSpace;
+ // Int32 nDatasetCount = dataSpace.DatasetCount;
+ // for (Int32 j = 0; j < nDatasetCount; j++)
+ // {
+ // GSODataset dataset = dataSpace[j];
+ // TreeNode subNode = new TreeNode();
+ // subNode.Text = dataset.Name;
+ // subNode.ImageIndex = 0;
+ // subNode.SelectedImageIndex = 0;
+ // subNode.Checked = true;
+ // subNode.Tag = dataset;
+ // node.Nodes.Add(subNode);
+ // }
+ // layerTree.Nodes[0].Nodes.Add(node);
+ // }
+ //}
///
/// 判断图层是否包含字段列表
///
///
///
- private bool HasFields(string layerName)
- {
- GSOLayer m_layer = globeControl1.Globe.Layers.GetLayerByCaption(layerName);//获取当前选择的layer图层
- if (m_layer == null)
- return false;
- GSOFeatureLayer flayer = m_layer as GSOFeatureLayer;
+ //private bool HasFields(string layerName)
+ //{
+ // GSOLayer m_layer = globeControl1.Globe.Layers.GetLayerByCaption(layerName);//获取当前选择的layer图层
+ // if (m_layer == null)
+ // return false;
+ // GSOFeatureLayer flayer = m_layer as GSOFeatureLayer;
- GSOFeatureDataset _featureDataSet = m_layer.Dataset as GSOFeatureDataset;
- if (_featureDataSet == null)
- return false;
+ // GSOFeatureDataset _featureDataSet = m_layer.Dataset as GSOFeatureDataset;
+ // if (_featureDataSet == null)
+ // return false;
- _featureDataSet.Open();
- if (_featureDataSet.FieldCount > 0)
- return true;
- else
- return false;
- }
+ // _featureDataSet.Open();
+ // if (_featureDataSet.FieldCount > 0)
+ // return true;
+ // else
+ // return false;
+ //}
///
/// 统计指定图层在指定范围内的所有feature对象
@@ -6500,27 +6502,27 @@
///
///
///
- private GSOFeatures Intersect_PointLayer(GSOGeoPolygon3D polygon, string pointLayerName)
- {
- GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pointLayerName);
- if (layer == null)
- return null;
+ //private GSOFeatures Intersect_PointLayer(GSOGeoPolygon3D polygon, string pointLayerName)
+ //{
+ // GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pointLayerName);
+ // if (layer == null)
+ // return null;
- GSOFeatureLayer flayer = layer as GSOFeatureLayer;
- GSOFeatureDataset fdataset = flayer.Dataset as GSOFeatureDataset;
- GSOFeatures feats;
- if (polygon == null)
- {
- feats = flayer.GetAllFeatures();
- }
- else
- {
- feats = flayer.FindFeaturesInPolygon(polygon, false);
- }
+ // GSOFeatureLayer flayer = layer as GSOFeatureLayer;
+ // GSOFeatureDataset fdataset = flayer.Dataset as GSOFeatureDataset;
+ // GSOFeatures feats;
+ // if (polygon == null)
+ // {
+ // feats = flayer.GetAllFeatures();
+ // }
+ // else
+ // {
+ // feats = flayer.FindFeaturesInPolygon(polygon, false);
+ // }
- workWellLen.Add(pointLayerName, feats.Length);
- return feats;
- }
+ // workWellLen.Add(pointLayerName, feats.Length);
+ // return feats;
+ //}
///
/// 碰撞分析功能界面中 选择管线复选框 选中状态改变事件处理
///
@@ -6633,7 +6635,7 @@
}
}
}
-
+
if (globeControl1.Globe.Action == EnumAction3D.SelectObject)
{
globeControl1.Globe.Action = EnumAction3D.ActionNull;
@@ -7928,7 +7930,7 @@
FrmAccessoriesSensor.ShowForm(globeControl1, instrumenLayerNames, 1);
}
-
+
///
/// 碰撞分析 功能界面中 关闭按钮 事件处理
///
@@ -7952,7 +7954,7 @@
}
else
{
- sideBar1.Visible = false;
+ sideBar1.Visible = false;
}
Refresh();
@@ -8632,7 +8634,7 @@
MessageBox.Show("内存过载请清理内存,并重新启动规划分析!", "提示");
return;
}
-
+
}
///
@@ -8695,7 +8697,7 @@
LogManager.saveLog(Utility.userName, this.buttonItem128.Text);
//垂直净距标准
- frmSh = new FrmYJSHTC(globeControl1, globeControl2,layerTree);
+ frmSh = new FrmYJSHTC(globeControl1, globeControl2, layerTree);
if (frmSh.ShowDialog() == DialogResult.OK)
{
@@ -8716,33 +8718,33 @@
double dVerticalJingJuBiaoZhun = 1, dHorizontalJingJuBiaoZhun = 1;
if (frmSh.rukuLayer != null)
{
- #region
+ #region
this.Invoke((EventHandler)delegate
- {
- try
- {
- List managerLayerList = new List();
- for (int i = 0; i < layerManagerNode.Nodes.Count; i++)
- {
- managerLayerList.Add(layerManagerNode.Nodes[i].Text);
- }
- if (!managerLayerList.Contains(frmSh.rukuLayer.Caption))
- {
- TreeNode node = new TreeNode();
- node.Tag = frmSh.rukuLayer;
- node.Text = frmSh.rukuLayer.Dataset.Caption;
- node.ImageIndex = 0;
- node.SelectedImageIndex = 0;
- node.Checked = frmSh.rukuLayer.Visible;
- layerManagerNode.Nodes.Insert(0, node);
- layerManagerNode.Expand();
- }
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message, "提示");
- }
- });
+ {
+ try
+ {
+ List managerLayerList = new List();
+ for (int i = 0; i < layerManagerNode.Nodes.Count; i++)
+ {
+ managerLayerList.Add(layerManagerNode.Nodes[i].Text);
+ }
+ if (!managerLayerList.Contains(frmSh.rukuLayer.Caption))
+ {
+ TreeNode node = new TreeNode();
+ node.Tag = frmSh.rukuLayer;
+ node.Text = frmSh.rukuLayer.Dataset.Caption;
+ node.ImageIndex = 0;
+ node.SelectedImageIndex = 0;
+ node.Checked = frmSh.rukuLayer.Visible;
+ layerManagerNode.Nodes.Insert(0, node);
+ layerManagerNode.Expand();
+ }
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message, "提示");
+ }
+ });
#endregion
shlayername = frmSh.rukuLayer.Name;
@@ -8805,11 +8807,11 @@
}
else
{
-
+
}
}
-
+
///
/// 清除渲染结果
///
@@ -8890,7 +8892,7 @@
private void buttonItem134_Click_1(object sender, EventArgs e)
{
LogManager.saveLog(Utility.userName, "模拟设计修改");
-
+
frmModify = new FrmMnModify(globeControl1, shlayername, shresultLists);
if (boolfrmModify == false)
@@ -9149,7 +9151,7 @@
{
layer.Opaque = 100 - sliderItem1.Value;
}
-
+
optiValue = sliderItem1.Value;
}
///
@@ -9449,9 +9451,9 @@
buttonClearAnalysisResult_Click(null, null);
NetworkAnalysisTool.ClearAllTopAnalysis(this.globeControl1);
- // ClearConnexityAnalysis();//清除连通性分析
- // ClearCloseValvesAnalysis();//清除阀门分析
-
+ // ClearConnexityAnalysis();//清除连通性分析
+ // ClearCloseValvesAnalysis();//清除阀门分析
+
//清除管线间距分析
if (disFeature != null)
{
@@ -9474,7 +9476,7 @@
globeControl1.Globe.UnderGroundFloor.Visible = false;//隐藏地下网格线
- // ClearUpDownTraceAnalysis(); //清除上下游分析
+ // ClearUpDownTraceAnalysis(); //清除上下游分析
globeControl1.Globe.RemoveAllPits();//清除所有坑
string[] markerStrs = new string[9];
@@ -9532,7 +9534,7 @@
//}
//FrmAllPipelineStatis frm = new FrmAllPipelineStatis(0, pipeLineDis, list, globeControl1, new DataGridViewDelegate(InitDataGridViewX1));
- FrmAllPipelineStatis frm = new FrmAllPipelineStatis(globeControl1,null, new DataGridViewDelegate(InitDataGridViewX1), m_PipelineLayerNames);
+ FrmAllPipelineStatis frm = new FrmAllPipelineStatis(globeControl1, null, new DataGridViewDelegate(InitDataGridViewX1), m_PipelineLayerNames);
frm.Show(this);
}
@@ -9604,7 +9606,7 @@
///
///
private void buttonItemTJ3_ALL_Click(object sender, EventArgs e)
- {
+ {
FrmAllWorkWellStatis frm = new FrmAllWorkWellStatis(globeControl1, null, new DataGridViewDelegate(InitDataGridViewX1));
frm.Show(this);
}
@@ -9617,7 +9619,7 @@
{
//日志记录
LogManager.saveLog(Utility.userName, "井盖数量统计");
-
+
trackflag = "workwellquery";
globeControl1.Globe.Action = EnumAction3D.TrackPolygon;
globeControl1.Globe.TrackPolygonTool.TrackMode = EnumTrackMode.SpaceTrack;
@@ -9911,7 +9913,7 @@
globeControl1.Globe.TrackPolylineTool.VerticalLineVisible = true;
globeControl1.Globe.TrackPolylineTool.TrackMode = EnumTrackMode.SpaceTrack;
trackPolylineEndMode = EnumTrackPolylineEndMode.HDM_Analysis;
-
+
}
///
/// 纵断面分析
@@ -9920,9 +9922,9 @@
///
private void buttonItemFX2_2_Click(object sender, EventArgs e)
{
- if (globeControl1.Globe.SelObjectCount<1)
+ if (globeControl1.Globe.SelObjectCount < 1)
{
- MessageBox.Show("请选择一条或者多条管线!", "提示", MessageBoxButtons.OK,
+ MessageBox.Show("请选择一条或者多条管线!", "提示", MessageBoxButtons.OK,
MessageBoxIcon.Information);
return;
}
@@ -9968,7 +9970,7 @@
globeControl1.Globe.TrackPolylineTool.VerticalLineVisible = true;
globeControl1.Globe.TrackPolylineTool.TrackMode = EnumTrackMode.SpaceTrack;
trackPolylineEndMode = EnumTrackPolylineEndMode.JXPM_Analysis;
-
+
}
#endregion
@@ -10062,11 +10064,11 @@
GSOLayer valveLayer = globeControl1.Globe.Layers[pipeLayerNamePrefix + "阀门"];
if (valveLayer == null)
{
- MessageBox.Show("无" + pipeLayerNamePrefix+"阀门图层", "提示");
+ MessageBox.Show("无" + pipeLayerNamePrefix + "阀门图层", "提示");
return;
}
- GSOFeatures valveFeats = NetworkAnalysisTool.CloseValvesAnalysis(resFeature,
+ GSOFeatures valveFeats = NetworkAnalysisTool.CloseValvesAnalysis(resFeature,
resLayer, valveLayer);
if (valveFeats != null)
@@ -10074,7 +10076,7 @@
FrmCloseValves frm = new FrmCloseValves(this.globeControl1, valveFeats);
frm.Show(this);
}
- else
+ else
{
MessageBox.Show("未找到关闭阀门");
}
@@ -10094,7 +10096,7 @@
return;
}
GSOFeature selFeat0, selFeat1;
- GSOLayer layer0,layer1;
+ GSOLayer layer0, layer1;
globeControl1.Globe.GetSelectObject(0, out selFeat0, out layer0);
globeControl1.Globe.GetSelectObject(1, out selFeat1, out layer1);
@@ -10114,7 +10116,7 @@
private void buttonItemFX3_7_Click(object sender, EventArgs e)
{
NetworkTraceUpDown(true); //上游追踪:
-
+
GSOFeature selLineFeature = globeControl1.Globe.SelectedObject;
if (selLineFeature == null || selLineFeature.Geometry == null || selLineFeature.Geometry.Type != EnumGeometryType.GeoPolyline3D)
{
@@ -10123,7 +10125,7 @@
}
GSOLayer selLayer = globeControl1.Globe.SelectedObjectLayer;
- NetworkAnalysisTool.ExplodeAnalysis(this.globeControl1,selLineFeature,selLayer);
+ NetworkAnalysisTool.ExplodeAnalysis(this.globeControl1, selLineFeature, selLayer);
this.buttonItemFX3_5_Click(sender, e); //关阀分析:
@@ -10350,7 +10352,7 @@
FrmBufferAnalysisBSQ frm = new FrmBufferAnalysisBSQ(globeControl1, layerTemp, bsqPT);
frm.Show(this);
}
-
+
}
///
/// 附属物分析
@@ -10479,7 +10481,7 @@
buttonItemLS5.Checked = false;
globeControl1.Globe.Action = EnumAction3D.MeasureArea;
globeControl1.Globe.AreaRuler.SpaceMeasure = false;
-
+
}
# region Fan 重构标注代码
@@ -10540,14 +10542,14 @@
return;
}
GSOGeoPolyline3D selLine = resFeature.Geometry as GSOGeoPolyline3D;
- if (selLine[0].Count <=1)
+ if (selLine[0].Count <= 1)
{
- return;
+ return;
}
- MarkTools.getInstance().showMarker(resFeature,
+ MarkTools.getInstance().showMarker(resFeature,
globeControl1, EnumMarkLayer.Mark_Depth, "");
-
+
}
///
/// 坐标标注
@@ -10999,7 +11001,7 @@
}
private int connectServerCount = 0;
-
+
///
/// 还原球到实测库
///
@@ -11078,7 +11080,7 @@
globeControl1.Refresh();
}
-
+
private void buttonItemSPSZ_Click(object sender, EventArgs e)
{
//日志记录
@@ -11563,7 +11565,7 @@
//日志记录
LogManager.saveLog(Utility.userName, this.buttonItemBJ2.Text);
- FrmSetGoalLayer frm = new FrmSetGoalLayer(globeControl1, instrumenLayerNames,"附属物");
+ FrmSetGoalLayer frm = new FrmSetGoalLayer(globeControl1, instrumenLayerNames, "附属物");
if (frm.ShowDialog() == DialogResult.OK)
{
GSOLayer featureAddLayer = TreeNodeFeatureLayer();
@@ -11585,7 +11587,7 @@
//日志记录
LogManager.saveLog(Utility.userName, this.buttonItemBJ3.Text);
- FrmSetGoalLayer frm = new FrmSetGoalLayer(globeControl1, pipefittingLayerNames,"管点");
+ FrmSetGoalLayer frm = new FrmSetGoalLayer(globeControl1, pipefittingLayerNames, "管点");
if (frm.ShowDialog() == DialogResult.OK)
{
GSOLayer featureAddLayer = TreeNodeFeatureLayer();
@@ -12030,7 +12032,7 @@
featsList.Clear();
lineStruct.Clear();
List listPipelineLayers = new List();
-
+
GSOLayer layer = null;
for (int i = 0; i < m_PipelineLayerNames.Count; i++)
{
@@ -12041,17 +12043,17 @@
}
}
//yanxiaowei 重构
- GSOFeatures selectFeatures=new GSOFeatures();
+ GSOFeatures selectFeatures = new GSOFeatures();
for (int i = 0; i < globeControl1.Globe.SelObjectCount; i++)
{
GSOFeature feature = null;
globeControl1.Globe.GetSelectObject(i, out feature, out layer);
selectFeatures.Add(feature);
}
- DataTable table=new DataTable();
+ DataTable table = new DataTable();
- ClassGSOTool.CalculateRedLineResult(out table, redSH, selectFeatures, globeControl1,
- listPipelineLayers,out lineStruct, out featsList);
+ ClassGSOTool.CalculateRedLineResult(out table, redSH, selectFeatures, globeControl1,
+ listPipelineLayers, out lineStruct, out featsList);
if (table.Rows.Count != 0)
AddDatagridView(table);
@@ -12170,7 +12172,7 @@
//自定义lprj文件名,从程序中复制一lprj文件。
string filePath = dlg.FileName;
string lastname = Path.GetFileName(filePath);
-
+
for (int i = 0; i < dlg.FileNames.Length; i++)
{
AddLayerData(dlg.FileNames[i]);
@@ -12291,7 +12293,7 @@
#endregion
}
- #endregion
+ #endregion
}
///
/// 定位
@@ -12302,7 +12304,7 @@
{
LogManager.saveLog(Utility.userName, this.buttonItemLocation.Text);
- FrmFlyToPosition fly = new FrmFlyToPosition(globeControl1,globeControl2);
+ FrmFlyToPosition fly = new FrmFlyToPosition(globeControl1, globeControl2);
fly.Show(this);
}
///
@@ -12314,10 +12316,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.FlyToPosition(new GSOPoint3d(120.610963, 31.188121, 50), EnumAltitudeMode.Absolute, -4, 50, 800);
globeControl1.Globe.FlyToPointSpeed = 10000000;
@@ -12353,10 +12355,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.Action = EnumAction3D.ActionNull;
dataGridViewX1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
@@ -12389,10 +12391,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.Action = EnumAction3D.ActionNull;
//zhanshi = false;
@@ -12452,7 +12454,7 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent += new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
@@ -12489,10 +12491,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.Action = EnumAction3D.ActionNull;
panelOfTable.Visible = false;
@@ -12523,10 +12525,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.Action = EnumAction3D.ActionNull;
panelOfTable.Visible = false;
@@ -12559,10 +12561,10 @@
{
try
{
-
+
globeControl1.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl1_BeforeSceneRenderEvent);
globeControl2.BeforeSceneRenderEvent -= new BeforeSceneRenderEventHandler(globeControl2_BeforeSceneRenderEvent);
-
+
globeControl1.Globe.Action = EnumAction3D.ActionNull;
panelOfTable.Visible = false;
@@ -12599,7 +12601,7 @@
//FrmCompareFeature frmCompareFeature = new FrmCompareFeature(globeControl1, globeControl2, layerTemp, layerTemp2,m_PipelineLayerNames,sgPipeLayersNames);
int width = this.Width;
- FrmCompareFeature.ShowForm(globeControl1, globeControl2, layerTemp, layerTemp2, m_PipelineLayerNames, sgPipeLayersNames,width);
+ FrmCompareFeature.ShowForm(globeControl1, globeControl2, layerTemp, layerTemp2, m_PipelineLayerNames, sgPipeLayersNames, width);
//frmCompareFeature.Location = new Point((this.Width - frmCompareFeature.Width)/2,50);
//frmCompareFeature.Show(this);
@@ -12661,7 +12663,7 @@
private void 标识器分类统计ToolStripMenuItem_Click(object sender, EventArgs e)
{
globeControl1.Globe.Action = EnumAction3D.ActionNull;
- FrmBSQStatis bsqStatis = new FrmBSQStatis(globeControl1,null);
+ FrmBSQStatis bsqStatis = new FrmBSQStatis(globeControl1, null);
//FrmBSQStatis bsqStatis = new FrmBSQStatis();
bsqStatis.Show(this);
}
@@ -12985,7 +12987,7 @@
frm.ShowDialog();
}
}
-
+
private void btn_user_role_Click(object sender, EventArgs e)
{
LogManager.saveLog(Utility.userName, this.btn_user_role.Text);
@@ -13100,7 +13102,7 @@
// }
// AddLayerData(strDataPath);
// //globeControl1.Globe.Layers.Add(strDataPath);
-
+
// this.Cursor = Cursors.Default;
// }
// else
@@ -13114,7 +13116,7 @@
// AddLayerData(strDataPath);
// //globeControl1.Globe.Layers.Add(strDataPath);
// }
-
+
//}
//else
//{
@@ -13325,7 +13327,7 @@
lendendGZ24_2.Visible = false;
lendendGZ24_3.Visible = false;
}
- #endregion
+ #endregion
private void buttonItemPasswordReset_Click(object sender, EventArgs e)
{
diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe
index 74fa226..064115e 100644
--- a/bin/x86/Debug/Cyberpipe.exe
+++ b/bin/x86/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb
index 6a41a02..44b1730 100644
--- a/bin/x86/Debug/Cyberpipe.pdb
+++ b/bin/x86/Debug/Cyberpipe.pdb
Binary files differ