From 9d25253a85cc4fb3aa0f4adc764626ad0e64d66a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 25 七月 2024 14:40:01 +0800
Subject: [PATCH] 修改算法-1
---
SimuTools/Tools/Handle.cs | 79 ++++++++++++++++++++++++++++-----------
1 files changed, 57 insertions(+), 22 deletions(-)
diff --git a/SimuTools/Tools/Handle.cs b/SimuTools/Tools/Handle.cs
index a599a42..0b3938d 100644
--- a/SimuTools/Tools/Handle.cs
+++ b/SimuTools/Tools/Handle.cs
@@ -42,7 +42,7 @@
string temp = Path.Combine(outPath, "temp");
if (!Directory.Exists(temp)) Directory.CreateDirectory(temp);
- CopeTerrain(terrainFile, outPath, layer);
+ CopeTerrain(terrainFile, waterPath, outPath, layer);
CopeWater(waterPath, outPath, layer);
CopeFlow(flowPath, outPath, layer);
CopeLayerJson(outPath, layer);
@@ -54,7 +54,7 @@
/// <summary>
/// 澶勭悊鍦板舰
/// </summary>
- private static void CopeTerrain(string terrainFile, string outPath, Domain.Layer layer)
+ private static void CopeTerrain(string terrainFile, string waterPath, string outPath, Domain.Layer layer)
{
Dataset ds = null;
try
@@ -63,6 +63,7 @@
if (null == ds || 0 == ds.RasterCount || null == ds.GetSpatialRef()) return;
SetTerrainInfo(ds, layer);
+ SetWaterInfo(waterPath, layer);
CreateTerrainPng(ds, layer, outPath);
}
finally
@@ -173,19 +174,30 @@
Graphics graphic = Graphics.FromImage(image);
graphic.Clear(Color.Transparent); // 濉厖閫忔槑鑹�
- double perHeight = (layer.terrain.maxHeight - layer.terrain.minHeight) * 100 / 65536;
+ //double perHeight = (layer.terrain.maxHeight - layer.terrain.minHeight) * 100 / 65536;
+ //double differ = layer.terrain.maxHeight - layer.terrain.minHeight;
+ double differ = layer.extension.maxHeight - layer.extension.minHeight, minHeight = layer.extension.minHeight;
for (int x = 0; x < width; x++)
{
for (int y = 0; y < height; y++)
{
int offset = x + y * width;
- if (float.IsNaN(buffer[offset]) || buffer[offset] < -999) continue;
+ if (float.IsNaN(buffer[offset]) || buffer[offset] < -999 || buffer[offset] < minHeight) continue;
- //int val = Convert.ToInt32(buffer[offset] * 100);
- int val = Convert.ToInt32((buffer[offset] - layer.terrain.minHeight) * 100 / perHeight);
- int r = val / 65536;
- int g = (val - r * 65536) / 256;
- int b = val % 256;
+ //int val = Convert.ToInt32((buffer[offset] - layer.terrain.minHeight) * 100 / perHeight);
+ //int val = Convert.ToInt32((buffer[offset] - layer.terrain.minHeight) / differ * 255); // 65535
+
+ int r = 0, g, b;
+ if (buffer[offset] - layer.extension.maxHeight > 0)
+ {
+ g = b = 255;
+ }
+ else
+ {
+ int val = Convert.ToInt32((buffer[offset] - minHeight) / differ * 65535);
+ g = val / 256;
+ b = val % 256;
+ }
Color color = Color.FromArgb(127, r, g, b);
image.SetPixel(x, y, color);
@@ -203,16 +215,24 @@
#region 姘撮潰
/// <summary>
- /// 澶勭悊姘撮潰
+ /// 璁剧疆姘撮潰淇℃伅
/// </summary>
- private static void CopeWater(string waterPath, string outPath, Domain.Layer layer)
+ private static void SetWaterInfo(string waterPath, Domain.Layer layer)
{
- List<string> files = GetFiles(waterPath);
+ List<string> files = layer.waters.files = GetFiles(waterPath);
if (null == files || files.Count == 0) return;
SetWaterData(layer, files);
SetWaterHeight(layer, files);
- if (files.Count != layer.waters.data.Count) return;
+ }
+
+ /// <summary>
+ /// 澶勭悊姘撮潰
+ /// </summary>
+ private static void CopeWater(string waterPath, string outPath, Domain.Layer layer)
+ {
+ List<String> files = layer.waters.files;
+ if (files.Count == 0 || files.Count != layer.waters.data.Count) return;
ProcessWaters(files, outPath, layer);
}
@@ -223,7 +243,7 @@
private static List<String> GetFiles(string path, string prefix = "")
{
string[] files = Directory.GetFiles(path, prefix + "*.tif?", SearchOption.TopDirectoryOnly);
- if (null == files || files.Length == 0) return null;
+ if (null == files || files.Length == 0) return new List<string>();
List<string> list = files.ToList();
list.Sort();
@@ -249,6 +269,8 @@
DateTime d = new DateTime(now.Year, now.Month, now.Day, hour, minute, second);
layer.waters.data.Add((d.Ticks - startTicks) / 10000);
}
+ layer.duration.start = layer.waters.data[0];
+ layer.duration.end = layer.waters.data[layer.waters.data.Count - 1];
}
/// <summary>
@@ -273,8 +295,8 @@
if (null != ds) ds.Dispose();
}
});
- layer.extension.minHeight = GetMinVal(layer.extension.minHeight);
- layer.extension.maxHeight = GetMaxVal(layer.extension.maxHeight + WaterHeightOffset);
+ layer.extension.minHeight = GetMinVal(layer.extension.minHeight - 1);
+ layer.extension.maxHeight = GetMaxVal(layer.extension.maxHeight + 1);
}
/// <summary>
@@ -341,19 +363,32 @@
Graphics graphic = Graphics.FromImage(image);
graphic.Clear(Color.Transparent); // 濉厖閫忔槑鑹�
- double perHeight = (layer.extension.maxHeight - layer.extension.minHeight) * 100 / 65536;
+ //double perHeight = (layer.extension.maxHeight - layer.extension.minHeight) * 100 / 65536;
+ double differ = layer.extension.maxHeight - layer.extension.minHeight, minHeight = layer.extension.minHeight;
for (int x = 0; x < width; x++)
{
for (int y = 0; y < height; y++)
{
int offset = x + y * width;
- if (float.IsNaN(buffer[offset]) || buffer[offset] < -999) continue;
+ if (float.IsNaN(buffer[offset]) || buffer[offset] < -999 || buffer[offset] < minHeight) continue;
//int val = Convert.ToInt32(buffer[offset] * 100);
- int val = Convert.ToInt32((buffer[offset] - layer.extension.minHeight + WaterHeightOffset) * 100 / perHeight);
- int r = val / 65536;
- int g = (val - r * 65536) / 256;
- int b = val % 256;
+ //int val = Convert.ToInt32((buffer[offset] - layer.extension.minHeight + WaterHeightOffset) * 100 / perHeight);
+ //int r = val / 65536;
+ //int g = (val - r * 65536) / 256;
+ //int b = val % 256;
+
+ int r = 0, g, b;
+ if (buffer[offset] - layer.extension.maxHeight > 0)
+ {
+ g = b = 255;
+ }
+ else
+ {
+ int val = Convert.ToInt32((buffer[offset] - minHeight) / differ * 65535);
+ g = val / 256;
+ b = val % 256;
+ }
Color color = Color.FromArgb(127, r, g, b);
image.SetPixel(x, y, color);
--
Gitblit v1.9.3