From c7d2ead2a09345cdf83a7036418b96f90a11fa86 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 22 一月 2024 16:15:45 +0800
Subject: [PATCH] 集成osgblab
---
TEWin/FrmWin.cs | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/TEWin/FrmWin.cs b/TEWin/FrmWin.cs
index 67f675e..6f74974 100644
--- a/TEWin/FrmWin.cs
+++ b/TEWin/FrmWin.cs
@@ -24,21 +24,21 @@
FrmTool tool;
- string mainUrl;
+ bool isAngle;
+
+ int angleCount;
+
+ double angleSize;
public SGWorld71 SG;
- private bool isAngle;
+ ITerrainLabel71 angleLabel;
- private int angleCount;
+ ITerrainPolyline71 angleLine;
- private double angleSize;
+ string angleGroupName = "瑙掗噺绠�";
- private ITerrainLabel71 angleLabel;
-
- private ITerrainPolyline71 angleLine;
-
- private string angleGroupName = "瑙掗噺绠�";
+ string mainUrl = Application.StartupPath;
public FrmWin()
{
@@ -52,10 +52,8 @@
try
{
LogOut.Info("寮�濮嬭繍琛�..");
- mainUrl = Application.StartupPath;
bool isTest = "1" == ConfigurationManager.AppSettings["isTest"];
- //this.fly = isTest ? ConfigurationManager.AppSettings["testFly"] : Path.Combine(Application.StartupPath, "Resources\\sample.fly");
this.fly = ConfigurationManager.AppSettings["fly"] ?? ConfigurationManager.AppSettings["testFly"];
if (!this.fly.Contains(":\\")) this.fly = Path.Combine(Application.StartupPath, this.fly);
if (!File.Exists(this.fly))
@@ -286,7 +284,7 @@
return str;
}
- #region 瑙掗噺绠�+绌洪棿缁熻+绌洪棿鍒嗘瀽+osgblab
+ #region 瑙掗噺绠�
private void AngleMeasurement()
{
if (isAngle)
@@ -470,6 +468,14 @@
return true;
}
+ #endregion
+
+ private string GetAbsolutePath(string key)
+ {
+ string str = ConfigurationManager.AppSettings[key];
+
+ return str.Contains(":\\") ? str : Path.Combine(Application.StartupPath, str);
+ }
private void SpaceStatistics()
{
@@ -484,8 +490,7 @@
private void InvokeOsgbLab()
{
ExecCmd(new List<string> { "taskkill /f /t /im OSGBLab.exe" });
- RunExe(ConfigurationManager.AppSettings["osgblabPath"], null, false);
+ RunExe(GetAbsolutePath("osgblabPath"), null, false);
}
- #endregion
}
}
--
Gitblit v1.9.3