From fbb3ef63775673bdceeb921542d5cd3f06f1ca45 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 11 一月 2024 10:40:12 +0800
Subject: [PATCH] 适配TE 7.21版本
---
TEWin/FrmWin.Designer.cs | 4 ++--
TEWin/FrmWin.cs | 12 ++++++------
TEWin/Resources/Volume/Volume.html | 5 ++---
TEWin/app.config | 3 ++-
TEWin/FrmTree.Designer.cs | 4 ++--
TEWin/FrmTool.Designer.cs | 10 ++++++----
6 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/TEWin/FrmTool.Designer.cs b/TEWin/FrmTool.Designer.cs
index 8768815..dc306a4 100644
--- a/TEWin/FrmTool.Designer.cs
+++ b/TEWin/FrmTool.Designer.cs
@@ -36,7 +36,7 @@
// txtCode
//
this.txtCode.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.txtCode.Location = new System.Drawing.Point(244, 32);
+ this.txtCode.Location = new System.Drawing.Point(225, 12);
this.txtCode.Name = "txtCode";
this.txtCode.Size = new System.Drawing.Size(160, 26);
this.txtCode.TabIndex = 1;
@@ -45,7 +45,7 @@
// btnTest
//
this.btnTest.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnTest.Location = new System.Drawing.Point(417, 32);
+ this.btnTest.Location = new System.Drawing.Point(399, 12);
this.btnTest.Name = "btnTest";
this.btnTest.Size = new System.Drawing.Size(75, 26);
this.btnTest.TabIndex = 0;
@@ -57,7 +57,7 @@
//
this.cbCode.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cbCode.FormattingEnabled = true;
- this.cbCode.Location = new System.Drawing.Point(23, 34);
+ this.cbCode.Location = new System.Drawing.Point(12, 12);
this.cbCode.Name = "cbCode";
this.cbCode.Size = new System.Drawing.Size(198, 24);
this.cbCode.TabIndex = 2;
@@ -66,12 +66,14 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(504, 89);
+ this.ClientSize = new System.Drawing.Size(486, 48);
this.Controls.Add(this.cbCode);
this.Controls.Add(this.btnTest);
this.Controls.Add(this.txtCode);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Name = "FrmTool";
this.ShowInTaskbar = false;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "FrmTool";
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/TEWin/FrmTree.Designer.cs b/TEWin/FrmTree.Designer.cs
index 4109d2a..e1c2f9c 100644
--- a/TEWin/FrmTree.Designer.cs
+++ b/TEWin/FrmTree.Designer.cs
@@ -41,14 +41,14 @@
this.axTETree.Margin = new System.Windows.Forms.Padding(2);
this.axTETree.Name = "axTETree";
this.axTETree.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("axTETree.OcxState")));
- this.axTETree.Size = new System.Drawing.Size(400, 600);
+ this.axTETree.Size = new System.Drawing.Size(280, 600);
this.axTETree.TabIndex = 1;
//
// FrmTree
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(400, 600);
+ this.ClientSize = new System.Drawing.Size(280, 600);
this.Controls.Add(this.axTETree);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Margin = new System.Windows.Forms.Padding(2);
diff --git a/TEWin/FrmWin.Designer.cs b/TEWin/FrmWin.Designer.cs
index 6ff623e..a9cffbc 100644
--- a/TEWin/FrmWin.Designer.cs
+++ b/TEWin/FrmWin.Designer.cs
@@ -41,14 +41,14 @@
this.axTEWin.Margin = new System.Windows.Forms.Padding(2);
this.axTEWin.Name = "axTEWin";
this.axTEWin.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("axTEWin.OcxState")));
- this.axTEWin.Size = new System.Drawing.Size(784, 561);
+ this.axTEWin.Size = new System.Drawing.Size(1024, 768);
this.axTEWin.TabIndex = 1;
//
// FrmWin
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(784, 561);
+ this.ClientSize = new System.Drawing.Size(1024, 768);
this.Controls.Add(this.axTEWin);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Margin = new System.Windows.Forms.Padding(2);
diff --git a/TEWin/FrmWin.cs b/TEWin/FrmWin.cs
index 665eebe..d31a8b4 100644
--- a/TEWin/FrmWin.cs
+++ b/TEWin/FrmWin.cs
@@ -26,7 +26,7 @@
string mainUrl;
- public SGWorld74 SG;
+ public SGWorld71 SG;
private bool isAngle;
@@ -34,9 +34,9 @@
private double angleSize;
- private ITerrainLabel74 angleLabel;
+ private ITerrainLabel71 angleLabel;
- private ITerrainPolyline74 angleLine;
+ private ITerrainPolyline71 angleLine;
private string angleGroupName = "瑙掗噺绠�";
@@ -62,7 +62,7 @@
return;
}
- SG = new SGWorld74();
+ SG = new SGWorld71();
SG.OnLoadFinished += SG_OnLoadFinished;
tree = new FrmTree();
@@ -141,7 +141,7 @@
SG.Command.Execute(1014, 26); break;
case 0xc6: // 妯″瀷鏁版嵁(*.osgb)
ExecCmd(new List<string> { "taskkill /f /t /im MeshLayerTool.exe" }); // SG.Command.Execute(2342, null);
- RunExe(Path.Combine(ConfigurationManager.AppSettings["tePath"], "MeshLayerTool.exe"), " -RunApp TerraExplorer -RunConvertor -Mode ImportMeshLayer -Type osgb", false);
+ RunExe(Path.Combine(ConfigurationManager.AppSettings["tePath"], "MeshLayerTool.exe"), " -RunConvertor -Mode ImportMeshLayer -Type osgb", false); // -RunApp TerraExplorer
break;
case 0xc7: // 妯″瀷鏁版嵁(*.obj)
SG.Command.Execute(1012, 13); break;
@@ -206,7 +206,7 @@
this.ShowHtml("鍧″害鍒嗘瀽", mainUrl + @"\Resources\SlopeMapQuery\SlopeMapQuery.html", 20, 20, 350, 365);
break;
case 1045:
- this.ShowHtml("浣撶Н鍒嗘瀽", mainUrl + @"\Resources\Volume\Volume.html", 20, 20, 350, 255);
+ this.ShowHtml("浣撶Н鍒嗘瀽", mainUrl + @"\Resources\Volume\Volume.html", 20, 20, 350, 225);
break;
}
}
diff --git a/TEWin/Resources/Volume/Volume.html b/TEWin/Resources/Volume/Volume.html
index ce7a270..f798813 100644
--- a/TEWin/Resources/Volume/Volume.html
+++ b/TEWin/Resources/Volume/Volume.html
@@ -89,7 +89,7 @@
</select>
</td>
</tr>
- <tr>
+ <!--<tr>
<td class="s8b">
<label for="Mode" class="i18n">drawObjects</label>
</td>
@@ -98,9 +98,8 @@
<input type="checkbox" id="showObjectsID">
<span class="slider round"></span>
</label>
- <!-- <input type="checkbox" id="showObjectsID" /> -->
</td>
- </tr>
+ </tr>-->
</table>
<tr class="s8">
diff --git a/TEWin/app.config b/TEWin/app.config
index c56469c..6de2d70 100644
--- a/TEWin/app.config
+++ b/TEWin/app.config
@@ -3,7 +3,8 @@
<appSettings>
<add key="isTest" value="1"/>
<add key="testFly" value="E:\data\opting\2022.fly"/>
- <add key="tePath" value="C:\Program Files\Skyline\TerraExplorer Pro"/>
+ <!--<add key="tePath" value="C:\Program Files\Skyline\TerraExplorer Pro"/>-->
+ <add key="tePath" value="C:\Program Files\SmartEarth\TerraExplorer Pro"/>
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
--
Gitblit v1.9.3