From a10e925cdda6f92a7bbf86188e317f5c5ee839b5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 26 七月 2024 14:21:20 +0800
Subject: [PATCH] 水面数据在计算时添加建筑物避让功能
---
SimuTools/FrmMain.cs | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/SimuTools/FrmMain.cs b/SimuTools/FrmMain.cs
index 62b2ed8..d15b5a0 100644
--- a/SimuTools/FrmMain.cs
+++ b/SimuTools/FrmMain.cs
@@ -1,4 +1,5 @@
-锘縰sing SimuTools.Tools;
+锘縰sing SimuTools.Domain;
+using SimuTools.Tools;
using System;
using System.IO;
using System.Windows.Forms;
@@ -34,11 +35,21 @@
private void btnTerrainPath_Click(object sender, EventArgs e)
{
+ selectFile(this.txtTerrainPath);
+ }
+
+ private void btnBuildingPath_Click(object sender, EventArgs e)
+ {
+ selectFile(this.txtBuildingPath);
+ }
+
+ private void selectFile(TextBox tb)
+ {
OpenFileDialog dialog = new OpenFileDialog();
dialog.Filter = "Tif files(*.tif)|*.tif|Tiff files (*.tiff)|*.tiff";
dialog.RestoreDirectory = true;
- string path = this.txtTerrainPath.Text.Trim();
+ string path = tb.Text.Trim();
if (File.Exists(path))
{
dialog.InitialDirectory = Path.GetDirectoryName(path);
@@ -46,7 +57,7 @@
if (dialog.ShowDialog() == DialogResult.OK)
{
- this.txtTerrainPath.Text = dialog.FileName;
+ tb.Text = dialog.FileName;
}
}
@@ -87,6 +98,7 @@
{
string serviceName = this.txtServiceName.Text.Trim();
string terrainFile = this.txtTerrainPath.Text.Trim();
+ string buildingFile = this.txtBuildingPath.Text.Trim();
string waterPath = this.txtWaterPath.Text.Trim();
string flowPath = this.txtFlowPath.Text.Trim();
string outPath = this.txtOutPath.Text.Trim();
@@ -96,9 +108,9 @@
ShowErr("鏈嶅姟鍚嶇О锛岃姹傚繀濉紒");
return;
}
- if (!File.Exists(terrainFile))
+ if (!File.Exists(terrainFile) || !File.Exists(buildingFile))
{
- ShowErr("鍦板舰鏂囦欢锛岃姹傚繀椤诲瓨鍦紒");
+ ShowErr("鍦板舰鍜屽缓绛戞枃浠讹紝瑕佹眰蹇呴』瀛樺湪锛�");
return;
}
if (!Directory.Exists(waterPath) || !Directory.Exists(flowPath) || !Directory.Exists(outPath))
@@ -112,13 +124,7 @@
this.btnRun.Enabled = false;
LogOut.Info("寮�濮嬭繍琛� >>");
- outPath = Path.Combine(outPath, serviceName);
- if (!Directory.Exists(outPath))
- {
- Directory.CreateDirectory(outPath);
- }
-
- Tools.Handle.Run(terrainFile, waterPath, flowPath, outPath);
+ Tools.Handle.Run(new Args(serviceName, terrainFile, buildingFile, waterPath, flowPath, outPath));
this.btnRun.Enabled = true;
LogOut.Info("杩愯缁撴潫 <<");
--
Gitblit v1.9.3