diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FrmGBJC.cs b/FrmGBJC.cs index 4a23dcf..f872aff 100644 --- a/FrmGBJC.cs +++ b/FrmGBJC.cs @@ -122,7 +122,7 @@ comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); - rs.Show(); + rs.ShowDialog(); this.Close(); } diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FrmGBJC.cs b/FrmGBJC.cs index 4a23dcf..f872aff 100644 --- a/FrmGBJC.cs +++ b/FrmGBJC.cs @@ -122,7 +122,7 @@ comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); - rs.Show(); + rs.ShowDialog(); this.Close(); } diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 5db5011..a36ab5e 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Engine; @@ -65,6 +66,7 @@ { try { + Debug.WriteLine("创建拓扑btn_OK_Click"); //创建线拓扑 if (tboxTopoName.Text == "") { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FrmGBJC.cs b/FrmGBJC.cs index 4a23dcf..f872aff 100644 --- a/FrmGBJC.cs +++ b/FrmGBJC.cs @@ -122,7 +122,7 @@ comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); - rs.Show(); + rs.ShowDialog(); this.Close(); } diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 5db5011..a36ab5e 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Engine; @@ -65,6 +66,7 @@ { try { + Debug.WriteLine("创建拓扑btn_OK_Click"); //创建线拓扑 if (tboxTopoName.Text == "") { diff --git a/FrmHotFuncStat.cs b/FrmHotFuncStat.cs index eb6255e..7d15bf7 100644 --- a/FrmHotFuncStat.cs +++ b/FrmHotFuncStat.cs @@ -325,7 +325,7 @@ + "热点功能统计专题图-" + DateTime.Now.ToString("yyyyMMdd"); FrmHotFuncStatTitle frmHfst = new FrmHotFuncStatTitle(chart1,title); - frmHfst.Show(); + frmHfst.ShowDialog(); } diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FrmGBJC.cs b/FrmGBJC.cs index 4a23dcf..f872aff 100644 --- a/FrmGBJC.cs +++ b/FrmGBJC.cs @@ -122,7 +122,7 @@ comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); - rs.Show(); + rs.ShowDialog(); this.Close(); } diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 5db5011..a36ab5e 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Engine; @@ -65,6 +66,7 @@ { try { + Debug.WriteLine("创建拓扑btn_OK_Click"); //创建线拓扑 if (tboxTopoName.Text == "") { diff --git a/FrmHotFuncStat.cs b/FrmHotFuncStat.cs index eb6255e..7d15bf7 100644 --- a/FrmHotFuncStat.cs +++ b/FrmHotFuncStat.cs @@ -325,7 +325,7 @@ + "热点功能统计专题图-" + DateTime.Now.ToString("yyyyMMdd"); FrmHotFuncStatTitle frmHfst = new FrmHotFuncStatTitle(chart1,title); - frmHfst.Show(); + frmHfst.ShowDialog(); } diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 874f5f4..3f24011 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmKeywordQuery(_ctl, _list, InitDataGridViewX1); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FrmGBJC.cs b/FrmGBJC.cs index 4a23dcf..f872aff 100644 --- a/FrmGBJC.cs +++ b/FrmGBJC.cs @@ -122,7 +122,7 @@ comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); - rs.Show(); + rs.ShowDialog(); this.Close(); } diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 5db5011..a36ab5e 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Engine; @@ -65,6 +66,7 @@ { try { + Debug.WriteLine("创建拓扑btn_OK_Click"); //创建线拓扑 if (tboxTopoName.Text == "") { diff --git a/FrmHotFuncStat.cs b/FrmHotFuncStat.cs index eb6255e..7d15bf7 100644 --- a/FrmHotFuncStat.cs +++ b/FrmHotFuncStat.cs @@ -325,7 +325,7 @@ + "热点功能统计专题图-" + DateTime.Now.ToString("yyyyMMdd"); FrmHotFuncStatTitle frmHfst = new FrmHotFuncStatTitle(chart1,title); - frmHfst.Show(); + frmHfst.ShowDialog(); } diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 874f5f4..3f24011 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmKeywordQuery(_ctl, _list, InitDataGridViewX1); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs index 29031d8..1f8590f 100644 --- a/FrmLayerControl.cs +++ b/FrmLayerControl.cs @@ -6,6 +6,7 @@ using GeoScene.Globe; using GeoScene.Engine; using System.Xml; +using System.Diagnostics; namespace Cyberpipe { @@ -36,6 +37,7 @@ /// private void layerTree2_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl2,e.Node); @@ -44,6 +46,7 @@ private void layerTree1_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl1, e.Node); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FrmGBJC.cs b/FrmGBJC.cs index 4a23dcf..f872aff 100644 --- a/FrmGBJC.cs +++ b/FrmGBJC.cs @@ -122,7 +122,7 @@ comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); - rs.Show(); + rs.ShowDialog(); this.Close(); } diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 5db5011..a36ab5e 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Engine; @@ -65,6 +66,7 @@ { try { + Debug.WriteLine("创建拓扑btn_OK_Click"); //创建线拓扑 if (tboxTopoName.Text == "") { diff --git a/FrmHotFuncStat.cs b/FrmHotFuncStat.cs index eb6255e..7d15bf7 100644 --- a/FrmHotFuncStat.cs +++ b/FrmHotFuncStat.cs @@ -325,7 +325,7 @@ + "热点功能统计专题图-" + DateTime.Now.ToString("yyyyMMdd"); FrmHotFuncStatTitle frmHfst = new FrmHotFuncStatTitle(chart1,title); - frmHfst.Show(); + frmHfst.ShowDialog(); } diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 874f5f4..3f24011 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmKeywordQuery(_ctl, _list, InitDataGridViewX1); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs index 29031d8..1f8590f 100644 --- a/FrmLayerControl.cs +++ b/FrmLayerControl.cs @@ -6,6 +6,7 @@ using GeoScene.Globe; using GeoScene.Engine; using System.Xml; +using System.Diagnostics; namespace Cyberpipe { @@ -36,6 +37,7 @@ /// private void layerTree2_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl2,e.Node); @@ -44,6 +46,7 @@ private void layerTree1_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl1, e.Node); diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 99f4d3b..10eb31e 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmMaterialSel(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FrmGBJC.cs b/FrmGBJC.cs index 4a23dcf..f872aff 100644 --- a/FrmGBJC.cs +++ b/FrmGBJC.cs @@ -122,7 +122,7 @@ comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); - rs.Show(); + rs.ShowDialog(); this.Close(); } diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 5db5011..a36ab5e 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Engine; @@ -65,6 +66,7 @@ { try { + Debug.WriteLine("创建拓扑btn_OK_Click"); //创建线拓扑 if (tboxTopoName.Text == "") { diff --git a/FrmHotFuncStat.cs b/FrmHotFuncStat.cs index eb6255e..7d15bf7 100644 --- a/FrmHotFuncStat.cs +++ b/FrmHotFuncStat.cs @@ -325,7 +325,7 @@ + "热点功能统计专题图-" + DateTime.Now.ToString("yyyyMMdd"); FrmHotFuncStatTitle frmHfst = new FrmHotFuncStatTitle(chart1,title); - frmHfst.Show(); + frmHfst.ShowDialog(); } diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 874f5f4..3f24011 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmKeywordQuery(_ctl, _list, InitDataGridViewX1); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs index 29031d8..1f8590f 100644 --- a/FrmLayerControl.cs +++ b/FrmLayerControl.cs @@ -6,6 +6,7 @@ using GeoScene.Globe; using GeoScene.Engine; using System.Xml; +using System.Diagnostics; namespace Cyberpipe { @@ -36,6 +37,7 @@ /// private void layerTree2_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl2,e.Node); @@ -44,6 +46,7 @@ private void layerTree1_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl1, e.Node); diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 99f4d3b..10eb31e 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmMaterialSel(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 4620996..cfb4c18 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -253,7 +253,7 @@ { long dbid = long.Parse(row.Cells["编号"].Value.ToString()); PatrolLog p = new PatrolLog(dbid.ToString()); - p.Show(); + p.ShowDialog(); } catch (Exception ex) { @@ -283,7 +283,7 @@ if (dt.Rows.Count > 0) { TaskInfo p = new TaskInfo(int.Parse(dt.Rows[0][0].ToString())); - p.Show(); + p.ShowDialog(); } else { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FrmGBJC.cs b/FrmGBJC.cs index 4a23dcf..f872aff 100644 --- a/FrmGBJC.cs +++ b/FrmGBJC.cs @@ -122,7 +122,7 @@ comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); - rs.Show(); + rs.ShowDialog(); this.Close(); } diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 5db5011..a36ab5e 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Engine; @@ -65,6 +66,7 @@ { try { + Debug.WriteLine("创建拓扑btn_OK_Click"); //创建线拓扑 if (tboxTopoName.Text == "") { diff --git a/FrmHotFuncStat.cs b/FrmHotFuncStat.cs index eb6255e..7d15bf7 100644 --- a/FrmHotFuncStat.cs +++ b/FrmHotFuncStat.cs @@ -325,7 +325,7 @@ + "热点功能统计专题图-" + DateTime.Now.ToString("yyyyMMdd"); FrmHotFuncStatTitle frmHfst = new FrmHotFuncStatTitle(chart1,title); - frmHfst.Show(); + frmHfst.ShowDialog(); } diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 874f5f4..3f24011 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmKeywordQuery(_ctl, _list, InitDataGridViewX1); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs index 29031d8..1f8590f 100644 --- a/FrmLayerControl.cs +++ b/FrmLayerControl.cs @@ -6,6 +6,7 @@ using GeoScene.Globe; using GeoScene.Engine; using System.Xml; +using System.Diagnostics; namespace Cyberpipe { @@ -36,6 +37,7 @@ /// private void layerTree2_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl2,e.Node); @@ -44,6 +46,7 @@ private void layerTree1_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl1, e.Node); diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 99f4d3b..10eb31e 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmMaterialSel(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 4620996..cfb4c18 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -253,7 +253,7 @@ { long dbid = long.Parse(row.Cells["编号"].Value.ToString()); PatrolLog p = new PatrolLog(dbid.ToString()); - p.Show(); + p.ShowDialog(); } catch (Exception ex) { @@ -283,7 +283,7 @@ if (dt.Rows.Count > 0) { TaskInfo p = new TaskInfo(int.Parse(dt.Rows[0][0].ToString())); - p.Show(); + p.ShowDialog(); } else { diff --git a/FrmQuerySQL.cs b/FrmQuerySQL.cs index 8dd23df..a31e7ce 100644 --- a/FrmQuerySQL.cs +++ b/FrmQuerySQL.cs @@ -24,7 +24,7 @@ if (frm == null) { frm = new FrmQuerySQL(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FrmGBJC.cs b/FrmGBJC.cs index 4a23dcf..f872aff 100644 --- a/FrmGBJC.cs +++ b/FrmGBJC.cs @@ -122,7 +122,7 @@ comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); - rs.Show(); + rs.ShowDialog(); this.Close(); } diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 5db5011..a36ab5e 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Engine; @@ -65,6 +66,7 @@ { try { + Debug.WriteLine("创建拓扑btn_OK_Click"); //创建线拓扑 if (tboxTopoName.Text == "") { diff --git a/FrmHotFuncStat.cs b/FrmHotFuncStat.cs index eb6255e..7d15bf7 100644 --- a/FrmHotFuncStat.cs +++ b/FrmHotFuncStat.cs @@ -325,7 +325,7 @@ + "热点功能统计专题图-" + DateTime.Now.ToString("yyyyMMdd"); FrmHotFuncStatTitle frmHfst = new FrmHotFuncStatTitle(chart1,title); - frmHfst.Show(); + frmHfst.ShowDialog(); } diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 874f5f4..3f24011 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmKeywordQuery(_ctl, _list, InitDataGridViewX1); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs index 29031d8..1f8590f 100644 --- a/FrmLayerControl.cs +++ b/FrmLayerControl.cs @@ -6,6 +6,7 @@ using GeoScene.Globe; using GeoScene.Engine; using System.Xml; +using System.Diagnostics; namespace Cyberpipe { @@ -36,6 +37,7 @@ /// private void layerTree2_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl2,e.Node); @@ -44,6 +46,7 @@ private void layerTree1_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl1, e.Node); diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 99f4d3b..10eb31e 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmMaterialSel(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 4620996..cfb4c18 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -253,7 +253,7 @@ { long dbid = long.Parse(row.Cells["编号"].Value.ToString()); PatrolLog p = new PatrolLog(dbid.ToString()); - p.Show(); + p.ShowDialog(); } catch (Exception ex) { @@ -283,7 +283,7 @@ if (dt.Rows.Count > 0) { TaskInfo p = new TaskInfo(int.Parse(dt.Rows[0][0].ToString())); - p.Show(); + p.ShowDialog(); } else { diff --git a/FrmQuerySQL.cs b/FrmQuerySQL.cs index 8dd23df..a31e7ce 100644 --- a/FrmQuerySQL.cs +++ b/FrmQuerySQL.cs @@ -24,7 +24,7 @@ if (frm == null) { frm = new FrmQuerySQL(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmSetFlytoPos.cs b/FrmSetFlytoPos.cs index 8f753df..a234459 100644 --- a/FrmSetFlytoPos.cs +++ b/FrmSetFlytoPos.cs @@ -16,7 +16,7 @@ if (frm == null) { frm = new FrmSetFlytoPos(globecontrol); - frm.Show(globecontrol.Parent); + frm.ShowDialog(globecontrol.Parent); } else { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FrmGBJC.cs b/FrmGBJC.cs index 4a23dcf..f872aff 100644 --- a/FrmGBJC.cs +++ b/FrmGBJC.cs @@ -122,7 +122,7 @@ comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); - rs.Show(); + rs.ShowDialog(); this.Close(); } diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 5db5011..a36ab5e 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Engine; @@ -65,6 +66,7 @@ { try { + Debug.WriteLine("创建拓扑btn_OK_Click"); //创建线拓扑 if (tboxTopoName.Text == "") { diff --git a/FrmHotFuncStat.cs b/FrmHotFuncStat.cs index eb6255e..7d15bf7 100644 --- a/FrmHotFuncStat.cs +++ b/FrmHotFuncStat.cs @@ -325,7 +325,7 @@ + "热点功能统计专题图-" + DateTime.Now.ToString("yyyyMMdd"); FrmHotFuncStatTitle frmHfst = new FrmHotFuncStatTitle(chart1,title); - frmHfst.Show(); + frmHfst.ShowDialog(); } diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 874f5f4..3f24011 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmKeywordQuery(_ctl, _list, InitDataGridViewX1); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs index 29031d8..1f8590f 100644 --- a/FrmLayerControl.cs +++ b/FrmLayerControl.cs @@ -6,6 +6,7 @@ using GeoScene.Globe; using GeoScene.Engine; using System.Xml; +using System.Diagnostics; namespace Cyberpipe { @@ -36,6 +37,7 @@ /// private void layerTree2_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl2,e.Node); @@ -44,6 +46,7 @@ private void layerTree1_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl1, e.Node); diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 99f4d3b..10eb31e 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmMaterialSel(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 4620996..cfb4c18 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -253,7 +253,7 @@ { long dbid = long.Parse(row.Cells["编号"].Value.ToString()); PatrolLog p = new PatrolLog(dbid.ToString()); - p.Show(); + p.ShowDialog(); } catch (Exception ex) { @@ -283,7 +283,7 @@ if (dt.Rows.Count > 0) { TaskInfo p = new TaskInfo(int.Parse(dt.Rows[0][0].ToString())); - p.Show(); + p.ShowDialog(); } else { diff --git a/FrmQuerySQL.cs b/FrmQuerySQL.cs index 8dd23df..a31e7ce 100644 --- a/FrmQuerySQL.cs +++ b/FrmQuerySQL.cs @@ -24,7 +24,7 @@ if (frm == null) { frm = new FrmQuerySQL(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmSetFlytoPos.cs b/FrmSetFlytoPos.cs index 8f753df..a234459 100644 --- a/FrmSetFlytoPos.cs +++ b/FrmSetFlytoPos.cs @@ -16,7 +16,7 @@ if (frm == null) { frm = new FrmSetFlytoPos(globecontrol); - frm.Show(globecontrol.Parent); + frm.ShowDialog(globecontrol.Parent); } else { diff --git a/FrmSetLatLonPos.cs b/FrmSetLatLonPos.cs index 0f0584e..b2a611e 100644 --- a/FrmSetLatLonPos.cs +++ b/FrmSetLatLonPos.cs @@ -16,7 +16,7 @@ if (frm == null) { frm = new FrmSetLatLonPos(ctl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FrmGBJC.cs b/FrmGBJC.cs index 4a23dcf..f872aff 100644 --- a/FrmGBJC.cs +++ b/FrmGBJC.cs @@ -122,7 +122,7 @@ comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); - rs.Show(); + rs.ShowDialog(); this.Close(); } diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 5db5011..a36ab5e 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Engine; @@ -65,6 +66,7 @@ { try { + Debug.WriteLine("创建拓扑btn_OK_Click"); //创建线拓扑 if (tboxTopoName.Text == "") { diff --git a/FrmHotFuncStat.cs b/FrmHotFuncStat.cs index eb6255e..7d15bf7 100644 --- a/FrmHotFuncStat.cs +++ b/FrmHotFuncStat.cs @@ -325,7 +325,7 @@ + "热点功能统计专题图-" + DateTime.Now.ToString("yyyyMMdd"); FrmHotFuncStatTitle frmHfst = new FrmHotFuncStatTitle(chart1,title); - frmHfst.Show(); + frmHfst.ShowDialog(); } diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 874f5f4..3f24011 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmKeywordQuery(_ctl, _list, InitDataGridViewX1); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs index 29031d8..1f8590f 100644 --- a/FrmLayerControl.cs +++ b/FrmLayerControl.cs @@ -6,6 +6,7 @@ using GeoScene.Globe; using GeoScene.Engine; using System.Xml; +using System.Diagnostics; namespace Cyberpipe { @@ -36,6 +37,7 @@ /// private void layerTree2_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl2,e.Node); @@ -44,6 +46,7 @@ private void layerTree1_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl1, e.Node); diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 99f4d3b..10eb31e 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmMaterialSel(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 4620996..cfb4c18 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -253,7 +253,7 @@ { long dbid = long.Parse(row.Cells["编号"].Value.ToString()); PatrolLog p = new PatrolLog(dbid.ToString()); - p.Show(); + p.ShowDialog(); } catch (Exception ex) { @@ -283,7 +283,7 @@ if (dt.Rows.Count > 0) { TaskInfo p = new TaskInfo(int.Parse(dt.Rows[0][0].ToString())); - p.Show(); + p.ShowDialog(); } else { diff --git a/FrmQuerySQL.cs b/FrmQuerySQL.cs index 8dd23df..a31e7ce 100644 --- a/FrmQuerySQL.cs +++ b/FrmQuerySQL.cs @@ -24,7 +24,7 @@ if (frm == null) { frm = new FrmQuerySQL(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmSetFlytoPos.cs b/FrmSetFlytoPos.cs index 8f753df..a234459 100644 --- a/FrmSetFlytoPos.cs +++ b/FrmSetFlytoPos.cs @@ -16,7 +16,7 @@ if (frm == null) { frm = new FrmSetFlytoPos(globecontrol); - frm.Show(globecontrol.Parent); + frm.ShowDialog(globecontrol.Parent); } else { diff --git a/FrmSetLatLonPos.cs b/FrmSetLatLonPos.cs index 0f0584e..b2a611e 100644 --- a/FrmSetLatLonPos.cs +++ b/FrmSetLatLonPos.cs @@ -16,7 +16,7 @@ if (frm == null) { frm = new FrmSetLatLonPos(ctl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else { diff --git a/FrmValveStatistics.cs b/FrmValveStatistics.cs index 926377a..6405d5f 100644 --- a/FrmValveStatistics.cs +++ b/FrmValveStatistics.cs @@ -169,7 +169,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chaFamenStatis); - frm.Show(); + frm.ShowDialog(); } /// /// 获取区域内的各图层阀门 diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FrmGBJC.cs b/FrmGBJC.cs index 4a23dcf..f872aff 100644 --- a/FrmGBJC.cs +++ b/FrmGBJC.cs @@ -122,7 +122,7 @@ comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); - rs.Show(); + rs.ShowDialog(); this.Close(); } diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 5db5011..a36ab5e 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Engine; @@ -65,6 +66,7 @@ { try { + Debug.WriteLine("创建拓扑btn_OK_Click"); //创建线拓扑 if (tboxTopoName.Text == "") { diff --git a/FrmHotFuncStat.cs b/FrmHotFuncStat.cs index eb6255e..7d15bf7 100644 --- a/FrmHotFuncStat.cs +++ b/FrmHotFuncStat.cs @@ -325,7 +325,7 @@ + "热点功能统计专题图-" + DateTime.Now.ToString("yyyyMMdd"); FrmHotFuncStatTitle frmHfst = new FrmHotFuncStatTitle(chart1,title); - frmHfst.Show(); + frmHfst.ShowDialog(); } diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 874f5f4..3f24011 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmKeywordQuery(_ctl, _list, InitDataGridViewX1); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs index 29031d8..1f8590f 100644 --- a/FrmLayerControl.cs +++ b/FrmLayerControl.cs @@ -6,6 +6,7 @@ using GeoScene.Globe; using GeoScene.Engine; using System.Xml; +using System.Diagnostics; namespace Cyberpipe { @@ -36,6 +37,7 @@ /// private void layerTree2_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl2,e.Node); @@ -44,6 +46,7 @@ private void layerTree1_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl1, e.Node); diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 99f4d3b..10eb31e 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmMaterialSel(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 4620996..cfb4c18 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -253,7 +253,7 @@ { long dbid = long.Parse(row.Cells["编号"].Value.ToString()); PatrolLog p = new PatrolLog(dbid.ToString()); - p.Show(); + p.ShowDialog(); } catch (Exception ex) { @@ -283,7 +283,7 @@ if (dt.Rows.Count > 0) { TaskInfo p = new TaskInfo(int.Parse(dt.Rows[0][0].ToString())); - p.Show(); + p.ShowDialog(); } else { diff --git a/FrmQuerySQL.cs b/FrmQuerySQL.cs index 8dd23df..a31e7ce 100644 --- a/FrmQuerySQL.cs +++ b/FrmQuerySQL.cs @@ -24,7 +24,7 @@ if (frm == null) { frm = new FrmQuerySQL(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmSetFlytoPos.cs b/FrmSetFlytoPos.cs index 8f753df..a234459 100644 --- a/FrmSetFlytoPos.cs +++ b/FrmSetFlytoPos.cs @@ -16,7 +16,7 @@ if (frm == null) { frm = new FrmSetFlytoPos(globecontrol); - frm.Show(globecontrol.Parent); + frm.ShowDialog(globecontrol.Parent); } else { diff --git a/FrmSetLatLonPos.cs b/FrmSetLatLonPos.cs index 0f0584e..b2a611e 100644 --- a/FrmSetLatLonPos.cs +++ b/FrmSetLatLonPos.cs @@ -16,7 +16,7 @@ if (frm == null) { frm = new FrmSetLatLonPos(ctl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else { diff --git a/FrmValveStatistics.cs b/FrmValveStatistics.cs index 926377a..6405d5f 100644 --- a/FrmValveStatistics.cs +++ b/FrmValveStatistics.cs @@ -169,7 +169,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chaFamenStatis); - frm.Show(); + frm.ShowDialog(); } /// /// 获取区域内的各图层阀门 diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index f034488..01cf891 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmpipeDeepstatis(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FrmGBJC.cs b/FrmGBJC.cs index 4a23dcf..f872aff 100644 --- a/FrmGBJC.cs +++ b/FrmGBJC.cs @@ -122,7 +122,7 @@ comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); - rs.Show(); + rs.ShowDialog(); this.Close(); } diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 5db5011..a36ab5e 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Engine; @@ -65,6 +66,7 @@ { try { + Debug.WriteLine("创建拓扑btn_OK_Click"); //创建线拓扑 if (tboxTopoName.Text == "") { diff --git a/FrmHotFuncStat.cs b/FrmHotFuncStat.cs index eb6255e..7d15bf7 100644 --- a/FrmHotFuncStat.cs +++ b/FrmHotFuncStat.cs @@ -325,7 +325,7 @@ + "热点功能统计专题图-" + DateTime.Now.ToString("yyyyMMdd"); FrmHotFuncStatTitle frmHfst = new FrmHotFuncStatTitle(chart1,title); - frmHfst.Show(); + frmHfst.ShowDialog(); } diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 874f5f4..3f24011 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmKeywordQuery(_ctl, _list, InitDataGridViewX1); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs index 29031d8..1f8590f 100644 --- a/FrmLayerControl.cs +++ b/FrmLayerControl.cs @@ -6,6 +6,7 @@ using GeoScene.Globe; using GeoScene.Engine; using System.Xml; +using System.Diagnostics; namespace Cyberpipe { @@ -36,6 +37,7 @@ /// private void layerTree2_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl2,e.Node); @@ -44,6 +46,7 @@ private void layerTree1_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl1, e.Node); diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 99f4d3b..10eb31e 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmMaterialSel(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 4620996..cfb4c18 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -253,7 +253,7 @@ { long dbid = long.Parse(row.Cells["编号"].Value.ToString()); PatrolLog p = new PatrolLog(dbid.ToString()); - p.Show(); + p.ShowDialog(); } catch (Exception ex) { @@ -283,7 +283,7 @@ if (dt.Rows.Count > 0) { TaskInfo p = new TaskInfo(int.Parse(dt.Rows[0][0].ToString())); - p.Show(); + p.ShowDialog(); } else { diff --git a/FrmQuerySQL.cs b/FrmQuerySQL.cs index 8dd23df..a31e7ce 100644 --- a/FrmQuerySQL.cs +++ b/FrmQuerySQL.cs @@ -24,7 +24,7 @@ if (frm == null) { frm = new FrmQuerySQL(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmSetFlytoPos.cs b/FrmSetFlytoPos.cs index 8f753df..a234459 100644 --- a/FrmSetFlytoPos.cs +++ b/FrmSetFlytoPos.cs @@ -16,7 +16,7 @@ if (frm == null) { frm = new FrmSetFlytoPos(globecontrol); - frm.Show(globecontrol.Parent); + frm.ShowDialog(globecontrol.Parent); } else { diff --git a/FrmSetLatLonPos.cs b/FrmSetLatLonPos.cs index 0f0584e..b2a611e 100644 --- a/FrmSetLatLonPos.cs +++ b/FrmSetLatLonPos.cs @@ -16,7 +16,7 @@ if (frm == null) { frm = new FrmSetLatLonPos(ctl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else { diff --git a/FrmValveStatistics.cs b/FrmValveStatistics.cs index 926377a..6405d5f 100644 --- a/FrmValveStatistics.cs +++ b/FrmValveStatistics.cs @@ -169,7 +169,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chaFamenStatis); - frm.Show(); + frm.ShowDialog(); } /// /// 获取区域内的各图层阀门 diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index f034488..01cf891 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmpipeDeepstatis(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index 99bfabb..9f26425 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmpipeDiametergather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FrmGBJC.cs b/FrmGBJC.cs index 4a23dcf..f872aff 100644 --- a/FrmGBJC.cs +++ b/FrmGBJC.cs @@ -122,7 +122,7 @@ comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); - rs.Show(); + rs.ShowDialog(); this.Close(); } diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 5db5011..a36ab5e 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Engine; @@ -65,6 +66,7 @@ { try { + Debug.WriteLine("创建拓扑btn_OK_Click"); //创建线拓扑 if (tboxTopoName.Text == "") { diff --git a/FrmHotFuncStat.cs b/FrmHotFuncStat.cs index eb6255e..7d15bf7 100644 --- a/FrmHotFuncStat.cs +++ b/FrmHotFuncStat.cs @@ -325,7 +325,7 @@ + "热点功能统计专题图-" + DateTime.Now.ToString("yyyyMMdd"); FrmHotFuncStatTitle frmHfst = new FrmHotFuncStatTitle(chart1,title); - frmHfst.Show(); + frmHfst.ShowDialog(); } diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 874f5f4..3f24011 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmKeywordQuery(_ctl, _list, InitDataGridViewX1); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs index 29031d8..1f8590f 100644 --- a/FrmLayerControl.cs +++ b/FrmLayerControl.cs @@ -6,6 +6,7 @@ using GeoScene.Globe; using GeoScene.Engine; using System.Xml; +using System.Diagnostics; namespace Cyberpipe { @@ -36,6 +37,7 @@ /// private void layerTree2_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl2,e.Node); @@ -44,6 +46,7 @@ private void layerTree1_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl1, e.Node); diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 99f4d3b..10eb31e 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmMaterialSel(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 4620996..cfb4c18 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -253,7 +253,7 @@ { long dbid = long.Parse(row.Cells["编号"].Value.ToString()); PatrolLog p = new PatrolLog(dbid.ToString()); - p.Show(); + p.ShowDialog(); } catch (Exception ex) { @@ -283,7 +283,7 @@ if (dt.Rows.Count > 0) { TaskInfo p = new TaskInfo(int.Parse(dt.Rows[0][0].ToString())); - p.Show(); + p.ShowDialog(); } else { diff --git a/FrmQuerySQL.cs b/FrmQuerySQL.cs index 8dd23df..a31e7ce 100644 --- a/FrmQuerySQL.cs +++ b/FrmQuerySQL.cs @@ -24,7 +24,7 @@ if (frm == null) { frm = new FrmQuerySQL(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmSetFlytoPos.cs b/FrmSetFlytoPos.cs index 8f753df..a234459 100644 --- a/FrmSetFlytoPos.cs +++ b/FrmSetFlytoPos.cs @@ -16,7 +16,7 @@ if (frm == null) { frm = new FrmSetFlytoPos(globecontrol); - frm.Show(globecontrol.Parent); + frm.ShowDialog(globecontrol.Parent); } else { diff --git a/FrmSetLatLonPos.cs b/FrmSetLatLonPos.cs index 0f0584e..b2a611e 100644 --- a/FrmSetLatLonPos.cs +++ b/FrmSetLatLonPos.cs @@ -16,7 +16,7 @@ if (frm == null) { frm = new FrmSetLatLonPos(ctl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else { diff --git a/FrmValveStatistics.cs b/FrmValveStatistics.cs index 926377a..6405d5f 100644 --- a/FrmValveStatistics.cs +++ b/FrmValveStatistics.cs @@ -169,7 +169,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chaFamenStatis); - frm.Show(); + frm.ShowDialog(); } /// /// 获取区域内的各图层阀门 diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index f034488..01cf891 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmpipeDeepstatis(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index 99bfabb..9f26425 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmpipeDiametergather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 00a7565..3f1e7d3 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmpipeMaterialGather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else if(frm.WindowState == FormWindowState.Minimized) { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FrmGBJC.cs b/FrmGBJC.cs index 4a23dcf..f872aff 100644 --- a/FrmGBJC.cs +++ b/FrmGBJC.cs @@ -122,7 +122,7 @@ comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); - rs.Show(); + rs.ShowDialog(); this.Close(); } diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 5db5011..a36ab5e 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Engine; @@ -65,6 +66,7 @@ { try { + Debug.WriteLine("创建拓扑btn_OK_Click"); //创建线拓扑 if (tboxTopoName.Text == "") { diff --git a/FrmHotFuncStat.cs b/FrmHotFuncStat.cs index eb6255e..7d15bf7 100644 --- a/FrmHotFuncStat.cs +++ b/FrmHotFuncStat.cs @@ -325,7 +325,7 @@ + "热点功能统计专题图-" + DateTime.Now.ToString("yyyyMMdd"); FrmHotFuncStatTitle frmHfst = new FrmHotFuncStatTitle(chart1,title); - frmHfst.Show(); + frmHfst.ShowDialog(); } diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 874f5f4..3f24011 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmKeywordQuery(_ctl, _list, InitDataGridViewX1); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs index 29031d8..1f8590f 100644 --- a/FrmLayerControl.cs +++ b/FrmLayerControl.cs @@ -6,6 +6,7 @@ using GeoScene.Globe; using GeoScene.Engine; using System.Xml; +using System.Diagnostics; namespace Cyberpipe { @@ -36,6 +37,7 @@ /// private void layerTree2_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl2,e.Node); @@ -44,6 +46,7 @@ private void layerTree1_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl1, e.Node); diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 99f4d3b..10eb31e 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmMaterialSel(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 4620996..cfb4c18 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -253,7 +253,7 @@ { long dbid = long.Parse(row.Cells["编号"].Value.ToString()); PatrolLog p = new PatrolLog(dbid.ToString()); - p.Show(); + p.ShowDialog(); } catch (Exception ex) { @@ -283,7 +283,7 @@ if (dt.Rows.Count > 0) { TaskInfo p = new TaskInfo(int.Parse(dt.Rows[0][0].ToString())); - p.Show(); + p.ShowDialog(); } else { diff --git a/FrmQuerySQL.cs b/FrmQuerySQL.cs index 8dd23df..a31e7ce 100644 --- a/FrmQuerySQL.cs +++ b/FrmQuerySQL.cs @@ -24,7 +24,7 @@ if (frm == null) { frm = new FrmQuerySQL(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmSetFlytoPos.cs b/FrmSetFlytoPos.cs index 8f753df..a234459 100644 --- a/FrmSetFlytoPos.cs +++ b/FrmSetFlytoPos.cs @@ -16,7 +16,7 @@ if (frm == null) { frm = new FrmSetFlytoPos(globecontrol); - frm.Show(globecontrol.Parent); + frm.ShowDialog(globecontrol.Parent); } else { diff --git a/FrmSetLatLonPos.cs b/FrmSetLatLonPos.cs index 0f0584e..b2a611e 100644 --- a/FrmSetLatLonPos.cs +++ b/FrmSetLatLonPos.cs @@ -16,7 +16,7 @@ if (frm == null) { frm = new FrmSetLatLonPos(ctl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else { diff --git a/FrmValveStatistics.cs b/FrmValveStatistics.cs index 926377a..6405d5f 100644 --- a/FrmValveStatistics.cs +++ b/FrmValveStatistics.cs @@ -169,7 +169,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chaFamenStatis); - frm.Show(); + frm.ShowDialog(); } /// /// 获取区域内的各图层阀门 diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index f034488..01cf891 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmpipeDeepstatis(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index 99bfabb..9f26425 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmpipeDiametergather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 00a7565..3f1e7d3 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmpipeMaterialGather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else if(frm.WindowState == FormWindowState.Minimized) { diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 27f134b..2860f29 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -24,7 +24,7 @@ if (frm == null) { frm = new Frmpipediameterstatis(_globeControl1, pipeLayers, _polygon); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 607dc36..4d5796c 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -59,7 +59,7 @@ { frm = new FormDocumentManager(); //frm.waitpicBox.Show(); - frm.Show(); + frm.ShowDialog(); } else diff --git a/FrmAccessoriesSensor.cs b/FrmAccessoriesSensor.cs index 542f19a..c1d9863 100644 --- a/FrmAccessoriesSensor.cs +++ b/FrmAccessoriesSensor.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmAccessoriesSensor(globeControl, pipeLayers, visibleId); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAccessoriesgather.cs b/FrmAccessoriesgather.cs index cadbe31..228c53d 100644 --- a/FrmAccessoriesgather.cs +++ b/FrmAccessoriesgather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmAccessoriesgather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else { diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index d643245..9d7f0a5 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -53,7 +53,7 @@ combo_model_name.Items.Clear(); globeControl1.Globe.Layers.Remove(layer); FrmValiDataShowErrorMessage showErrorMessage = new FrmValiDataShowErrorMessage(dlg.FileName, txtMessage); - showErrorMessage.Show(); + showErrorMessage.ShowDialog(); return; } else diff --git a/FrmAllPipelineStatis.cs b/FrmAllPipelineStatis.cs index e9a4ae7..298cd0e 100644 --- a/FrmAllPipelineStatis.cs +++ b/FrmAllPipelineStatis.cs @@ -30,7 +30,7 @@ if (frm == null) { frm = new FrmAllPipelineStatis(ctl,polygon, InitDataGridViewX1,pipeLayerNames,pageControl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { @@ -156,7 +156,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// /// 得到某图层区域内管线的map以及区域内管线长度的map diff --git a/FrmAllWorkWellStatis.cs b/FrmAllWorkWellStatis.cs index f253369..b8a3a4d 100644 --- a/FrmAllWorkWellStatis.cs +++ b/FrmAllWorkWellStatis.cs @@ -183,7 +183,7 @@ private void 导出统计专题图ToolStripMenuItem_Click(object sender, EventArgs e) { F_PATMTitle frm = new F_PATMTitle("S", chartAllAreaPipeline); - frm.Show(); + frm.ShowDialog(); } /// diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index 62b6ce4..5e9773d 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -32,7 +32,7 @@ if (frm == null) { frm = new FrmBasicQuery(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index 6471dde..3352546 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmCodingQuery(_ctl, _list, mInitDataGridViewX1, pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmCompareFeature.cs b/FrmCompareFeature.cs index 0a5d0b0..4ef7e94 100644 --- a/FrmCompareFeature.cs +++ b/FrmCompareFeature.cs @@ -21,7 +21,7 @@ { frm = new FrmCompareFeature(_globeControl1, _globeControl2); frm.Location = new Point((width - frm.Width)/2, 50); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else { diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index fe7b1ca..1043f1c 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -27,7 +27,7 @@ if (frm == null) { frm = new FrmDiameterQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index f0df429..ca7cf15 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -178,7 +178,7 @@ } String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); - frm.Show(); + frm.ShowDialog(); } catch (Exception ex) { diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index eac5aa4..b0112d1 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmFittingQuery(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index d791759..ac82ce3 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -354,7 +354,7 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.Show(); + frm.ShowDialog(); } } @@ -369,7 +369,7 @@ string id = row.Cells["编号"].Value.ToString(); FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 - p.Show(); + p.ShowDialog(); } catch (Exception ex) { diff --git a/FrmGBJC.cs b/FrmGBJC.cs index 4a23dcf..f872aff 100644 --- a/FrmGBJC.cs +++ b/FrmGBJC.cs @@ -122,7 +122,7 @@ comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); - rs.Show(); + rs.ShowDialog(); this.Close(); } diff --git a/FrmGenAndFaMenTopu.cs b/FrmGenAndFaMenTopu.cs index 5db5011..a36ab5e 100644 --- a/FrmGenAndFaMenTopu.cs +++ b/FrmGenAndFaMenTopu.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Engine; @@ -65,6 +66,7 @@ { try { + Debug.WriteLine("创建拓扑btn_OK_Click"); //创建线拓扑 if (tboxTopoName.Text == "") { diff --git a/FrmHotFuncStat.cs b/FrmHotFuncStat.cs index eb6255e..7d15bf7 100644 --- a/FrmHotFuncStat.cs +++ b/FrmHotFuncStat.cs @@ -325,7 +325,7 @@ + "热点功能统计专题图-" + DateTime.Now.ToString("yyyyMMdd"); FrmHotFuncStatTitle frmHfst = new FrmHotFuncStatTitle(chart1,title); - frmHfst.Show(); + frmHfst.ShowDialog(); } diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 874f5f4..3f24011 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmKeywordQuery(_ctl, _list, InitDataGridViewX1); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs index 29031d8..1f8590f 100644 --- a/FrmLayerControl.cs +++ b/FrmLayerControl.cs @@ -6,6 +6,7 @@ using GeoScene.Globe; using GeoScene.Engine; using System.Xml; +using System.Diagnostics; namespace Cyberpipe { @@ -36,6 +37,7 @@ /// private void layerTree2_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl2,e.Node); @@ -44,6 +46,7 @@ private void layerTree1_AfterCheck(object sender, TreeViewEventArgs e) { + Debug.WriteLine("layerTree1_AfterCheck"); if (e.Action != TreeViewAction.Unknown) { TreeUtils.TreeNodeCheckedChange(globeControl1, e.Node); diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 99f4d3b..10eb31e 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -22,7 +22,7 @@ if (frm == null) { frm = new FrmMaterialSel(_ctl, _list, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 4620996..cfb4c18 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -253,7 +253,7 @@ { long dbid = long.Parse(row.Cells["编号"].Value.ToString()); PatrolLog p = new PatrolLog(dbid.ToString()); - p.Show(); + p.ShowDialog(); } catch (Exception ex) { @@ -283,7 +283,7 @@ if (dt.Rows.Count > 0) { TaskInfo p = new TaskInfo(int.Parse(dt.Rows[0][0].ToString())); - p.Show(); + p.ShowDialog(); } else { diff --git a/FrmQuerySQL.cs b/FrmQuerySQL.cs index 8dd23df..a31e7ce 100644 --- a/FrmQuerySQL.cs +++ b/FrmQuerySQL.cs @@ -24,7 +24,7 @@ if (frm == null) { frm = new FrmQuerySQL(_ctl, InitDataGridViewX1,pageControl); - frm.Show(_ctl.Parent); + frm.ShowDialog(_ctl.Parent); } else { diff --git a/FrmSetFlytoPos.cs b/FrmSetFlytoPos.cs index 8f753df..a234459 100644 --- a/FrmSetFlytoPos.cs +++ b/FrmSetFlytoPos.cs @@ -16,7 +16,7 @@ if (frm == null) { frm = new FrmSetFlytoPos(globecontrol); - frm.Show(globecontrol.Parent); + frm.ShowDialog(globecontrol.Parent); } else { diff --git a/FrmSetLatLonPos.cs b/FrmSetLatLonPos.cs index 0f0584e..b2a611e 100644 --- a/FrmSetLatLonPos.cs +++ b/FrmSetLatLonPos.cs @@ -16,7 +16,7 @@ if (frm == null) { frm = new FrmSetLatLonPos(ctl); - frm.Show(ctl.Parent); + frm.ShowDialog(ctl.Parent); } else { diff --git a/FrmValveStatistics.cs b/FrmValveStatistics.cs index 926377a..6405d5f 100644 --- a/FrmValveStatistics.cs +++ b/FrmValveStatistics.cs @@ -169,7 +169,7 @@ { F_PATMTitle frm = new F_PATMTitle("S", chaFamenStatis); - frm.Show(); + frm.ShowDialog(); } /// /// 获取区域内的各图层阀门 diff --git a/FrmpipeDeepstatis.cs b/FrmpipeDeepstatis.cs index f034488..01cf891 100644 --- a/FrmpipeDeepstatis.cs +++ b/FrmpipeDeepstatis.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmpipeDeepstatis(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { diff --git a/FrmpipeDiametergather.cs b/FrmpipeDiametergather.cs index 99bfabb..9f26425 100644 --- a/FrmpipeDiametergather.cs +++ b/FrmpipeDiametergather.cs @@ -25,7 +25,7 @@ if (frm == null) { frm = new FrmpipeDiametergather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index 00a7565..3f1e7d3 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -23,7 +23,7 @@ if (frm == null) { frm = new FrmpipeMaterialGather(globeControl, pipeLayers, _polygon); - frm.Show(globeControl.Parent); + frm.ShowDialog(globeControl.Parent); } else if(frm.WindowState == FormWindowState.Minimized) { diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 27f134b..2860f29 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -24,7 +24,7 @@ if (frm == null) { frm = new Frmpipediameterstatis(_globeControl1, pipeLayers, _polygon); - frm.Show(_globeControl1.Parent); + frm.ShowDialog(_globeControl1.Parent); } else if (frm.WindowState == FormWindowState.Minimized) { diff --git a/NetworkAnalysisTool.cs b/NetworkAnalysisTool.cs index 075c311..2abad07 100644 --- a/NetworkAnalysisTool.cs +++ b/NetworkAnalysisTool.cs @@ -1,6 +1,8 @@ using System; +using System.Diagnostics; using System.Drawing; using System.Windows.Forms; +using Aspose.Cells; using GeoScene.Data; using GeoScene.Engine; using GeoScene.Globe;