From 0ac9c5eb993abd7053b075fc6e1e62049d2c047b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 11 一月 2024 11:12:06 +0800
Subject: [PATCH] 适配完成。

---
 TEWin/FrmWin.cs                                              |    4 
 TEWin/Resources/DistanceMeasurement/Lang.js                  |   26 +-
 TEWin/TEWin.csproj                                           |   12 +
 TEWin/Resources/AreaMeasurement/1033/Lang.js                 |   28 ++
 TEWin/Resources/DistanceMeasurement/distanceMeasurement.html |  159 +++++++-------
 TEWin/Resources/DistanceMeasurement/1033/Lang.js             |   26 ++
 TEWin/Resources/AreaMeasurement/2052/Lang.js                 |   28 ++
 TEWin/Resources/AreaMeasurement/AreaMeasurement.html         |  251 +++++++++++-----------
 TEWin/Resources/AreaMeasurement/Lang.js                      |   45 ++-
 TEWin/Resources/DistanceMeasurement/2052/Lang.js             |   26 ++
 10 files changed, 364 insertions(+), 241 deletions(-)

diff --git a/TEWin/FrmWin.cs b/TEWin/FrmWin.cs
index b4e48b5..6bdb6cb 100644
--- a/TEWin/FrmWin.cs
+++ b/TEWin/FrmWin.cs
@@ -186,10 +186,10 @@
             switch (id)
             {
                 case 1034:
-                    this.ShowHtml("璺濈娴嬮噺", mainUrl + @"\Resources\DistanceMeasurement\distanceMeasurement.html", 20, 20, 400, 245);
+                    this.ShowHtml("璺濈娴嬮噺", mainUrl + @"\Resources\DistanceMeasurement\distanceMeasurement.html", 20, 20, 400, 275);
                     break;
                 case 1037:
-                    this.ShowHtml("闈㈢Н娴嬮噺", mainUrl + @"/Resources\AreaMeasurement\AreaMeasurement.html", 20, 20, 400, 245);
+                    this.ShowHtml("闈㈢Н娴嬮噺", mainUrl + @"/Resources\AreaMeasurement\AreaMeasurement.html", 20, 20, 400, 205);
                     break;
                 case 1149:
                     switch (arg)
diff --git a/TEWin/Resources/AreaMeasurement/1033/Lang.js b/TEWin/Resources/AreaMeasurement/1033/Lang.js
new file mode 100644
index 0000000..26bad70
--- /dev/null
+++ b/TEWin/Resources/AreaMeasurement/1033/Lang.js
@@ -0,0 +1,28 @@
+锘縎GLang.lang = $.extend(SGLang.lang,{
+    ToolTitle: "SkylineGlobe - Skyline Software Systems, Inc.",
+    ToolName: "Terrain Profile",
+    help: "Help",
+    Text0: "Cancel",
+    Text1: "Delete Last Point",
+    Text2: "Horizontal surface",
+    Text3: "Surface",
+    Text4: "3D surface",
+    Text5: "Surface Sample Interval &nbsp;",
+	Text6: "Create Measurement Objects",
+	Text7: "Snapping",
+	Text19: "",
+	Text17: "Units",
+	Text18: "&nbsp; meters",
+	Text19: "Delete the measurement.", 
+	Text20: "Delete the last measurement point.",
+	Text21: "Snap the measurement points to edges, objects, and vertices.",
+	Text22: "Calculate the area of the horizontal projection of your selection on the terrain.",
+	Text23: "Calculate area on an arbitrary plane. The polygon鈥檚 orientation is determined by the first three points selected.",
+	Text24: "Calculate the surface area of the selected region taking into account terrain contours.",
+	Text25: "Area:\nPerimeter:",
+	Text26: "Surface Area:",
+
+
+
+    Text999: ""
+});
\ No newline at end of file
diff --git a/TEWin/Resources/AreaMeasurement/2052/Lang.js b/TEWin/Resources/AreaMeasurement/2052/Lang.js
new file mode 100644
index 0000000..c542729
--- /dev/null
+++ b/TEWin/Resources/AreaMeasurement/2052/Lang.js
@@ -0,0 +1,28 @@
+锘縎GLang.lang = $.extend(SGLang.lang,{
+    ToolTitle: "SmartEarth - 娉扮憺鏁板垱绉戞妧锛堝寳浜級鏈夐檺鍏徃",
+    ToolName: "鍦板舰鍓栭潰",
+    help: "甯姪",
+    Text0: "鍙栨秷",
+    Text1: "鍒犻櫎鏈�鍚庝竴涓妭鐐�",
+    Text2: "姘村钩闈�",
+    Text3: "琛ㄩ潰",
+    Text4: "3D琛ㄩ潰",
+    Text5: "鍦伴潰閲囨牱闂撮殧 &nbsp;",
+	Text6: "鍒涘缓娴嬮噺瀵硅薄",
+	Text7: "鎹曟崏",
+	Text19: "",
+	Text17: "鍗曚綅",
+	Text18: "&nbsp; 绫�",
+	Text19: "鍒犻櫎娴嬮噺缁撴灉.", 
+	Text20: "鍒犻櫎鏈�鍚庝竴涓妭鐐�.",
+	Text21: "鎹曟崏杈圭嚎锛屽璞′互鍙婅妭鐐�.",
+	Text22: "璁$畻鎵�閫夊湴褰㈢殑姘村钩鎶曞奖闈㈢Н.",
+	Text23: "璁$畻浠绘剰骞抽潰涓婄殑闈㈢Н. 澶氳竟褰㈢殑鏂瑰悜鐢遍�夋嫨鐨勫墠涓変釜鐐瑰喅瀹�.",
+	Text24: "鏍规嵁鍦板舰绛夐珮绾胯绠楁墍閫夊尯鍩熺殑琛ㄩ潰绉�.",
+	Text25: "闈㈢Н:\n鍛ㄩ暱:",
+	Text26: "琛ㄩ潰绉�:",
+
+
+
+    Text999: ""
+});
\ No newline at end of file
diff --git a/TEWin/Resources/AreaMeasurement/AreaMeasurement.html b/TEWin/Resources/AreaMeasurement/AreaMeasurement.html
index 1309911..8eebdf9 100644
--- a/TEWin/Resources/AreaMeasurement/AreaMeasurement.html
+++ b/TEWin/Resources/AreaMeasurement/AreaMeasurement.html
@@ -8,62 +8,64 @@
     <style>
     </style>
 </head>
-<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" style="border: 0px; overflow: hidden;" id="Body"  class="hideUntillTranslated ToolButtonsArea" onload="Init()" onunload="OnUnload()">
-	<!--oncontextmenu="return false;">  onclick="bHide=true;HideOptionsNow()" > -->
-	
-    <table border="0" width="100%" class="s8w" cellspacing="0" cellpadding="0">     
-        <tr >
+<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" style="border: 0px" id="Body"  class="hideUntillTranslated" onload="Init()" onunload="OnUnload()">
+    <!--oncontextmenu="return false;">  onclick="bHide=true;HideOptionsNow()" > -->
+    <table border="0" width="100%"  cellspacing="0" cellpadding="0">     
+        <tr class="s8">
             <td>
                 <table class="PropertiesSheet" cellspacing="0" cellpadding="0" ></table>
 			</td>
-        <tr>
+        <tr class="s8">
             <td colspan="2"  align="left" class="ToolButtonsArea"  style="border-bottom: 2px solid #ffffff;">
-                <button id="deleteMeasure" class="MenuButton2" style="border:none;" onclick="OnDeleteMeasure();"><img src="./img/delete.png" /></button>
-                <button id="deleteLastPoint" class="MenuButton2" style="border:none;" onclick="OnDeleteLastPoint()"><img src="./img/delete_last_point.png" /></button>
-				<button id="snapping" class="MenuButton2" style="border-right: 2px solid #ffffff;" onclick="OnSnapping()"><img src="./img/snap.png" /><br /></button>				
-                <button id="horizontalSurface" class="MenuButton2" style="border:none;" onclick="OnHorizontalSurface()"><img src="./img/horizontal.png" /><br /></button>
-				<button id="3dPlane" class="MenuButton2"  style="border:none;" onclick="On3DPlane()"><img src="./img/3d_palne_area.png" /><br /></button>												
-				<button id="terrainSurface" class="MenuButton2" style="border-left: 2px solid #ffffff;border-right: none;" onclick="OnTerrainSurface()"><img src="./img/surface.png" /><br /></button>
+                <button id="deleteMeasure" class="MenuButton2" style="border:none;" onclick="OnDeleteMeasure();"><img src="./img/delete.png" /><br/><!--<span class="i18n">Text0</span>--></button>
+                <button id="deleteLastPoint" class="MenuButton2" style="border:none;" onclick="OnDeleteLastPoint()"><img src="./img/delete_last_point.png" /><br /><!--<span class="i18n">Text1</span>--></button>
+				<button id="snapping" class="MenuButton2" style="border-right: 2px solid #ffffff;" onclick="OnSnapping()"><img src="./img/snap.png" /><br /><!--<span class="i18n" style="font:#2A4EA5">Text7</span>--></button>				
+                <button id="horizontalSurface" class="MenuButton2" style="border:none;" onclick="OnHorizontalSurface()"><img src="./img/horizontal.png" /><br /><!--<span class="i18n" style="font:#2A4EA5">Text2</span>--></button>
+				<button id="3dPlane" class="MenuButton2" style="border-right: 2px solid #ffffff;" onclick="On3DPlane()"><img src="./img/3d_palne_area.png" /><br /><!--<span class="i18n" style="font:#2A4EA5">Text4</span>--></button>												
+				<button id="terrainSurface" class="MenuButton2" style="border:none;" onclick="OnTerrainSurface()"><img src="./img/surface.png" /><br /><!--<span class="i18n" style="font:#2A4EA5">Text3</span>--></button>
 				
             </td>
 
         </tr>
-	</table>
+		   
 
-    <table border="0" width="100%" class="s8w ToolButtonsArea" cellspacing="0" cellpadding="3pt">     
 		
-		<tr id="createTRId">			
-            <td >
-				<span class="i18n s8w" style="vertical-align:top;">Text6</span>
-				<input type="checkbox" align="bottom" id="createMeasurementObject" style="width:25px;" onclick="CreateMeasurementObject();"/>																								
+		<tr class="s8" height="40">			
+            <td  align="left" class="ToolButtonsArea" style="color:#ffffff;">
+				<span class="i18n" style="vertical-align:top;">Text6</span>
+				
+					<input type="checkbox" align="bottom" id="createMeasurementObject" style="width:25px;" onclick="CreateMeasurementObject();"/>																								
             </td>												
         </tr>		
 		
-		<tr >		
-			<td class="textarea-container" >			
-				<div class="textarea-size s8w" ></div>
+		<tr class="s8" height="48" bgcolor="0">		
+			<td class="textarea-container" style="color:#ffffff">			
+				<style>
+				div.textarea-size{font-size: 12px;}
+				</style>
+				<div class="textarea-size" ></div>
 			</td>
 		</tr>
 		
-		 <tr id="sampleIntervalTR">
-            <td  align="left"  >
-				<span class="i18n s8w">Text5</span>
-				<input type="text" id= "sampleInterval" style="width:25px; height:13px;  background-color:#000000; color:#FFFFFF; padding:1px; margin-left: 2px;margin-right: 2px;"  onkeypress="OnSampleInterval(event)"/>
-				<span class="i18n s8w">Text18</span> 																				
+		 <tr class="s8" bgcolor="0">
+            <td  align="left" class="ToolButtonsArea" style="color:#ffffff">
+				<span class="i18n">Text5</span><input type="text" id= "sampleInterval" style="width:25px; height:11px;  background-color:#000000; color:#FFFFFF;"  onkeypress="OnSampleInterval(event)"/><span class="i18n">Text18</span> 																				
             </td>											
         </tr>
 		
-		<tr id="surfaceResultTR" >		
-			<td class="textarea-container_surface" >			
-				
-				<div class="textarea-size_surface s8w" ></div>
+		<tr class="s8"  bgcolor="0" >		
+			<td class="textarea-container_surface" style="color:#ffffff">			
+				<style>
+				div.textarea-size_surface{font-size: 12px}
+				</style>
+				<div class="textarea-size_surface" ></div>
 			</td>
 		</tr>
 		
 		
-		 <tr  id="unitTRId">
-			<td  align="right" >		
-				<u><a class="btn btn-primary"  href="#" role="button" id= "changeMeasurementUnits"  onclick="OnChangeMeasurementUnits()"><span class="i18n s8w" style="padding-right:5px;">Text17</span></a></u>										
+		 <tr class="s8">
+			<td  align="right" bgcolor="0">		
+				<u style="color:#ffffff"><a class="btn btn-primary" style="color:#ffffff" href="#" role="button" id= "changeMeasurementUnits"  onclick="OnChangeMeasurementUnits()"><span class="i18n" style="padding-right:5px;">Text17</span></a></u>										
 			</td>
 		</tr>	
 		</tr>
@@ -75,7 +77,7 @@
 
 	
 <script language="javascript" src="../jquery/jquery-3.1.1.min.js"></script>
-<script language="javascript" src="../ToolsCommon71.js"></script>
+<script language="javascript" src="../ToolsCommon70.js"></script>
 
 
 
@@ -87,67 +89,11 @@
 var g_bCalculateTerrainArea;
 var _3D_PLANE_NAME = "plane";
 var _HORIZONTAL_NAME = "horizontal";
-//---------------------------------
-function Init()
-{
-	document.getElementById("changeMeasurementUnits").value=SGLang.i18n("Text17");
-	document.getElementById("sampleInterval").value=5;
-		
-	var isPM = GetParamValue("pm", "0"); // when opening this tool in PM we want to hide several options
-	if (isPM=="1"){
-		$("#unitTRId").hide();
-		$("#createTRId").hide();
-		$("#terrainSurface").hide();
-		$("#sampleIntervalTR").hide();
-		$("#surfaceResultTR").hide();
-	}
 
-	$("#deleteMeasure").attr('title', SGLang.i18n("Text19"));
-	$("#deleteLastPoint").attr('title', SGLang.i18n("Text20"));
-	$("#snapping").attr('title', SGLang.i18n("Text21"));
-	$("#horizontalSurface").attr('title', SGLang.i18n("Text22"));
-	$("#3dPlane").attr('title', SGLang.i18n("Text23"));
-	$("#terrainSurface").attr('title', SGLang.i18n("Text24"));
-	
-
-	textContainer = document.querySelector('.textarea-container');
-	textareaSize = textContainer.querySelector('.textarea-size');
-	textareaSize.innerText = SGLang.i18n("Text25");
-
-	textContainer = document.querySelector('.textarea-container_surface');
-	textareaSize = textContainer.querySelector('.textarea-size_surface');
-	textareaSize.innerText = SGLang.i18n("Text26");
-
-
-	SGWorld.AttachEvent("OnMeasurementAreaResult", OnMeasurementResult);	
-	SGWorld.AttachEvent("OnInputModeChanged", OnInputModeChanged);	
-	SGWorld.AttachEvent("OnEndDrawMeasurement", OnEndDrawMeasurement);		
-	 	
-	var bCreateMeasurementObject = (isPM=="1")?false:SGWorld.GetOptionParam("CreateMeasurementObjects");
-	document.getElementById("createMeasurementObject").checked = bCreateMeasurementObject;
-	CreateMeasurementObject();
-	
-	Reset(1,0);	
-	if(SGWorld.GetOptionParam("AreaMeasurementDefaultMode") == _3D_PLANE_NAME)	
-		document.getElementById("3dPlane").click();
-    else
-		document.getElementById("horizontalSurface").click();
-	
-
-}
-//---------------------------------
-function Reset(FirstTime, FromMouseInputMode) 
-{
-
-	ResetButtons();			
-	SGWorld.Window.SetInputMode(0);
-	gGeometry = null;
-}
-//---------------------------------
 function OnSampleInterval(evt)
 {
 
-
+	
   var theEvent = evt || window.event;
 
     // Handle paste
@@ -172,7 +118,9 @@
   }
 
 }
-//---------------------------------
+
+
+
 function OnDeleteMeasure()
 {
 	var is3dPlane = $("#3dPlane").hasClass("MenuButtonHighlight");
@@ -192,20 +140,65 @@
 	
 	EnableDisableButtons();	
 }
-//---------------------------------
+
 function OnUnload()
 {
 	var measurementMode = SGWorld.GetParam(9916);
 	if(measurementMode == 33351/*ID_MEASURE_TERRAIN_AREA*/ || measurementMode == 33350/*ID_MEASURE_AREA*/)
 		SGWorld.Window.SetInputMode(0);
 }
-//---------------------------------
+
 function OnEndDrawMeasurement(geometry)
 {
 	gGeometry = geometry;	
 	EnableDisableButtons();	
 }
-//---------------------------------
+
+function Init()
+{
+	document.getElementById("changeMeasurementUnits").value=SGLang.i18n("Text17");
+	document.getElementById("sampleInterval").value=5;
+		
+	
+	document.getElementById("deleteMeasure").title=SGLang.i18n("Text19");
+	document.getElementById("deleteLastPoint").title=SGLang.i18n("Text20");
+	document.getElementById("snapping").title=SGLang.i18n("Text21");
+	document.getElementById("horizontalSurface").title=SGLang.i18n("Text22");
+	document.getElementById("3dPlane").title=SGLang.i18n("Text23");
+	document.getElementById("terrainSurface").title=SGLang.i18n("Text24");
+	
+
+	textContainer = document.querySelector('.textarea-container');
+	textareaSize = textContainer.querySelector('.textarea-size');
+	textareaSize.innerText = SGLang.i18n("Text25");
+
+	textContainer = document.querySelector('.textarea-container_surface');
+	textareaSize = textContainer.querySelector('.textarea-size_surface');
+	textareaSize.innerText = SGLang.i18n("Text26");
+
+
+	SGWorld.AttachEvent("OnMeasurementAreaResult", OnMeasurementResult);	
+	SGWorld.AttachEvent("OnInputModeChanged", OnInputModeChanged);	
+	SGWorld.AttachEvent("OnEndDrawMeasurement", OnEndDrawMeasurement);		
+	
+
+//Turn off CreateMeasurementObject
+//	SGWorld.Command.Execute(2226,0);
+	
+	
+	var bCreateMeasurementObject = SGWorld.GetOptionParam("CreateMeasurementObjects");
+	document.getElementById("createMeasurementObject").checked = bCreateMeasurementObject;
+	
+	Reset(1,0);	
+	if(SGWorld.GetOptionParam("AreaMeasurementDefaultMode") == _3D_PLANE_NAME)	
+		document.getElementById("3dPlane").click();
+    else
+		document.getElementById("horizontalSurface").click();
+	
+
+}
+
+
 function OnInputModeChanged(mode)
 {
 	if(mode==0)
@@ -213,18 +206,11 @@
 		ResetButtons();
 	}
 }
-//---------------------------------
+
+
+
 function OnMeasurementResult(measurementResult,SounrceID)
 {
-    measurementResult = measurementResult.replace("N/A", "涓嶉�傜敤")
-                .replace("Surface Area:", "琛ㄩ潰绉細")
-                .replace("Area:", "闈㈢Н锛�")
-                .replace("Square Meter", "骞虫柟绫�")
-                .replace("Square km", "骞虫柟鍗冪背")
-                .replace("Perimeter: ", "鍛ㄩ暱锛�")
-                .replace(/Km/g, " 鍗冪背")
-                .replace(/m/g, " 绫�");
-
 	if(!g_bCalculateTerrainArea)
 	{
 		textContainer = document.querySelector('.textarea-container');
@@ -245,19 +231,23 @@
   EnableDisableButtons();
   
   return true;
- }
-//---------------------------------
+  
+
+}
+
+
+
 function OnChangeMeasurementUnits()
 {
 		SGWorld.Command.Execute(1011,3);	
 }
-//---------------------------------
+
 function CreateMeasurementObject()
 {
 	var bCreateMeasurementObject = document.getElementById("createMeasurementObject").checked==true;
 	SGWorld.SetOptionParam("CreateMeasurementObjects",bCreateMeasurementObject);
 }
-//---------------------------------
+
 function EnableDisableButtons()
 {	
 	var bEnableTerrainSurface = $("#horizontalSurface").hasClass("MenuButtonHighlight") && gGeometry!=null;
@@ -297,7 +287,6 @@
 		document.getElementById("deleteLastPoint").style.opacity = 0.3;
 	}	
 }
-//---------------------------------
 function ResetButtons()
 {
 	$("#horizontalSurface").removeClass("MenuButtonHighlight");
@@ -308,7 +297,19 @@
 	
 }
 
-//---------------------------------
+//------------------
+// Reset
+//------------------
+function Reset(FirstTime, FromMouseInputMode) 
+{
+
+	ResetButtons();			
+	SGWorld.Window.SetInputMode(0);
+	gGeometry = null;
+}
+
+
+
 function SetSnapping()
 {
 	if( $("#snapping").hasClass("MenuButtonHighlight")) 	
@@ -316,7 +317,9 @@
 	else	
 		SGWorld.SetParam(9912,0);			
 }
-//---------------------------------
+
+
+
 function OnSnapping()
 {
 	//$("#snapping").removeClass("MenuButtonHighlight");
@@ -333,7 +336,7 @@
 	}
 	
 }
-//---------------------------------
+
 function On3DPlane()
 {	
 
@@ -346,7 +349,7 @@
 
 	Reset(0,0);
 	$(event.srcElement).addClass("MenuButtonHighlight");
-	SGWorld.Command.Execute(2358,0);//__TEC_MEASURE_AREA
+	SGWorld.Command.Execute(1037,0);
 
 	textContainer = document.querySelector('.textarea-container');
 	textareaSize = textContainer.querySelector('.textarea-size');
@@ -358,19 +361,21 @@
 		
 	EnableDisableButtons();
 }
-//---------------------------------
+
 function OnTerrainSurface()
 {
-
+		
+	
+	
+	
 	//Reset(0,0);
-	g_bCalculateTerrainArea = true;	
-	if(document.getElementById("sampleInterval").value>0.0)
-		SGWorld.Command.Execute(2359/*__TEC_MEASURE_TERRAIN_AREA*/,document.getElementById("sampleInterval").value);
+	g_bCalculateTerrainArea = true;
+	SGWorld.Command.Execute(1165,document.getElementById("sampleInterval").value);
 	g_bCalculateTerrainArea = false;
 	
 	SetSnapping();
 }
-//---------------------------------
+
 function OnHorizontalSurface()
 {		
 	if( $(event.srcElement).hasClass("MenuButtonHighlight"))
@@ -382,7 +387,7 @@
 	
 	Reset(0,0);
 	$(event.srcElement).addClass("MenuButtonHighlight");	
-	SGWorld.Command.Execute(2359/*__TEC_MEASURE_TERRAIN_AREA*/,0);
+	SGWorld.Command.Execute(1165,0);
 	
 	textContainer = document.querySelector('.textarea-container');
 	textareaSize = textContainer.querySelector('.textarea-size');
@@ -393,7 +398,7 @@
 	SGWorld.SetOptionParam("AreaMeasurementDefaultMode",_HORIZONTAL_NAME);
 	EnableDisableButtons();
 }
-//---------------------------------
+
 function OnDeleteLastPoint()
 {
 	SGWorld.SetParam(9914,0);
@@ -408,4 +413,4 @@
 </html>
 
 
-<!--Sig:00000040au6WjiNW.uqyaxQdPdCltSVnmGMYOWXEgBB9yrqQ.Kyq91MhWbUupggV5yi1GRel4nJZMYQa3tOFAX56jNS8XmJJ-->
+<!--Sig:00000040cmE.PBmLiWjz#bS.7ZWINxbOMbqfXqeomSoDY5dub1B7HFdROoCX7zoMTDDWngnh3FAbpgzaoXzBPqFecaMgMAJJ-->
diff --git a/TEWin/Resources/AreaMeasurement/Lang.js b/TEWin/Resources/AreaMeasurement/Lang.js
index 1b99491..26bad70 100644
--- a/TEWin/Resources/AreaMeasurement/Lang.js
+++ b/TEWin/Resources/AreaMeasurement/Lang.js
@@ -1,25 +1,28 @@
 锘縎GLang.lang = $.extend(SGLang.lang,{
-    ToolTitle: "闈㈢Н娴嬮噺",
-    ToolName: "鍦板舰鍓栭潰",
-    help: "甯姪",
-    Text0: "鍙栨秷",
-    Text1: "鍒犻櫎鏈�鍚庤妭鐐�",
-    Text2: "姘村钩闈�",
-    Text3: "鍦拌〃",
-    Text4: "鍦板舰鍦拌〃",
-    Text5: "閲囨牱闂撮殧 ",
-    Text6: "鍒涘缓娴嬮噺瀵硅薄",
-    Text7: "鎹曟崏",
+    ToolTitle: "SkylineGlobe - Skyline Software Systems, Inc.",
+    ToolName: "Terrain Profile",
+    help: "Help",
+    Text0: "Cancel",
+    Text1: "Delete Last Point",
+    Text2: "Horizontal surface",
+    Text3: "Surface",
+    Text4: "3D surface",
+    Text5: "Surface Sample Interval &nbsp;",
+	Text6: "Create Measurement Objects",
+	Text7: "Snapping",
 	Text19: "",
-	Text17: "鍗曚綅",
-	Text18: " 绫�",
-	Text19: "鍒犻櫎娴嬮噺鍊�",
-	Text20: "鍒犻櫎鏈�鍚庝竴涓祴閲忕偣",
-	Text21: "灏嗘祴閲忕偣鎹曟崏鍒拌竟銆佸璞″拰椤剁偣",
-	Text22: "璁$畻鍦ㄥ湴褰笂鐨勬按骞虫姇褰遍潰绉�",
-	Text23: "璁$畻浠绘剰骞抽潰涓婄殑闈㈢Н锛岃澶氳竟褰㈢殑鏂瑰悜鐢遍�夊畾鐨勫墠涓変釜鐐瑰喅瀹氥��",
-	Text24: "鑰冭檻鍦板舰璧蜂紡锛岃绠楅�夊畾鍖哄煙鐨勮〃闈㈢Н銆�",
-	Text25: "闈㈢Н:\鍛ㄩ暱:",
-	Text26: "琛ㄩ潰绉�:",
+	Text17: "Units",
+	Text18: "&nbsp; meters",
+	Text19: "Delete the measurement.", 
+	Text20: "Delete the last measurement point.",
+	Text21: "Snap the measurement points to edges, objects, and vertices.",
+	Text22: "Calculate the area of the horizontal projection of your selection on the terrain.",
+	Text23: "Calculate area on an arbitrary plane. The polygon鈥檚 orientation is determined by the first three points selected.",
+	Text24: "Calculate the surface area of the selected region taking into account terrain contours.",
+	Text25: "Area:\nPerimeter:",
+	Text26: "Surface Area:",
+
+
+
     Text999: ""
 });
\ No newline at end of file
diff --git a/TEWin/Resources/DistanceMeasurement/1033/Lang.js b/TEWin/Resources/DistanceMeasurement/1033/Lang.js
new file mode 100644
index 0000000..fd93713
--- /dev/null
+++ b/TEWin/Resources/DistanceMeasurement/1033/Lang.js
@@ -0,0 +1,26 @@
+锘縎GLang.lang = $.extend(SGLang.lang,{
+    ToolTitle: "SkylineGlobe - Skyline Software Systems, Inc.",
+    ToolName: "Terrain Profile",
+    help: "Help",
+    //Text0: "Cancel",
+    //Text1: "Delete Last Point",
+    //Text2: "Aerial",
+    //Text3: "Horizontal",
+    //Text4: "Vertical",
+    //Text5: "OnGround",
+	Text6: "Create Measurement Objects",
+	Text7: "Snapping",
+	//Text19: "Calculating query points",
+    //Text16: "Left click on the terrain to draw a polygon/Polyline. Right click to finish operation.",
+	Text17: "Units",	
+    Text18: "Delete the measurement.",
+	Text19: "Delete the last measurement point.",
+	Text20: "Snap the measurement points to edges, objects, and vertices.",
+//	Text21: "Calculate aerial distance, i.e., the actual distance between points in the 3D Window.",
+//	Text22: "Calculate horizontal distance between points in the 3D Window.",
+	Text23: "Display the terrain elevation profile along an aerial line.",
+	Text24: "Show Aerial Distance",
+	Text25: "Show Horizontal Distance",
+	Text26: "Show Vertical Distance",
+
+});
\ No newline at end of file
diff --git a/TEWin/Resources/DistanceMeasurement/2052/Lang.js b/TEWin/Resources/DistanceMeasurement/2052/Lang.js
new file mode 100644
index 0000000..60fb314
--- /dev/null
+++ b/TEWin/Resources/DistanceMeasurement/2052/Lang.js
@@ -0,0 +1,26 @@
+锘縎GLang.lang = $.extend(SGLang.lang,{
+    ToolTitle: "SmartEarth - 娉扮憺鏁板垱绉戞妧锛堝寳浜級鏈夐檺鍏徃",
+    ToolName: "鍦板舰鍓栭潰",
+    help: "甯姪",
+    //Text0: "Cancel",
+    //Text1: "Delete Last Point",
+    //Text2: "Aerial",
+    //Text3: "Horizontal",
+    //Text4: "Vertical",
+    //Text5: "OnGround",
+	Text6: "鍒涘缓娴嬮噺瀵硅薄",
+	Text7: "鎹曟崏",
+	//Text19: "Calculating query points",
+    //Text16: "Left click on the terrain to draw a polygon/Polyline. Right click to finish operation.",
+	Text17: "鍗曚綅",	
+    Text18: "鍒犻櫎娴嬮噺缁撴灉.",
+	Text19: "鍒犻櫎鏈�鍚庝竴涓妭鐐�.",
+	Text20: "鎹曟崏杈圭嚎锛屽璞′互鍙婅妭鐐�.",
+//	Text21: "Calculate aerial distance, i.e., the actual distance between points in the 3D Window.",
+//	Text22: "Calculate horizontal distance between points in the 3D Window.",
+	Text23: "鏄剧ず鍦板舰楂樼▼鍓栭潰.",
+	Text24: "鏄剧ず绌洪棿璺濈",
+	Text25: "鏄剧ず姘村钩璺濈",
+	Text26: "鏄剧ず鍨傜洿璺濈",
+
+});
\ No newline at end of file
diff --git a/TEWin/Resources/DistanceMeasurement/Lang.js b/TEWin/Resources/DistanceMeasurement/Lang.js
index c582749..fd93713 100644
--- a/TEWin/Resources/DistanceMeasurement/Lang.js
+++ b/TEWin/Resources/DistanceMeasurement/Lang.js
@@ -1,26 +1,26 @@
 锘縎GLang.lang = $.extend(SGLang.lang,{
-    ToolTitle: "璺濈娴嬮噺",
-    ToolName: "鍦板舰鍓栭潰",
-    help: "甯姪",
+    ToolTitle: "SkylineGlobe - Skyline Software Systems, Inc.",
+    ToolName: "Terrain Profile",
+    help: "Help",
     //Text0: "Cancel",
     //Text1: "Delete Last Point",
     //Text2: "Aerial",
     //Text3: "Horizontal",
     //Text4: "Vertical",
     //Text5: "OnGround",
-    Text6: "鍒涘缓娴嬮噺瀵硅薄",
-    Text7: "鎹曟崏",
+	Text6: "Create Measurement Objects",
+	Text7: "Snapping",
 	//Text19: "Calculating query points",
     //Text16: "Left click on the terrain to draw a polygon/Polyline. Right click to finish operation.",
-    Text17: "鍗曚綅",
-    Text18: "鍒犻櫎娴嬮噺鍊�",
-    Text19: "鍒犻櫎鏈�鍚庝竴涓祴閲忕偣",
-    Text20: "灏嗘祴閲忕偣鎹曟崏鍒拌竟銆佸璞″拰椤剁偣",
+	Text17: "Units",	
+    Text18: "Delete the measurement.",
+	Text19: "Delete the last measurement point.",
+	Text20: "Snap the measurement points to edges, objects, and vertices.",
 //	Text21: "Calculate aerial distance, i.e., the actual distance between points in the 3D Window.",
 //	Text22: "Calculate horizontal distance between points in the 3D Window.",
-	Text23: "鍦ㄧ┖涓樉绀哄湴褰㈤珮绋�",
-	Text24: "鏄剧ず绌轰腑璺濈",
-	Text25: "鏄剧ず姘村钩璺濈",
-	Text26: "鏄剧ず鍨傜洿璺濈",
+	Text23: "Display the terrain elevation profile along an aerial line.",
+	Text24: "Show Aerial Distance",
+	Text25: "Show Horizontal Distance",
+	Text26: "Show Vertical Distance",
 
 });
\ No newline at end of file
diff --git a/TEWin/Resources/DistanceMeasurement/distanceMeasurement.html b/TEWin/Resources/DistanceMeasurement/distanceMeasurement.html
index 46b0465..7c03584 100644
--- a/TEWin/Resources/DistanceMeasurement/distanceMeasurement.html
+++ b/TEWin/Resources/DistanceMeasurement/distanceMeasurement.html
@@ -8,59 +8,58 @@
     <style>
     </style>
 </head>
-<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" style="border: 0px; overflow: hidden;" id="Body"  class="hideUntillTranslated ToolButtonsArea" onload="Init()" onunload="OnUnload()">
+<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" style="border: 0px" id="Body"  class="hideUntillTranslated" onload="Init()" onunload="OnUnload()">
     <!--oncontextmenu="return false;">  onclick="bHide=true;HideOptionsNow()" > -->
-    <table border="0" width="100%" class="s8w" cellspacing="0" cellpadding="0">     
+    <table border="0" width="100%" cellspacing="0" cellpadding="2">     
+	
+	
         <tr class="s8">		
             <td colspan="2"  align="left" class="ToolButtonsArea" style="border-bottom: 2px solid #ffffff;">
                 <button id="deleteMeasure" class="MenuButton2" style="border:none;" onclick="OnDeleteMeasure();"><img src="./img/delete.png" /><br />  <!--  <span class="i18n">Text0</span> --></button>
                 <button id="deleteLastPoint" class="MenuButton2" style="border:none;" onclick="OnDeleteLastPoint()"><img src="./img/delete_last_point.png" /><br /><!-- <span class="i18n">Text1</span> --></button>
-				<button id="snapping" class="MenuButton2" style="border:none;" onclick="OnSnapping()"><img src="./img/snap.png" /><br /><!-- <span class="i18n" style="font:#2A4EA5">Text7</span>--> </button>								
-				<button id="onGroundDistance" class="MenuButton2" style="border-left: 2px solid #ffffff;border-right: none;" onclick="OnGroundDistance()"><img src="./img/TerrainProfile.png" /><br /><!-- <span class="i18n" style="font:#2A4EA5">Text5</span>--></button>				
+				<button id="snapping" class="MenuButton2" style="border-right: 2px solid #ffffff;" onclick="OnSnapping()"><img src="./img/snap.png" /><br /><!-- <span class="i18n" style="font:#2A4EA5">Text7</span>--> </button>								
+				<button id="onGroundDistance" class="MenuButton2" style="border:none;" onclick="OnGroundDistance()"><img src="./img/TerrainProfile.png" /><br /><!-- <span class="i18n" style="font:#2A4EA5">Text5</span>--></button>				
 				
             </td>				
         </tr>
-	</table>
-
-    <table border="0" width="100%" class="s8w ToolButtonsArea" cellspacing="0" cellpadding="3pt">     
 	
 			
-		<tr id="createTRId">			
-            <td  >
-				<span class="i18n s8w" style="vertical-align:top;">Text6</span>
+		<tr class="s8" height="40">			
+            <td  align="left" class="ToolButtonsArea" style="color:#ffffff;">
+				<span class="i18n" style="vertical-align:top;">Text6</span>
 					<input type="checkbox" align="bottom" id="createMeasurementObject" style="width:25px;"  onclick="CreateMeasurementObject();"/>																								
             </td>												
         </tr>
-		  <tr >
-		  <td  >
-				<span class="i18n s8w" style="vertical-align:top;color:yellow;">Text24</span>
+		  <tr height="10">
+		  <td  align="left" class="ToolButtonsArea" style="color:#ffffff;">
+				<span class="i18n" style="vertical-align:top;color:yellow;">Text24</span>
 					<input type="checkbox" id="showAerialDistance" checked align="bottom" style="width:75px;"  onclick="OnShowAerial();"/>																								
             </td>												
 			
 		</tr>       
-		<tr >
-			<td >
-				<span class="i18n s8w" style="vertical-align:top;color:white;">Text25</span>
+		<tr height="10">
+			<td  align="left" class="ToolButtonsArea" style="color:#ffffff;">
+				<span class="i18n" style="vertical-align:top;color:white;">Text25</span>
 					<input type="checkbox" id="showHorizontalDistance" align="bottom" style="width:25px;"  onclick="OnShowHorizontal();"/>																								
             </td>												
 		</tr>       
-		<tr >
-			<td  >
-				<span class="i18n s8w" style="vertical-align:top;color:#FF49E6;">Text26</span>
+		<tr height="10">
+			<td  align="left" class="ToolButtonsArea" style="color:#ffffff;">
+				<span class="i18n" style="vertical-align:top;color:#FF49E6;">Text26</span>
 					<input type="checkbox" id="showVerticalDistance" align="bottom" style="width:55px;"  onclick="OnShowVertical();"/>																								
             </td>												
 		</tr>       
-		<tr >		
-			<td class="textarea-container">			
+		<tr class="s8" height="72" bgcolor="0">		
+			<td class="textarea-container" style="color:#ffffff">			
 				<style>
 				div.textarea-size{font-size: 12px;}
 				</style>
-				<div class="textarea-size  s8w" ></div>
+				<div class="textarea-size" ></div>
 			</td>
 		</tr>
-		<tr  id="unitTRId">
-			<td  align="right"  >		
-				<span  id= "changeMeasurementUnits"  onclick="OnChangeMeasurementUnits()" class="i18n s9w link">Text17</span>										
+		 <tr class="s8">
+			<td  align="right"  bgcolor="0">		
+				<u style="color:#ffffff"><a class="btn btn-primary" style="color:#ffffff" href="#" role="button" id= "changeMeasurementUnits"  onclick="OnChangeMeasurementUnits()"><span class="i18n">Text17</span></a></u>										
 			</td>
 		</tr>	
 
@@ -95,51 +94,10 @@
 
 
 var gGeometry = null;
+
+
 //----------------
-function Init()
-{
-	SGWorld.AttachEvent("OnMeasurementDistanceResult", OnMeasurementResult);	
-	SGWorld.AttachEvent("OnInputModeChanged", OnInputModeChanged);	
-	SGWorld.AttachEvent("OnEndDrawMeasurement", OnEndDrawMeasurement);		
-	SGWorld.AttachEvent("OnLButtonUp", OnLButtonUp);		
-	
-	var isPM = GetParamValue("pm", "0");
-	if (isPM=="1"){
-		$("#unitTRId").hide();
-		$("#createTRId").hide();
-		$("#onGroundDistance").hide();
-	}	
-	document.getElementById("changeMeasurementUnits").value=SGLang.i18n("");
-	document.getElementById("deleteMeasure").title=SGLang.i18n("Text18");
-	document.getElementById("deleteLastPoint").title=SGLang.i18n("Text19");
-	document.getElementById("snapping").title=SGLang.i18n("Text20");
-	document.getElementById("onGroundDistance").title=SGLang.i18n("Text23");
-		
-	////Turn off CreateMeasurementObject
-	//SGWorld.Command.Execute(2225,0);
-	
-	var bCreateMeasurementObject = (isPM=="1")?false:SGWorld.GetOptionParam("CreateMeasurementObjects");
-	document.getElementById("createMeasurementObject").checked = bCreateMeasurementObject;
-	CreateMeasurementObject();
-	
-	Reset(1,0);	
-	
-	SGWorld.Command.Execute(2356,0);//__TEC_MEASURE_AERIAL_DIST
-	
-	SetSnapping();
-
-	document.getElementById("showAerialDistance").checked = SGWorld.GetOptionParam(_AERIAL_REG_NAME);
-	document.getElementById("showHorizontalDistance").checked = SGWorld.GetOptionParam(_HORIZONTAL_REG_NAME);
-	document.getElementById("showVerticalDistance").checked = SGWorld.GetOptionParam(_VERTICAL_REG_NAME);
-
-    //////////////OnShow();
-
-    EnableDisableButtons();
-    
-	
-	//showVerticalDistance
-}
-//----------------
+//  ShowPopup 
 function ShowPopup(ProfileType, ObjID) 
 {
     var CompareStr = "";
@@ -211,7 +169,7 @@
 	Reset(0,0);
     
 
-    SGWorld.Command.Execute(2356, 0);//__TEC_MEASURE_AERIAL_DIST
+    SGWorld.Command.Execute(1035, 0);
 
     EnableDisableButtons();	
     //alert("bb");
@@ -228,6 +186,54 @@
 	
 }
 
+function Init()
+{
+	SGWorld.AttachEvent("OnMeasurementDistanceResult", OnMeasurementResult);	
+	SGWorld.AttachEvent("OnInputModeChanged", OnInputModeChanged);	
+	SGWorld.AttachEvent("OnEndDrawMeasurement", OnEndDrawMeasurement);		
+	SGWorld.AttachEvent("OnLButtonUp", OnLButtonUp);		
+	
+	
+	document.getElementById("changeMeasurementUnits").value=SGLang.i18n("");
+
+	document.getElementById("deleteMeasure").title=SGLang.i18n("Text18");
+	document.getElementById("deleteLastPoint").title=SGLang.i18n("Text19");
+	document.getElementById("snapping").title=SGLang.i18n("Text20");
+	
+	
+	document.getElementById("onGroundDistance").title=SGLang.i18n("Text23");
+		
+	////Turn off CreateMeasurementObject
+	//SGWorld.Command.Execute(2225,0);
+	
+	var bCreateMeasurementObject = SGWorld.GetOptionParam("CreateMeasurementObjects");
+	document.getElementById("createMeasurementObject").checked = bCreateMeasurementObject;
+	
+	Reset(1,0);	
+	
+	
+	SGWorld.Command.Execute(1035,0);
+	
+	
+	SetSnapping();
+	
+    
+	
+	
+	document.getElementById("showAerialDistance").checked = SGWorld.GetOptionParam(_AERIAL_REG_NAME);
+	document.getElementById("showHorizontalDistance").checked = SGWorld.GetOptionParam(_HORIZONTAL_REG_NAME);
+	document.getElementById("showVerticalDistance").checked = SGWorld.GetOptionParam(_VERTICAL_REG_NAME);
+	
+
+    OnShow();
+
+    EnableDisableButtons();
+    
+	
+	//showVerticalDistance
+		
+	
+}
 
 function OnLButtonUp(Flags, X, Y)
 {
@@ -285,17 +291,6 @@
 
 function OnMeasurementResult(measurementResult,SounrceID)
 {
-  measurementResult = measurementResult.replace("Total Aerial Distance:", "鎬荤┖涓窛绂伙細")
-        .replace("Total Horizontal Distance:", "鎬绘按骞宠窛绂伙細")
-        .replace("Total Vertical Distance:", "鎬诲瀭鐩磋窛绂伙細")
-        .replace("Total Vertical Distance (First point to last point):", "鎬诲瀭鐩磋窛绂伙紙浠庣涓�鐐瑰埌鏈�鍚庝竴鐐癸級锛�")
-        .replace("Slope:", "鍧″害锛�")
-        .replace("Slope (First point to last point):", "鍧″害锛堜粠绗竴鐐瑰埌鏈�鍚庝竴鐐癸級锛�")
-        .replace(/km/g, " 鍗冪背")
-        .replace(/cm/g, " 鍘樼背")
-        .replace(/mm/g, " 姣背")
-        .replace(/m/g, " 绫�");
-
   textContainer = document.querySelector('.textarea-container');
   textareaSize = textContainer.querySelector('.textarea-size');
   //input = textContainer.querySelector('textarea');
@@ -441,4 +436,4 @@
 </html>
 
 
-<!--Sig:000000408JYdtBwnEhYwKwSHBToL4ROTBsQ92IumwfiHRg2dcUb.aSdjqmR2hWrrJjiq7xBbYr6MVX764LIe8a6004zvXaJJ-->
+<!--Sig:000000405.7Y75ySqtgDkqtb.Vz1lxgEisNhH.6TgboicXd4MIc7pamv2pMtgQL32A.a0g3r3BvYuCKxsIkZyGSiAi2LX8JJ-->
diff --git a/TEWin/TEWin.csproj b/TEWin/TEWin.csproj
index d6269cc..819453b 100644
--- a/TEWin/TEWin.csproj
+++ b/TEWin/TEWin.csproj
@@ -772,6 +772,18 @@
     <EmbeddedResource Include="Resources\DistanceMeasurement\Lang.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources\AreaMeasurement\1033\Lang.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\AreaMeasurement\2052\Lang.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\DistanceMeasurement\1033\Lang.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\DistanceMeasurement\2052\Lang.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
     <Content Include="Resources\log4net4.dll" />
     <Content Include="Resources\Newtonsoft.Json.dll" />
   </ItemGroup>

--
Gitblit v1.9.3