diff --git a/MainFrm.cs b/MainFrm.cs index f874bc3..5346c71 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -511,10 +511,10 @@ //加载两个地球数据 private void loadData() { - //Thread t1 = new Thread(doLoadDataForGlobalControl); - //t1.IsBackground = true; - //t1.Start(); - doLoadDataForGlobalControl(); + Thread t1 = new Thread(doLoadDataForGlobalControl); + t1.IsBackground = true; + t1.Start(); + //doLoadDataForGlobalControl(); } //delegate void LoadDataForGlobalControl(); @@ -534,10 +534,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"; @@ -554,7 +554,7 @@ globeControl1.Globe.Layers.MoveDown(10000); //加载实测管线数据 - frmLoading.Text = "加载实测管线数据"; + //frmLoading.Text = "加载实测管线数据"; Utility.dataSource = globeControl1.Globe.DataManager.OpenOracleDataSource( Utility.DBServer.Trim() + "/" + Utility.dbdatabase.Trim(), "", "", Utility.userID, @@ -568,12 +568,20 @@ if (dataset != null && Utility.layerNameSet.Contains(dataset.Caption)) { dataset.Caption = dataset.Name; - frmLoading.Text = "加载" + dataset.Name; + //frmLoading.Text = "加载" + dataset.Name; globeControl1.Globe.Layers.Add(dataset); + //Debug.WriteLine(dataset.Name) ; + //if (dataset.Name == "标识器") { + // GSOFeatures g = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetAllFeatures(); + // GSOFeature g1 = g[0]; + // g1.Geometry.Scale(1000, 1000, 1000); + //} } } } - + + + //frmLoading.Close(); this.Invoke((EventHandler)delegate { connectServer(); @@ -1198,6 +1206,7 @@ globeControl1.Globe.Action = EnumAction3D.ActionNull; break; case "BSQDuoBianXiangStatis": + Debug.WriteLine("BSQDuoBianXiangStatis"); FrmBSQStatis bsqFrm = new FrmBSQStatis(globeControl1, e.Polygon); bsqFrm.Show(this); globeControl1.Globe.Action = EnumAction3D.ActionNull; @@ -1502,7 +1511,7 @@ frustumEntity.Position = point; frustumEntity.Length = z; //高度,单位:米 frustumEntity.BottomRadius = 0.1; //底面半径 - frustumEntity.TopRadius = 0.1; //顶面半径 + frustumEntity.TopRadius = 0.05; //顶面半径 feat.Geometry = frustumEntity;//将几何对象加入要素中 @@ -5577,13 +5586,29 @@ /// private void 高度量算ToolStripMenuItem1_Click(object sender, EventArgs e) { - //日志记录 + ////日志记录 + //LogManager.saveLog(Utility.userName, "高度量算"); + + //globeControl1.Globe.Action = EnumAction3D.ActionNull; + //高度量算ToolStripMenuItem1.Checked = !高度量算ToolStripMenuItem1.Checked; + //if (!高度量算ToolStripMenuItem1.Checked) return; + //globeControl1.Globe.Action = EnumAction3D.SelectObject; + + LogManager.saveLog(Utility.userName, "高度量算"); - globeControl1.Globe.Action = EnumAction3D.ActionNull; - 高度量算ToolStripMenuItem1.Checked = !高度量算ToolStripMenuItem1.Checked; - if (!高度量算ToolStripMenuItem1.Checked) return; - globeControl1.Globe.Action = EnumAction3D.SelectObject; + if (globeControl1.Globe.Action != EnumAction3D.MeasureHeight) + { + globeControl1.Globe.Action = EnumAction3D.MeasureHeight; + globeControl1.Globe.HeightRuler.SpaceMeasure = true; + } + else + { + if (globeControl1.Globe.HeightRuler.SpaceMeasure) + globeControl1.Globe.Action = EnumAction3D.ActionNull; + else + globeControl1.Globe.HeightRuler.SpaceMeasure = true; + } } /// /// 水平面积 @@ -7108,6 +7133,7 @@ /// private void 标识器分类统计ToolStripMenuItem1_Click(object sender, EventArgs e) { + Debug.WriteLine("标识器分类统计ToolStripMenuItem1_Click"); trackflag = "BSQDuoBianXiangStatis"; globeControl1.Globe.Action = EnumAction3D.TrackPolygon; } @@ -7560,11 +7586,13 @@ private void 全区域统计ToolStripMenuItem1_Click(object sender, EventArgs e) { + Debug.WriteLine("标识器分类统计 全区域"); 标识器分类统计ToolStripMenuItem_Click(sender, e); } private void 绘制区域统计ToolStripMenuItem1_Click(object sender, EventArgs e) { + Debug.WriteLine("标识器分类统计 绘制区域"); 标识器分类统计ToolStripMenuItem1_Click(sender, e); }