diff --git a/Bimangle.ForgeEngine.3DXML/Bimangle.ForgeEngine.3DXML.csproj b/Bimangle.ForgeEngine.3DXML/Bimangle.ForgeEngine.3DXML.csproj index a99fb65..a9e75c4 100644 --- a/Bimangle.ForgeEngine.3DXML/Bimangle.ForgeEngine.3DXML.csproj +++ b/Bimangle.ForgeEngine.3DXML/Bimangle.ForgeEngine.3DXML.csproj @@ -53,17 +53,17 @@ Properties\app.manifest - - ..\packages\Bimangle.ForgeEngine.3DXML.1.2.6\lib\net452\Bimangle.ForgeEngine.3DXML.dll + + ..\packages\Bimangle.ForgeEngine.3DXML.1.3.1\lib\net452\Bimangle.ForgeEngine.3DXML.dll - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.3DXML.1.2.6\lib\net452\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.3DXML.1.3.1\lib\net452\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.3DXML.1.2.6\lib\net452\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.3DXML.1.3.1\lib\net452\Bimangle.Libs.Proj.dll ..\packages\CommandLineParser.2.9.1\lib\net45\CommandLine.dll diff --git a/Bimangle.ForgeEngine.3DXML/Core/GeoreferncingAdapter.cs b/Bimangle.ForgeEngine.3DXML/Core/GeoreferncingAdapter.cs index 378e685..8d2de57 100644 --- a/Bimangle.ForgeEngine.3DXML/Core/GeoreferncingAdapter.cs +++ b/Bimangle.ForgeEngine.3DXML/Core/GeoreferncingAdapter.cs @@ -81,11 +81,6 @@ public override bool IsLocal() return true; } - public override void SetDirectionLetters(Label lblLocalX, Label lblLocalY) - { - //do nothing - } - public override bool IsTrueNorth(OriginType originType) { return true; diff --git a/Bimangle.ForgeEngine.3DXML/Core/ProjValidator.cs b/Bimangle.ForgeEngine.3DXML/Core/ProjValidator.cs index 52a991b..cd2b145 100644 --- a/Bimangle.ForgeEngine.3DXML/Core/ProjValidator.cs +++ b/Bimangle.ForgeEngine.3DXML/Core/ProjValidator.cs @@ -74,7 +74,8 @@ public bool Check(string definition, out string wkt) using (proj) { var type = proj.GetProjType(); - if (type == ProjType.PROJECTED_CRS) + if (type == ProjType.PROJECTED_CRS || + type == ProjType.COMPOUND_CRS) { wkt = Context.AsWKT(proj); return true; diff --git a/Bimangle.ForgeEngine.3DXML/packages.config b/Bimangle.ForgeEngine.3DXML/packages.config index 18b1e63..6d256a9 100644 --- a/Bimangle.ForgeEngine.3DXML/packages.config +++ b/Bimangle.ForgeEngine.3DXML/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Dgn/Bimangle.ForgeEngine.Dgn.csproj b/Bimangle.ForgeEngine.Dgn/Bimangle.ForgeEngine.Dgn.csproj index 42bc858..49289fb 100644 --- a/Bimangle.ForgeEngine.Dgn/Bimangle.ForgeEngine.Dgn.csproj +++ b/Bimangle.ForgeEngine.Dgn/Bimangle.ForgeEngine.Dgn.csproj @@ -73,20 +73,20 @@ C:\Program Files\Bentley\MicroStation CONNECT Edition\MicroStation\Assemblies\ECFramework\Bentley.UI.dll False - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Dgn.2.0.9\lib\net462\Bimangle.ForgeEngine.Dgn.dll + + ..\packages\Bimangle.ForgeEngine.Dgn.2.1.4\lib\net462\Bimangle.ForgeEngine.Dgn.dll - ..\packages\Bimangle.ForgeEngine.Dgn.2.0.9\lib\net462\Bimangle.ForgeEngine.Dgn.Support.dll + ..\packages\Bimangle.ForgeEngine.Dgn.2.1.4\lib\net462\Bimangle.ForgeEngine.Dgn.Support.dll - - ..\packages\Bimangle.ForgeEngine.Dgn.2.0.9\lib\net462\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Dgn.2.1.4\lib\net462\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Dgn.2.0.9\lib\net462\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Dgn.2.1.4\lib\net462\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Dgn/Core/GeoreferncingAdapter.cs b/Bimangle.ForgeEngine.Dgn/Core/GeoreferncingAdapter.cs index 940947b..2987cd9 100644 --- a/Bimangle.ForgeEngine.Dgn/Core/GeoreferncingAdapter.cs +++ b/Bimangle.ForgeEngine.Dgn/Core/GeoreferncingAdapter.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using System.IO; using System.Linq; +using System.Runtime.CompilerServices; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; @@ -83,11 +84,6 @@ public override bool IsLocal() return true; } - public override void SetDirectionLetters(Label lblLocalX, Label lblLocalY) - { - //do nothing - } - public override bool IsTrueNorth(OriginType originType) { return true; @@ -144,9 +140,10 @@ private bool GetEPSG(DgnGCS gcs, out string epsgCode) { try { + //至少 Update 10 的时候，还没有这个 EPSGCode 属性 if (gcs.GetType().GetProperty(@"EPSGCode") != null) { - var code = gcs.EPSGCode; + var code = SafeEPSGCode(gcs); if (code > 0) { epsgCode = $@"EPSG:{code}"; @@ -163,8 +160,8 @@ private bool GetEPSG(DgnGCS gcs, out string epsgCode) { if (gcs.GetType().GetMethod(@"GetEPSGCode") != null) { - //疑似 Update14 新增加的方法 - var code = gcs.GetEPSGCode(false); + //至少 Update 10 的时候，这个 GetEPSGCode 方法已存在 + var code = SafeGetEPSGCode(gcs, false); if (code > 0) { epsgCode = $@"EPSG:{code}"; @@ -181,6 +178,18 @@ private bool GetEPSG(DgnGCS gcs, out string epsgCode) return false; } + [MethodImpl(MethodImplOptions.NoInlining)] + private int SafeEPSGCode(DgnGCS gcs) + { + return gcs.EPSGCode; + } + + [MethodImpl(MethodImplOptions.NoInlining)] + private int SafeGetEPSGCode(DgnGCS gcs, bool dontSearch) + { + return gcs.GetEPSGCode(dontSearch); + } + /// /// 为了兼容 Update 17 的接口变更, 用反射方法来调用 GetWellKnownText /// diff --git a/Bimangle.ForgeEngine.Dgn/Core/ProjValidator.cs b/Bimangle.ForgeEngine.Dgn/Core/ProjValidator.cs index 308d4c1..9951f6e 100644 --- a/Bimangle.ForgeEngine.Dgn/Core/ProjValidator.cs +++ b/Bimangle.ForgeEngine.Dgn/Core/ProjValidator.cs @@ -74,7 +74,8 @@ public bool Check(string definition, out string wkt) using (proj) { var type = proj.GetProjType(); - if (type == ProjType.PROJECTED_CRS) + if (type == ProjType.PROJECTED_CRS || + type == ProjType.COMPOUND_CRS) { wkt = Context.AsWKT(proj); return true; diff --git a/Bimangle.ForgeEngine.Dgn/Toolset/CommandToolsetCreateProj.cs b/Bimangle.ForgeEngine.Dgn/Toolset/CommandToolsetCreateProj.cs index c42644a..3a22944 100644 --- a/Bimangle.ForgeEngine.Dgn/Toolset/CommandToolsetCreateProj.cs +++ b/Bimangle.ForgeEngine.Dgn/Toolset/CommandToolsetCreateProj.cs @@ -2,7 +2,6 @@ using System.Diagnostics; using System.Windows.Forms; using Bentley.MstnPlatformNET; - using Bimangle.ForgeEngine.Dgn.Config; using Bimangle.ForgeEngine.Dgn.Core; using Bimangle.ForgeEngine.Dgn.Utility; diff --git a/Bimangle.ForgeEngine.Dgn/Toolset/CommandToolsetPickPosition.cs b/Bimangle.ForgeEngine.Dgn/Toolset/CommandToolsetPickPosition.cs index 73c0146..fcd18f6 100644 --- a/Bimangle.ForgeEngine.Dgn/Toolset/CommandToolsetPickPosition.cs +++ b/Bimangle.ForgeEngine.Dgn/Toolset/CommandToolsetPickPosition.cs @@ -8,11 +8,11 @@ namespace Bimangle.ForgeEngine.Dgn.Toolset { - class CommandToolsetPickPosition : IExternalCommand + public class CommandToolsetPickPosition : IExternalCommand { private readonly AddIn _Addin; - public CommandToolsetPickPosition(AddIn addin) + internal CommandToolsetPickPosition(AddIn addin) { _Addin = addin ?? throw new ArgumentNullException(nameof(addin)); } diff --git a/Bimangle.ForgeEngine.Dgn/Toolset/PickPosition/FormPickPosition.resx b/Bimangle.ForgeEngine.Dgn/Toolset/PickPosition/FormPickPosition.resx index 7ba52c4..e9fd099 100644 --- a/Bimangle.ForgeEngine.Dgn/Toolset/PickPosition/FormPickPosition.resx +++ b/Bimangle.ForgeEngine.Dgn/Toolset/PickPosition/FormPickPosition.resx @@ -124,22 +124,18 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - btnOK + + MiddleRight Top, Left, Right - - Top, Left, Right - $this - - - 3 + + 214, 39 System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -147,8 +143,8 @@ 123, 21 - - 9 + + $this 123, 21 @@ -156,20 +152,11 @@ 1, 92 - - 7 - - - $this - - - 85, 13 - - - 344, 191 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3 + + btnOK $this @@ -177,8 +164,8 @@ FormPickPosition - - Top, Left, Right + + $this MiddleRight @@ -192,20 +179,21 @@ txtX + 9 Unit: - - MiddleRight + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 10 - - Disable + + cbUnit lblOrigin @@ -213,8 +201,8 @@ $this - - NoControl + + 3 Disable @@ -228,24 +216,21 @@ 0 - - Bottom, Left, Right - lblY System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3, 12 + 1, 39 CenterParent - - 76, 21 - 11 @@ -255,20 +240,17 @@ 123, 20 - - cbUnit - 2 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 9 85, 119 - - $this + + NoControl lblZ @@ -303,7 +285,7 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this @@ -312,8 +294,11 @@ 0 - - NoControl + + 123, 21 + + + Model CS: System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -327,11 +312,8 @@ 85, 147 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - &Pick + + 230, 32 4 @@ -342,8 +324,8 @@ $this - - txtY + + Top, Left, Right 8 @@ -351,9 +333,6 @@ $this - - $this - 1, 119 @@ -363,27 +342,30 @@ 6 - - 1, 65 + + 85, 13 - - Top, Left, Right + + Top, Right + + + NoControl 7 - - btnPick - MiddleRight - - $this + + 76, 21 txtZ + + Pick a position + AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAgBAAAAAAAAAAAAAAAAAAAAAA @@ -463,8 +445,8 @@ H(Z): - - NoControl + + Top, Left, Right N(Y): @@ -478,50 +460,59 @@ 78, 21 - - NoControl + + btnPick 78, 21 - - 214, 39 - Copy to clipboard 85, 92 + + NoControl + 5 + + 1, 65 + lblX System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + NoControl Disable - - 123, 21 + + txtY - - 230, 32 + + Disable - - 6 + + Bottom, Left, Right - - 3, 12 + + $this - - Pick a position + + 3 + + + &Pick + + + 6 1 @@ -535,11 +526,11 @@ 78, 21 - - Top, Right + + 344, 191 - - Origin: + + 7 System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -562,6 +553,15 @@ lblUnit + + NoControl + + + Top, Left, Right + + + $this + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/Bimangle.ForgeEngine.Dgn/Toolset/PickPosition/FormPickPosition.zh-Hans.resx b/Bimangle.ForgeEngine.Dgn/Toolset/PickPosition/FormPickPosition.zh-Hans.resx index ba7cdd9..663f132 100644 --- a/Bimangle.ForgeEngine.Dgn/Toolset/PickPosition/FormPickPosition.zh-Hans.resx +++ b/Bimangle.ForgeEngine.Dgn/Toolset/PickPosition/FormPickPosition.zh-Hans.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 参考原点: + 模型坐标系: 北 N(Y): diff --git a/Bimangle.ForgeEngine.Dgn/packages.config b/Bimangle.ForgeEngine.Dgn/packages.config index 5a1edc2..e73caac 100644 --- a/Bimangle.ForgeEngine.Dgn/packages.config +++ b/Bimangle.ForgeEngine.Dgn/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Georeferncing/Bimangle.ForgeEngine.Georeferncing.csproj b/Bimangle.ForgeEngine.Georeferncing/Bimangle.ForgeEngine.Georeferncing.csproj index 5ade546..9604c0f 100644 --- a/Bimangle.ForgeEngine.Georeferncing/Bimangle.ForgeEngine.Georeferncing.csproj +++ b/Bimangle.ForgeEngine.Georeferncing/Bimangle.ForgeEngine.Georeferncing.csproj @@ -32,8 +32,8 @@ 4 - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll ..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll @@ -79,7 +79,10 @@ + + + diff --git a/Bimangle.ForgeEngine.Georeferncing/FormGeoreferncing.Designer.cs b/Bimangle.ForgeEngine.Georeferncing/FormGeoreferncing.Designer.cs index ad30eee..6612145 100644 --- a/Bimangle.ForgeEngine.Georeferncing/FormGeoreferncing.Designer.cs +++ b/Bimangle.ForgeEngine.Georeferncing/FormGeoreferncing.Designer.cs @@ -36,6 +36,13 @@ private void InitializeComponent() this.cbAutoOriginLocation = new System.Windows.Forms.ComboBox(); this.lblAutoOriginLocation = new System.Windows.Forms.Label(); this.tabPageEnu = new System.Windows.Forms.TabPage(); + this.txtEnuModelOriginH = new System.Windows.Forms.TextBox(); + this.lblEnuModelOriginH = new System.Windows.Forms.Label(); + this.txtEnuModelOriginE = new System.Windows.Forms.TextBox(); + this.lblEnuModelOriginE = new System.Windows.Forms.Label(); + this.lblEnuModelOriginN = new System.Windows.Forms.Label(); + this.txtEnuModelOriginN = new System.Windows.Forms.TextBox(); + this.lblEnuModelOriginCoordinate = new System.Windows.Forms.Label(); this.cbEnuAutoAlignToGround = new System.Windows.Forms.CheckBox(); this.lblEnuAdvanced = new System.Windows.Forms.Label(); this.cbEnuAlignOriginToSitePlaneCenter = new System.Windows.Forms.CheckBox(); @@ -52,6 +59,13 @@ private void InitializeComponent() this.cbEnuOriginLocation = new System.Windows.Forms.ComboBox(); this.lblEnuOriginLocation = new System.Windows.Forms.Label(); this.tabPageLocal = new System.Windows.Forms.TabPage(); + this.txtLocalModelOriginH = new System.Windows.Forms.TextBox(); + this.lblLocalModelOriginH = new System.Windows.Forms.Label(); + this.txtLocalModelOriginE = new System.Windows.Forms.TextBox(); + this.lblLocalModelOriginE = new System.Windows.Forms.Label(); + this.lblLocalModelOriginN = new System.Windows.Forms.Label(); + this.txtLocalModelOriginN = new System.Windows.Forms.TextBox(); + this.lblLocalModelOriginCoordinate = new System.Windows.Forms.Label(); this.cbLocalAlignOriginToSitePlaneCenter = new System.Windows.Forms.CheckBox(); this.cbLocalUseProjectLocation = new System.Windows.Forms.CheckBox(); this.txtLocalRotation = new System.Windows.Forms.TextBox(); @@ -99,64 +113,50 @@ private void InitializeComponent() this.tabMain.Controls.Add(this.tabPageEnu); this.tabMain.Controls.Add(this.tabPageLocal); this.tabMain.Controls.Add(this.tabPageProj); - this.errorProvider1.SetError(this.tabMain, resources.GetString("tabMain.Error")); - this.errorProvider1.SetIconAlignment(this.tabMain, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("tabMain.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.tabMain, ((int)(resources.GetObject("tabMain.IconPadding")))); this.tabMain.Name = "tabMain"; this.tabMain.SelectedIndex = 0; - this.toolTip1.SetToolTip(this.tabMain, resources.GetString("tabMain.ToolTip")); this.tabMain.SelectedIndexChanged += new System.EventHandler(this.tabMain_SelectedIndexChanged); // // tabPageAuto // - resources.ApplyResources(this.tabPageAuto, "tabPageAuto"); this.tabPageAuto.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tabPageAuto.Controls.Add(this.txtAutoSummary); this.tabPageAuto.Controls.Add(this.cbAutoOriginLocation); this.tabPageAuto.Controls.Add(this.lblAutoOriginLocation); - this.errorProvider1.SetError(this.tabPageAuto, resources.GetString("tabPageAuto.Error")); - this.errorProvider1.SetIconAlignment(this.tabPageAuto, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("tabPageAuto.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.tabPageAuto, ((int)(resources.GetObject("tabPageAuto.IconPadding")))); + resources.ApplyResources(this.tabPageAuto, "tabPageAuto"); this.tabPageAuto.Name = "tabPageAuto"; - this.toolTip1.SetToolTip(this.tabPageAuto, resources.GetString("tabPageAuto.ToolTip")); this.tabPageAuto.UseVisualStyleBackColor = true; // // txtAutoSummary // resources.ApplyResources(this.txtAutoSummary, "txtAutoSummary"); - this.errorProvider1.SetError(this.txtAutoSummary, resources.GetString("txtAutoSummary.Error")); - this.errorProvider1.SetIconAlignment(this.txtAutoSummary, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("txtAutoSummary.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.txtAutoSummary, ((int)(resources.GetObject("txtAutoSummary.IconPadding")))); this.txtAutoSummary.Name = "txtAutoSummary"; this.txtAutoSummary.ReadOnly = true; - this.toolTip1.SetToolTip(this.txtAutoSummary, resources.GetString("txtAutoSummary.ToolTip")); // // cbAutoOriginLocation // resources.ApplyResources(this.cbAutoOriginLocation, "cbAutoOriginLocation"); this.cbAutoOriginLocation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbAutoOriginLocation.DropDownWidth = 400; - this.errorProvider1.SetError(this.cbAutoOriginLocation, resources.GetString("cbAutoOriginLocation.Error")); this.cbAutoOriginLocation.FormattingEnabled = true; - this.errorProvider1.SetIconAlignment(this.cbAutoOriginLocation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("cbAutoOriginLocation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.cbAutoOriginLocation, ((int)(resources.GetObject("cbAutoOriginLocation.IconPadding")))); this.cbAutoOriginLocation.Name = "cbAutoOriginLocation"; - this.toolTip1.SetToolTip(this.cbAutoOriginLocation, resources.GetString("cbAutoOriginLocation.ToolTip")); this.cbAutoOriginLocation.SelectedIndexChanged += new System.EventHandler(this.cbAutoOriginLocation_SelectedIndexChanged); // // lblAutoOriginLocation // resources.ApplyResources(this.lblAutoOriginLocation, "lblAutoOriginLocation"); - this.errorProvider1.SetError(this.lblAutoOriginLocation, resources.GetString("lblAutoOriginLocation.Error")); - this.errorProvider1.SetIconAlignment(this.lblAutoOriginLocation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblAutoOriginLocation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblAutoOriginLocation, ((int)(resources.GetObject("lblAutoOriginLocation.IconPadding")))); this.lblAutoOriginLocation.Name = "lblAutoOriginLocation"; - this.toolTip1.SetToolTip(this.lblAutoOriginLocation, resources.GetString("lblAutoOriginLocation.ToolTip")); // // tabPageEnu // - resources.ApplyResources(this.tabPageEnu, "tabPageEnu"); this.tabPageEnu.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tabPageEnu.Controls.Add(this.txtEnuModelOriginH); + this.tabPageEnu.Controls.Add(this.lblEnuModelOriginH); + this.tabPageEnu.Controls.Add(this.txtEnuModelOriginE); + this.tabPageEnu.Controls.Add(this.lblEnuModelOriginE); + this.tabPageEnu.Controls.Add(this.lblEnuModelOriginN); + this.tabPageEnu.Controls.Add(this.txtEnuModelOriginN); + this.tabPageEnu.Controls.Add(this.lblEnuModelOriginCoordinate); this.tabPageEnu.Controls.Add(this.cbEnuAutoAlignToGround); this.tabPageEnu.Controls.Add(this.lblEnuAdvanced); this.tabPageEnu.Controls.Add(this.cbEnuAlignOriginToSitePlaneCenter); @@ -172,163 +172,145 @@ private void InitializeComponent() this.tabPageEnu.Controls.Add(this.lblEnuOriginCoordinate); this.tabPageEnu.Controls.Add(this.cbEnuOriginLocation); this.tabPageEnu.Controls.Add(this.lblEnuOriginLocation); - this.errorProvider1.SetError(this.tabPageEnu, resources.GetString("tabPageEnu.Error")); - this.errorProvider1.SetIconAlignment(this.tabPageEnu, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("tabPageEnu.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.tabPageEnu, ((int)(resources.GetObject("tabPageEnu.IconPadding")))); + resources.ApplyResources(this.tabPageEnu, "tabPageEnu"); this.tabPageEnu.Name = "tabPageEnu"; - this.toolTip1.SetToolTip(this.tabPageEnu, resources.GetString("tabPageEnu.ToolTip")); this.tabPageEnu.UseVisualStyleBackColor = true; // + // txtEnuModelOriginH + // + resources.ApplyResources(this.txtEnuModelOriginH, "txtEnuModelOriginH"); + this.txtEnuModelOriginH.Name = "txtEnuModelOriginH"; + this.toolTip1.SetToolTip(this.txtEnuModelOriginH, resources.GetString("txtEnuModelOriginH.ToolTip")); + // + // lblEnuModelOriginH + // + resources.ApplyResources(this.lblEnuModelOriginH, "lblEnuModelOriginH"); + this.lblEnuModelOriginH.Name = "lblEnuModelOriginH"; + // + // txtEnuModelOriginE + // + resources.ApplyResources(this.txtEnuModelOriginE, "txtEnuModelOriginE"); + this.txtEnuModelOriginE.Name = "txtEnuModelOriginE"; + this.toolTip1.SetToolTip(this.txtEnuModelOriginE, resources.GetString("txtEnuModelOriginE.ToolTip")); + // + // lblEnuModelOriginE + // + resources.ApplyResources(this.lblEnuModelOriginE, "lblEnuModelOriginE"); + this.lblEnuModelOriginE.Name = "lblEnuModelOriginE"; + // + // lblEnuModelOriginN + // + resources.ApplyResources(this.lblEnuModelOriginN, "lblEnuModelOriginN"); + this.lblEnuModelOriginN.Name = "lblEnuModelOriginN"; + // + // txtEnuModelOriginN + // + resources.ApplyResources(this.txtEnuModelOriginN, "txtEnuModelOriginN"); + this.txtEnuModelOriginN.Name = "txtEnuModelOriginN"; + this.toolTip1.SetToolTip(this.txtEnuModelOriginN, resources.GetString("txtEnuModelOriginN.ToolTip")); + // + // lblEnuModelOriginCoordinate + // + resources.ApplyResources(this.lblEnuModelOriginCoordinate, "lblEnuModelOriginCoordinate"); + this.lblEnuModelOriginCoordinate.Name = "lblEnuModelOriginCoordinate"; + // // cbEnuAutoAlignToGround // resources.ApplyResources(this.cbEnuAutoAlignToGround, "cbEnuAutoAlignToGround"); - this.errorProvider1.SetError(this.cbEnuAutoAlignToGround, resources.GetString("cbEnuAutoAlignToGround.Error")); - this.errorProvider1.SetIconAlignment(this.cbEnuAutoAlignToGround, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("cbEnuAutoAlignToGround.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.cbEnuAutoAlignToGround, ((int)(resources.GetObject("cbEnuAutoAlignToGround.IconPadding")))); this.cbEnuAutoAlignToGround.Name = "cbEnuAutoAlignToGround"; - this.toolTip1.SetToolTip(this.cbEnuAutoAlignToGround, resources.GetString("cbEnuAutoAlignToGround.ToolTip")); this.cbEnuAutoAlignToGround.UseVisualStyleBackColor = true; // // lblEnuAdvanced // resources.ApplyResources(this.lblEnuAdvanced, "lblEnuAdvanced"); - this.errorProvider1.SetError(this.lblEnuAdvanced, resources.GetString("lblEnuAdvanced.Error")); - this.errorProvider1.SetIconAlignment(this.lblEnuAdvanced, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblEnuAdvanced.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblEnuAdvanced, ((int)(resources.GetObject("lblEnuAdvanced.IconPadding")))); this.lblEnuAdvanced.Name = "lblEnuAdvanced"; - this.toolTip1.SetToolTip(this.lblEnuAdvanced, resources.GetString("lblEnuAdvanced.ToolTip")); // // cbEnuAlignOriginToSitePlaneCenter // resources.ApplyResources(this.cbEnuAlignOriginToSitePlaneCenter, "cbEnuAlignOriginToSitePlaneCenter"); - this.errorProvider1.SetError(this.cbEnuAlignOriginToSitePlaneCenter, resources.GetString("cbEnuAlignOriginToSitePlaneCenter.Error")); - this.errorProvider1.SetIconAlignment(this.cbEnuAlignOriginToSitePlaneCenter, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("cbEnuAlignOriginToSitePlaneCenter.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.cbEnuAlignOriginToSitePlaneCenter, ((int)(resources.GetObject("cbEnuAlignOriginToSitePlaneCenter.IconPadding")))); this.cbEnuAlignOriginToSitePlaneCenter.Name = "cbEnuAlignOriginToSitePlaneCenter"; - this.toolTip1.SetToolTip(this.cbEnuAlignOriginToSitePlaneCenter, resources.GetString("cbEnuAlignOriginToSitePlaneCenter.ToolTip")); this.cbEnuAlignOriginToSitePlaneCenter.UseVisualStyleBackColor = true; + this.cbEnuAlignOriginToSitePlaneCenter.CheckedChanged += new System.EventHandler(this.cbEnuAlignOriginToSitePlaneCenter_CheckedChanged); // // cbEnuUseProjectLocation // resources.ApplyResources(this.cbEnuUseProjectLocation, "cbEnuUseProjectLocation"); - this.errorProvider1.SetError(this.cbEnuUseProjectLocation, resources.GetString("cbEnuUseProjectLocation.Error")); - this.errorProvider1.SetIconAlignment(this.cbEnuUseProjectLocation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("cbEnuUseProjectLocation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.cbEnuUseProjectLocation, ((int)(resources.GetObject("cbEnuUseProjectLocation.IconPadding")))); this.cbEnuUseProjectLocation.Name = "cbEnuUseProjectLocation"; - this.toolTip1.SetToolTip(this.cbEnuUseProjectLocation, resources.GetString("cbEnuUseProjectLocation.ToolTip")); this.cbEnuUseProjectLocation.UseVisualStyleBackColor = true; this.cbEnuUseProjectLocation.CheckedChanged += new System.EventHandler(this.cbEnuUseProjectLocation_CheckedChanged); // // txtEnuRotation // resources.ApplyResources(this.txtEnuRotation, "txtEnuRotation"); - this.errorProvider1.SetError(this.txtEnuRotation, resources.GetString("txtEnuRotation.Error")); - this.errorProvider1.SetIconAlignment(this.txtEnuRotation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("txtEnuRotation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.txtEnuRotation, ((int)(resources.GetObject("txtEnuRotation.IconPadding")))); this.txtEnuRotation.Name = "txtEnuRotation"; this.toolTip1.SetToolTip(this.txtEnuRotation, resources.GetString("txtEnuRotation.ToolTip")); - this.txtEnuRotation.Validating += new System.ComponentModel.CancelEventHandler(this.txtEnuRotation_Validating); // // lblEnuRotation // resources.ApplyResources(this.lblEnuRotation, "lblEnuRotation"); - this.errorProvider1.SetError(this.lblEnuRotation, resources.GetString("lblEnuRotation.Error")); - this.errorProvider1.SetIconAlignment(this.lblEnuRotation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblEnuRotation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblEnuRotation, ((int)(resources.GetObject("lblEnuRotation.IconPadding")))); this.lblEnuRotation.Name = "lblEnuRotation"; - this.toolTip1.SetToolTip(this.lblEnuRotation, resources.GetString("lblEnuRotation.ToolTip")); // // txtEnuHeight // resources.ApplyResources(this.txtEnuHeight, "txtEnuHeight"); - this.errorProvider1.SetError(this.txtEnuHeight, resources.GetString("txtEnuHeight.Error")); - this.errorProvider1.SetIconAlignment(this.txtEnuHeight, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("txtEnuHeight.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.txtEnuHeight, ((int)(resources.GetObject("txtEnuHeight.IconPadding")))); this.txtEnuHeight.Name = "txtEnuHeight"; this.toolTip1.SetToolTip(this.txtEnuHeight, resources.GetString("txtEnuHeight.ToolTip")); - this.txtEnuHeight.Validating += new System.ComponentModel.CancelEventHandler(this.txtEnuHeight_Validating); // // lblEnuHeight // resources.ApplyResources(this.lblEnuHeight, "lblEnuHeight"); - this.errorProvider1.SetError(this.lblEnuHeight, resources.GetString("lblEnuHeight.Error")); - this.errorProvider1.SetIconAlignment(this.lblEnuHeight, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblEnuHeight.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblEnuHeight, ((int)(resources.GetObject("lblEnuHeight.IconPadding")))); this.lblEnuHeight.Name = "lblEnuHeight"; - this.toolTip1.SetToolTip(this.lblEnuHeight, resources.GetString("lblEnuHeight.ToolTip")); // // txtEnuLongitude // resources.ApplyResources(this.txtEnuLongitude, "txtEnuLongitude"); - this.errorProvider1.SetError(this.txtEnuLongitude, resources.GetString("txtEnuLongitude.Error")); - this.errorProvider1.SetIconAlignment(this.txtEnuLongitude, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("txtEnuLongitude.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.txtEnuLongitude, ((int)(resources.GetObject("txtEnuLongitude.IconPadding")))); this.txtEnuLongitude.Name = "txtEnuLongitude"; this.toolTip1.SetToolTip(this.txtEnuLongitude, resources.GetString("txtEnuLongitude.ToolTip")); - this.txtEnuLongitude.Validating += new System.ComponentModel.CancelEventHandler(this.txtEnuLongitude_Validating); // // lblEnuLongitude // resources.ApplyResources(this.lblEnuLongitude, "lblEnuLongitude"); - this.errorProvider1.SetError(this.lblEnuLongitude, resources.GetString("lblEnuLongitude.Error")); - this.errorProvider1.SetIconAlignment(this.lblEnuLongitude, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblEnuLongitude.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblEnuLongitude, ((int)(resources.GetObject("lblEnuLongitude.IconPadding")))); this.lblEnuLongitude.Name = "lblEnuLongitude"; - this.toolTip1.SetToolTip(this.lblEnuLongitude, resources.GetString("lblEnuLongitude.ToolTip")); // // txtEnuLatitude // resources.ApplyResources(this.txtEnuLatitude, "txtEnuLatitude"); - this.errorProvider1.SetError(this.txtEnuLatitude, resources.GetString("txtEnuLatitude.Error")); - this.errorProvider1.SetIconAlignment(this.txtEnuLatitude, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("txtEnuLatitude.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.txtEnuLatitude, ((int)(resources.GetObject("txtEnuLatitude.IconPadding")))); this.txtEnuLatitude.Name = "txtEnuLatitude"; this.toolTip1.SetToolTip(this.txtEnuLatitude, resources.GetString("txtEnuLatitude.ToolTip")); - this.txtEnuLatitude.Validating += new System.ComponentModel.CancelEventHandler(this.txtEnuLatitude_Validating); // // lblEnuLatitude // resources.ApplyResources(this.lblEnuLatitude, "lblEnuLatitude"); - this.errorProvider1.SetError(this.lblEnuLatitude, resources.GetString("lblEnuLatitude.Error")); - this.errorProvider1.SetIconAlignment(this.lblEnuLatitude, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblEnuLatitude.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblEnuLatitude, ((int)(resources.GetObject("lblEnuLatitude.IconPadding")))); this.lblEnuLatitude.Name = "lblEnuLatitude"; - this.toolTip1.SetToolTip(this.lblEnuLatitude, resources.GetString("lblEnuLatitude.ToolTip")); // // lblEnuOriginCoordinate // resources.ApplyResources(this.lblEnuOriginCoordinate, "lblEnuOriginCoordinate"); - this.errorProvider1.SetError(this.lblEnuOriginCoordinate, resources.GetString("lblEnuOriginCoordinate.Error")); - this.errorProvider1.SetIconAlignment(this.lblEnuOriginCoordinate, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblEnuOriginCoordinate.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblEnuOriginCoordinate, ((int)(resources.GetObject("lblEnuOriginCoordinate.IconPadding")))); this.lblEnuOriginCoordinate.Name = "lblEnuOriginCoordinate"; - this.toolTip1.SetToolTip(this.lblEnuOriginCoordinate, resources.GetString("lblEnuOriginCoordinate.ToolTip")); // // cbEnuOriginLocation // resources.ApplyResources(this.cbEnuOriginLocation, "cbEnuOriginLocation"); this.cbEnuOriginLocation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.errorProvider1.SetError(this.cbEnuOriginLocation, resources.GetString("cbEnuOriginLocation.Error")); this.cbEnuOriginLocation.FormattingEnabled = true; - this.errorProvider1.SetIconAlignment(this.cbEnuOriginLocation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("cbEnuOriginLocation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.cbEnuOriginLocation, ((int)(resources.GetObject("cbEnuOriginLocation.IconPadding")))); this.cbEnuOriginLocation.Name = "cbEnuOriginLocation"; - this.toolTip1.SetToolTip(this.cbEnuOriginLocation, resources.GetString("cbEnuOriginLocation.ToolTip")); this.cbEnuOriginLocation.SelectedIndexChanged += new System.EventHandler(this.cbEnuOriginLocation_SelectedIndexChanged); // // lblEnuOriginLocation // resources.ApplyResources(this.lblEnuOriginLocation, "lblEnuOriginLocation"); - this.errorProvider1.SetError(this.lblEnuOriginLocation, resources.GetString("lblEnuOriginLocation.Error")); - this.errorProvider1.SetIconAlignment(this.lblEnuOriginLocation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblEnuOriginLocation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblEnuOriginLocation, ((int)(resources.GetObject("lblEnuOriginLocation.IconPadding")))); this.lblEnuOriginLocation.Name = "lblEnuOriginLocation"; - this.toolTip1.SetToolTip(this.lblEnuOriginLocation, resources.GetString("lblEnuOriginLocation.ToolTip")); // // tabPageLocal // - resources.ApplyResources(this.tabPageLocal, "tabPageLocal"); this.tabPageLocal.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tabPageLocal.Controls.Add(this.txtLocalModelOriginH); + this.tabPageLocal.Controls.Add(this.lblLocalModelOriginH); + this.tabPageLocal.Controls.Add(this.txtLocalModelOriginE); + this.tabPageLocal.Controls.Add(this.lblLocalModelOriginE); + this.tabPageLocal.Controls.Add(this.lblLocalModelOriginN); + this.tabPageLocal.Controls.Add(this.txtLocalModelOriginN); + this.tabPageLocal.Controls.Add(this.lblLocalModelOriginCoordinate); this.tabPageLocal.Controls.Add(this.cbLocalAlignOriginToSitePlaneCenter); this.tabPageLocal.Controls.Add(this.cbLocalUseProjectLocation); this.tabPageLocal.Controls.Add(this.txtLocalRotation); @@ -342,143 +324,126 @@ private void InitializeComponent() this.tabPageLocal.Controls.Add(this.lblLocalOriginCoordinate); this.tabPageLocal.Controls.Add(this.cbLocalOriginLocation); this.tabPageLocal.Controls.Add(this.lblLocalOriginLocation); - this.errorProvider1.SetError(this.tabPageLocal, resources.GetString("tabPageLocal.Error")); - this.errorProvider1.SetIconAlignment(this.tabPageLocal, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("tabPageLocal.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.tabPageLocal, ((int)(resources.GetObject("tabPageLocal.IconPadding")))); + resources.ApplyResources(this.tabPageLocal, "tabPageLocal"); this.tabPageLocal.Name = "tabPageLocal"; - this.toolTip1.SetToolTip(this.tabPageLocal, resources.GetString("tabPageLocal.ToolTip")); this.tabPageLocal.UseVisualStyleBackColor = true; // + // txtLocalModelOriginH + // + resources.ApplyResources(this.txtLocalModelOriginH, "txtLocalModelOriginH"); + this.txtLocalModelOriginH.Name = "txtLocalModelOriginH"; + this.toolTip1.SetToolTip(this.txtLocalModelOriginH, resources.GetString("txtLocalModelOriginH.ToolTip")); + // + // lblLocalModelOriginH + // + resources.ApplyResources(this.lblLocalModelOriginH, "lblLocalModelOriginH"); + this.lblLocalModelOriginH.Name = "lblLocalModelOriginH"; + // + // txtLocalModelOriginE + // + resources.ApplyResources(this.txtLocalModelOriginE, "txtLocalModelOriginE"); + this.txtLocalModelOriginE.Name = "txtLocalModelOriginE"; + this.toolTip1.SetToolTip(this.txtLocalModelOriginE, resources.GetString("txtLocalModelOriginE.ToolTip")); + // + // lblLocalModelOriginE + // + resources.ApplyResources(this.lblLocalModelOriginE, "lblLocalModelOriginE"); + this.lblLocalModelOriginE.Name = "lblLocalModelOriginE"; + // + // lblLocalModelOriginN + // + resources.ApplyResources(this.lblLocalModelOriginN, "lblLocalModelOriginN"); + this.lblLocalModelOriginN.Name = "lblLocalModelOriginN"; + // + // txtLocalModelOriginN + // + resources.ApplyResources(this.txtLocalModelOriginN, "txtLocalModelOriginN"); + this.txtLocalModelOriginN.Name = "txtLocalModelOriginN"; + this.toolTip1.SetToolTip(this.txtLocalModelOriginN, resources.GetString("txtLocalModelOriginN.ToolTip")); + // + // lblLocalModelOriginCoordinate + // + resources.ApplyResources(this.lblLocalModelOriginCoordinate, "lblLocalModelOriginCoordinate"); + this.lblLocalModelOriginCoordinate.Name = "lblLocalModelOriginCoordinate"; + // // cbLocalAlignOriginToSitePlaneCenter // resources.ApplyResources(this.cbLocalAlignOriginToSitePlaneCenter, "cbLocalAlignOriginToSitePlaneCenter"); - this.errorProvider1.SetError(this.cbLocalAlignOriginToSitePlaneCenter, resources.GetString("cbLocalAlignOriginToSitePlaneCenter.Error")); - this.errorProvider1.SetIconAlignment(this.cbLocalAlignOriginToSitePlaneCenter, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("cbLocalAlignOriginToSitePlaneCenter.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.cbLocalAlignOriginToSitePlaneCenter, ((int)(resources.GetObject("cbLocalAlignOriginToSitePlaneCenter.IconPadding")))); this.cbLocalAlignOriginToSitePlaneCenter.Name = "cbLocalAlignOriginToSitePlaneCenter"; - this.toolTip1.SetToolTip(this.cbLocalAlignOriginToSitePlaneCenter, resources.GetString("cbLocalAlignOriginToSitePlaneCenter.ToolTip")); this.cbLocalAlignOriginToSitePlaneCenter.UseVisualStyleBackColor = true; + this.cbLocalAlignOriginToSitePlaneCenter.CheckedChanged += new System.EventHandler(this.cbLocalAlignOriginToSitePlaneCenter_CheckedChanged); // // cbLocalUseProjectLocation // resources.ApplyResources(this.cbLocalUseProjectLocation, "cbLocalUseProjectLocation"); - this.errorProvider1.SetError(this.cbLocalUseProjectLocation, resources.GetString("cbLocalUseProjectLocation.Error")); - this.errorProvider1.SetIconAlignment(this.cbLocalUseProjectLocation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("cbLocalUseProjectLocation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.cbLocalUseProjectLocation, ((int)(resources.GetObject("cbLocalUseProjectLocation.IconPadding")))); this.cbLocalUseProjectLocation.Name = "cbLocalUseProjectLocation"; - this.toolTip1.SetToolTip(this.cbLocalUseProjectLocation, resources.GetString("cbLocalUseProjectLocation.ToolTip")); this.cbLocalUseProjectLocation.UseVisualStyleBackColor = true; this.cbLocalUseProjectLocation.CheckedChanged += new System.EventHandler(this.cbLocalUseProjectLocation_CheckedChanged); // // txtLocalRotation // resources.ApplyResources(this.txtLocalRotation, "txtLocalRotation"); - this.errorProvider1.SetError(this.txtLocalRotation, resources.GetString("txtLocalRotation.Error")); - this.errorProvider1.SetIconAlignment(this.txtLocalRotation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("txtLocalRotation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.txtLocalRotation, ((int)(resources.GetObject("txtLocalRotation.IconPadding")))); this.txtLocalRotation.Name = "txtLocalRotation"; this.toolTip1.SetToolTip(this.txtLocalRotation, resources.GetString("txtLocalRotation.ToolTip")); - this.txtLocalRotation.Validating += new System.ComponentModel.CancelEventHandler(this.txtLocalRotation_Validating); // // lblLocalRotation // resources.ApplyResources(this.lblLocalRotation, "lblLocalRotation"); - this.errorProvider1.SetError(this.lblLocalRotation, resources.GetString("lblLocalRotation.Error")); - this.errorProvider1.SetIconAlignment(this.lblLocalRotation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblLocalRotation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblLocalRotation, ((int)(resources.GetObject("lblLocalRotation.IconPadding")))); this.lblLocalRotation.Name = "lblLocalRotation"; - this.toolTip1.SetToolTip(this.lblLocalRotation, resources.GetString("lblLocalRotation.ToolTip")); // // txtLocalHeight // resources.ApplyResources(this.txtLocalHeight, "txtLocalHeight"); - this.errorProvider1.SetError(this.txtLocalHeight, resources.GetString("txtLocalHeight.Error")); - this.errorProvider1.SetIconAlignment(this.txtLocalHeight, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("txtLocalHeight.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.txtLocalHeight, ((int)(resources.GetObject("txtLocalHeight.IconPadding")))); this.txtLocalHeight.Name = "txtLocalHeight"; this.toolTip1.SetToolTip(this.txtLocalHeight, resources.GetString("txtLocalHeight.ToolTip")); - this.txtLocalHeight.Validating += new System.ComponentModel.CancelEventHandler(this.txtLocalHeight_Validating); // // lblLocalHeight // resources.ApplyResources(this.lblLocalHeight, "lblLocalHeight"); - this.errorProvider1.SetError(this.lblLocalHeight, resources.GetString("lblLocalHeight.Error")); - this.errorProvider1.SetIconAlignment(this.lblLocalHeight, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblLocalHeight.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblLocalHeight, ((int)(resources.GetObject("lblLocalHeight.IconPadding")))); this.lblLocalHeight.Name = "lblLocalHeight"; - this.toolTip1.SetToolTip(this.lblLocalHeight, resources.GetString("lblLocalHeight.ToolTip")); // // txtLocalLongitude // resources.ApplyResources(this.txtLocalLongitude, "txtLocalLongitude"); - this.errorProvider1.SetError(this.txtLocalLongitude, resources.GetString("txtLocalLongitude.Error")); - this.errorProvider1.SetIconAlignment(this.txtLocalLongitude, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("txtLocalLongitude.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.txtLocalLongitude, ((int)(resources.GetObject("txtLocalLongitude.IconPadding")))); this.txtLocalLongitude.Name = "txtLocalLongitude"; this.toolTip1.SetToolTip(this.txtLocalLongitude, resources.GetString("txtLocalLongitude.ToolTip")); - this.txtLocalLongitude.Validating += new System.ComponentModel.CancelEventHandler(this.txtLocalLongitude_Validating); // // lblLocalLongitude // resources.ApplyResources(this.lblLocalLongitude, "lblLocalLongitude"); - this.errorProvider1.SetError(this.lblLocalLongitude, resources.GetString("lblLocalLongitude.Error")); - this.errorProvider1.SetIconAlignment(this.lblLocalLongitude, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblLocalLongitude.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblLocalLongitude, ((int)(resources.GetObject("lblLocalLongitude.IconPadding")))); this.lblLocalLongitude.Name = "lblLocalLongitude"; - this.toolTip1.SetToolTip(this.lblLocalLongitude, resources.GetString("lblLocalLongitude.ToolTip")); // // txtLocalLatitude // resources.ApplyResources(this.txtLocalLatitude, "txtLocalLatitude"); - this.errorProvider1.SetError(this.txtLocalLatitude, resources.GetString("txtLocalLatitude.Error")); - this.errorProvider1.SetIconAlignment(this.txtLocalLatitude, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("txtLocalLatitude.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.txtLocalLatitude, ((int)(resources.GetObject("txtLocalLatitude.IconPadding")))); this.txtLocalLatitude.Name = "txtLocalLatitude"; this.toolTip1.SetToolTip(this.txtLocalLatitude, resources.GetString("txtLocalLatitude.ToolTip")); - this.txtLocalLatitude.Validating += new System.ComponentModel.CancelEventHandler(this.txtLocalLatitude_Validating); // // lblLocalLatitude // resources.ApplyResources(this.lblLocalLatitude, "lblLocalLatitude"); - this.errorProvider1.SetError(this.lblLocalLatitude, resources.GetString("lblLocalLatitude.Error")); - this.errorProvider1.SetIconAlignment(this.lblLocalLatitude, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblLocalLatitude.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblLocalLatitude, ((int)(resources.GetObject("lblLocalLatitude.IconPadding")))); this.lblLocalLatitude.Name = "lblLocalLatitude"; - this.toolTip1.SetToolTip(this.lblLocalLatitude, resources.GetString("lblLocalLatitude.ToolTip")); // // lblLocalOriginCoordinate // resources.ApplyResources(this.lblLocalOriginCoordinate, "lblLocalOriginCoordinate"); - this.errorProvider1.SetError(this.lblLocalOriginCoordinate, resources.GetString("lblLocalOriginCoordinate.Error")); - this.errorProvider1.SetIconAlignment(this.lblLocalOriginCoordinate, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblLocalOriginCoordinate.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblLocalOriginCoordinate, ((int)(resources.GetObject("lblLocalOriginCoordinate.IconPadding")))); this.lblLocalOriginCoordinate.Name = "lblLocalOriginCoordinate"; - this.toolTip1.SetToolTip(this.lblLocalOriginCoordinate, resources.GetString("lblLocalOriginCoordinate.ToolTip")); // // cbLocalOriginLocation // resources.ApplyResources(this.cbLocalOriginLocation, "cbLocalOriginLocation"); this.cbLocalOriginLocation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.errorProvider1.SetError(this.cbLocalOriginLocation, resources.GetString("cbLocalOriginLocation.Error")); this.cbLocalOriginLocation.FormattingEnabled = true; - this.errorProvider1.SetIconAlignment(this.cbLocalOriginLocation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("cbLocalOriginLocation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.cbLocalOriginLocation, ((int)(resources.GetObject("cbLocalOriginLocation.IconPadding")))); this.cbLocalOriginLocation.Name = "cbLocalOriginLocation"; - this.toolTip1.SetToolTip(this.cbLocalOriginLocation, resources.GetString("cbLocalOriginLocation.ToolTip")); this.cbLocalOriginLocation.SelectedIndexChanged += new System.EventHandler(this.cbLocalOriginLocation_SelectedIndexChanged); // // lblLocalOriginLocation // resources.ApplyResources(this.lblLocalOriginLocation, "lblLocalOriginLocation"); - this.errorProvider1.SetError(this.lblLocalOriginLocation, resources.GetString("lblLocalOriginLocation.Error")); - this.errorProvider1.SetIconAlignment(this.lblLocalOriginLocation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblLocalOriginLocation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblLocalOriginLocation, ((int)(resources.GetObject("lblLocalOriginLocation.IconPadding")))); this.lblLocalOriginLocation.Name = "lblLocalOriginLocation"; - this.toolTip1.SetToolTip(this.lblLocalOriginLocation, resources.GetString("lblLocalOriginLocation.ToolTip")); // // tabPageProj // - resources.ApplyResources(this.tabPageProj, "tabPageProj"); this.tabPageProj.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tabPageProj.Controls.Add(this.txtProjElevation); this.tabPageProj.Controls.Add(this.cbProjElevation); @@ -492,50 +457,32 @@ private void InitializeComponent() this.tabPageProj.Controls.Add(this.lblProjDefinition); this.tabPageProj.Controls.Add(this.cbProjOriginLocation); this.tabPageProj.Controls.Add(this.lblProjOriginLocation); - this.errorProvider1.SetError(this.tabPageProj, resources.GetString("tabPageProj.Error")); - this.errorProvider1.SetIconAlignment(this.tabPageProj, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("tabPageProj.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.tabPageProj, ((int)(resources.GetObject("tabPageProj.IconPadding")))); + resources.ApplyResources(this.tabPageProj, "tabPageProj"); this.tabPageProj.Name = "tabPageProj"; - this.toolTip1.SetToolTip(this.tabPageProj, resources.GetString("tabPageProj.ToolTip")); this.tabPageProj.UseVisualStyleBackColor = true; // // txtProjElevation // resources.ApplyResources(this.txtProjElevation, "txtProjElevation"); - this.errorProvider1.SetError(this.txtProjElevation, resources.GetString("txtProjElevation.Error")); - this.errorProvider1.SetIconAlignment(this.txtProjElevation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("txtProjElevation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.txtProjElevation, ((int)(resources.GetObject("txtProjElevation.IconPadding")))); this.txtProjElevation.Name = "txtProjElevation"; this.toolTip1.SetToolTip(this.txtProjElevation, resources.GetString("txtProjElevation.ToolTip")); - this.txtProjElevation.Validating += new System.ComponentModel.CancelEventHandler(this.txtProjElevation_Validating); // // cbProjElevation // resources.ApplyResources(this.cbProjElevation, "cbProjElevation"); this.cbProjElevation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.errorProvider1.SetError(this.cbProjElevation, resources.GetString("cbProjElevation.Error")); this.cbProjElevation.FormattingEnabled = true; - this.errorProvider1.SetIconAlignment(this.cbProjElevation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("cbProjElevation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.cbProjElevation, ((int)(resources.GetObject("cbProjElevation.IconPadding")))); this.cbProjElevation.Name = "cbProjElevation"; - this.toolTip1.SetToolTip(this.cbProjElevation, resources.GetString("cbProjElevation.ToolTip")); this.cbProjElevation.SelectedIndexChanged += new System.EventHandler(this.cbProjElevation_SelectedIndexChanged); // // lblProjElevation // resources.ApplyResources(this.lblProjElevation, "lblProjElevation"); - this.errorProvider1.SetError(this.lblProjElevation, resources.GetString("lblProjElevation.Error")); - this.errorProvider1.SetIconAlignment(this.lblProjElevation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblProjElevation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblProjElevation, ((int)(resources.GetObject("lblProjElevation.IconPadding")))); this.lblProjElevation.Name = "lblProjElevation"; - this.toolTip1.SetToolTip(this.lblProjElevation, resources.GetString("lblProjElevation.ToolTip")); // // btnProjDefinitionSave // resources.ApplyResources(this.btnProjDefinitionSave, "btnProjDefinitionSave"); - this.errorProvider1.SetError(this.btnProjDefinitionSave, resources.GetString("btnProjDefinitionSave.Error")); - this.errorProvider1.SetIconAlignment(this.btnProjDefinitionSave, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("btnProjDefinitionSave.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.btnProjDefinitionSave, ((int)(resources.GetObject("btnProjDefinitionSave.IconPadding")))); this.btnProjDefinitionSave.Name = "btnProjDefinitionSave"; this.toolTip1.SetToolTip(this.btnProjDefinitionSave, resources.GetString("btnProjDefinitionSave.ToolTip")); this.btnProjDefinitionSave.UseVisualStyleBackColor = true; @@ -544,9 +491,6 @@ private void InitializeComponent() // btnProjCoordinateOffsetSave // resources.ApplyResources(this.btnProjCoordinateOffsetSave, "btnProjCoordinateOffsetSave"); - this.errorProvider1.SetError(this.btnProjCoordinateOffsetSave, resources.GetString("btnProjCoordinateOffsetSave.Error")); - this.errorProvider1.SetIconAlignment(this.btnProjCoordinateOffsetSave, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("btnProjCoordinateOffsetSave.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.btnProjCoordinateOffsetSave, ((int)(resources.GetObject("btnProjCoordinateOffsetSave.IconPadding")))); this.btnProjCoordinateOffsetSave.Name = "btnProjCoordinateOffsetSave"; this.toolTip1.SetToolTip(this.btnProjCoordinateOffsetSave, resources.GetString("btnProjCoordinateOffsetSave.ToolTip")); this.btnProjCoordinateOffsetSave.UseVisualStyleBackColor = true; @@ -555,94 +499,57 @@ private void InitializeComponent() // txtProjDefinition // resources.ApplyResources(this.txtProjDefinition, "txtProjDefinition"); - this.errorProvider1.SetError(this.txtProjDefinition, resources.GetString("txtProjDefinition.Error")); - this.errorProvider1.SetIconAlignment(this.txtProjDefinition, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("txtProjDefinition.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.txtProjDefinition, ((int)(resources.GetObject("txtProjDefinition.IconPadding")))); this.txtProjDefinition.Name = "txtProjDefinition"; - this.toolTip1.SetToolTip(this.txtProjDefinition, resources.GetString("txtProjDefinition.ToolTip")); this.txtProjDefinition.DoubleClick += new System.EventHandler(this.txtProjDefinition_DoubleClick); this.txtProjDefinition.Enter += new System.EventHandler(this.txtProjDefinition_Enter); - this.txtProjDefinition.Validating += new System.ComponentModel.CancelEventHandler(this.txtProjDefinition_Validating); // // cbProjDefinition // resources.ApplyResources(this.cbProjDefinition, "cbProjDefinition"); this.cbProjDefinition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.errorProvider1.SetError(this.cbProjDefinition, resources.GetString("cbProjDefinition.Error")); this.cbProjDefinition.FormattingEnabled = true; - this.errorProvider1.SetIconAlignment(this.cbProjDefinition, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("cbProjDefinition.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.cbProjDefinition, ((int)(resources.GetObject("cbProjDefinition.IconPadding")))); this.cbProjDefinition.Name = "cbProjDefinition"; - this.toolTip1.SetToolTip(this.cbProjDefinition, resources.GetString("cbProjDefinition.ToolTip")); this.cbProjDefinition.SelectedIndexChanged += new System.EventHandler(this.cbProjDefinition_SelectedIndexChanged); // // txtProjCoordinateOffset // resources.ApplyResources(this.txtProjCoordinateOffset, "txtProjCoordinateOffset"); - this.errorProvider1.SetError(this.txtProjCoordinateOffset, resources.GetString("txtProjCoordinateOffset.Error")); - this.errorProvider1.SetIconAlignment(this.txtProjCoordinateOffset, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("txtProjCoordinateOffset.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.txtProjCoordinateOffset, ((int)(resources.GetObject("txtProjCoordinateOffset.IconPadding")))); this.txtProjCoordinateOffset.Name = "txtProjCoordinateOffset"; this.toolTip1.SetToolTip(this.txtProjCoordinateOffset, resources.GetString("txtProjCoordinateOffset.ToolTip")); - this.txtProjCoordinateOffset.Validating += new System.ComponentModel.CancelEventHandler(this.txtProjCoordinateOffset_Validating); // // lblProjCoordinateOffset // resources.ApplyResources(this.lblProjCoordinateOffset, "lblProjCoordinateOffset"); - this.errorProvider1.SetError(this.lblProjCoordinateOffset, resources.GetString("lblProjCoordinateOffset.Error")); - this.errorProvider1.SetIconAlignment(this.lblProjCoordinateOffset, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblProjCoordinateOffset.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblProjCoordinateOffset, ((int)(resources.GetObject("lblProjCoordinateOffset.IconPadding")))); this.lblProjCoordinateOffset.Name = "lblProjCoordinateOffset"; - this.toolTip1.SetToolTip(this.lblProjCoordinateOffset, resources.GetString("lblProjCoordinateOffset.ToolTip")); // // lblProjDefinition // resources.ApplyResources(this.lblProjDefinition, "lblProjDefinition"); - this.errorProvider1.SetError(this.lblProjDefinition, resources.GetString("lblProjDefinition.Error")); - this.errorProvider1.SetIconAlignment(this.lblProjDefinition, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblProjDefinition.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblProjDefinition, ((int)(resources.GetObject("lblProjDefinition.IconPadding")))); this.lblProjDefinition.Name = "lblProjDefinition"; - this.toolTip1.SetToolTip(this.lblProjDefinition, resources.GetString("lblProjDefinition.ToolTip")); // // cbProjOriginLocation // resources.ApplyResources(this.cbProjOriginLocation, "cbProjOriginLocation"); this.cbProjOriginLocation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.errorProvider1.SetError(this.cbProjOriginLocation, resources.GetString("cbProjOriginLocation.Error")); this.cbProjOriginLocation.FormattingEnabled = true; - this.errorProvider1.SetIconAlignment(this.cbProjOriginLocation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("cbProjOriginLocation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.cbProjOriginLocation, ((int)(resources.GetObject("cbProjOriginLocation.IconPadding")))); this.cbProjOriginLocation.Name = "cbProjOriginLocation"; - this.toolTip1.SetToolTip(this.cbProjOriginLocation, resources.GetString("cbProjOriginLocation.ToolTip")); // // lblProjOriginLocation // resources.ApplyResources(this.lblProjOriginLocation, "lblProjOriginLocation"); - this.errorProvider1.SetError(this.lblProjOriginLocation, resources.GetString("lblProjOriginLocation.Error")); - this.errorProvider1.SetIconAlignment(this.lblProjOriginLocation, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lblProjOriginLocation.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.lblProjOriginLocation, ((int)(resources.GetObject("lblProjOriginLocation.IconPadding")))); this.lblProjOriginLocation.Name = "lblProjOriginLocation"; - this.toolTip1.SetToolTip(this.lblProjOriginLocation, resources.GetString("lblProjOriginLocation.ToolTip")); // // btnReset // resources.ApplyResources(this.btnReset, "btnReset"); - this.errorProvider1.SetError(this.btnReset, resources.GetString("btnReset.Error")); - this.errorProvider1.SetIconAlignment(this.btnReset, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("btnReset.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.btnReset, ((int)(resources.GetObject("btnReset.IconPadding")))); this.btnReset.Name = "btnReset"; - this.toolTip1.SetToolTip(this.btnReset, resources.GetString("btnReset.ToolTip")); this.btnReset.UseVisualStyleBackColor = true; this.btnReset.Click += new System.EventHandler(this.btnReset_Click); // // btnOK // resources.ApplyResources(this.btnOK, "btnOK"); - this.errorProvider1.SetError(this.btnOK, resources.GetString("btnOK.Error")); - this.errorProvider1.SetIconAlignment(this.btnOK, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("btnOK.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.btnOK, ((int)(resources.GetObject("btnOK.IconPadding")))); this.btnOK.Name = "btnOK"; - this.toolTip1.SetToolTip(this.btnOK, resources.GetString("btnOK.ToolTip")); this.btnOK.UseVisualStyleBackColor = true; this.btnOK.Click += new System.EventHandler(this.btnOK_Click); // @@ -650,18 +557,13 @@ private void InitializeComponent() // resources.ApplyResources(this.btnCancel, "btnCancel"); this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.errorProvider1.SetError(this.btnCancel, resources.GetString("btnCancel.Error")); - this.errorProvider1.SetIconAlignment(this.btnCancel, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("btnCancel.IconAlignment")))); - this.errorProvider1.SetIconPadding(this.btnCancel, ((int)(resources.GetObject("btnCancel.IconPadding")))); this.btnCancel.Name = "btnCancel"; - this.toolTip1.SetToolTip(this.btnCancel, resources.GetString("btnCancel.ToolTip")); this.btnCancel.UseVisualStyleBackColor = true; this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); // // errorProvider1 // this.errorProvider1.ContainerControl = this; - resources.ApplyResources(this.errorProvider1, "errorProvider1"); // // openFileDialog1 // @@ -681,7 +583,6 @@ private void InitializeComponent() this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormGeoreferncing"; - this.toolTip1.SetToolTip(this, resources.GetString("$this.ToolTip")); this.Load += new System.EventHandler(this.FormGeoreferncing_Load); this.tabMain.ResumeLayout(false); this.tabPageAuto.ResumeLayout(false); @@ -753,5 +654,19 @@ private void InitializeComponent() private System.Windows.Forms.TextBox txtProjElevation; private System.Windows.Forms.ComboBox cbProjElevation; private System.Windows.Forms.Label lblProjElevation; + private System.Windows.Forms.Label lblEnuModelOriginCoordinate; + private System.Windows.Forms.TextBox txtEnuModelOriginN; + private System.Windows.Forms.Label lblEnuModelOriginN; + private System.Windows.Forms.Label lblEnuModelOriginE; + private System.Windows.Forms.TextBox txtEnuModelOriginE; + private System.Windows.Forms.TextBox txtEnuModelOriginH; + private System.Windows.Forms.Label lblEnuModelOriginH; + private System.Windows.Forms.TextBox txtLocalModelOriginH; + private System.Windows.Forms.Label lblLocalModelOriginH; + private System.Windows.Forms.TextBox txtLocalModelOriginE; + private System.Windows.Forms.Label lblLocalModelOriginE; + private System.Windows.Forms.Label lblLocalModelOriginN; + private System.Windows.Forms.TextBox txtLocalModelOriginN; + private System.Windows.Forms.Label lblLocalModelOriginCoordinate; } } \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Georeferncing/FormGeoreferncing.cs b/Bimangle.ForgeEngine.Georeferncing/FormGeoreferncing.cs index ef37567..4286dfd 100644 --- a/Bimangle.ForgeEngine.Georeferncing/FormGeoreferncing.cs +++ b/Bimangle.ForgeEngine.Georeferncing/FormGeoreferncing.cs @@ -17,6 +17,7 @@ partial class FormGeoreferncing : Form { private readonly string _ProjectFilePath = null; private readonly SiteInfo _SiteInfo = null; + private readonly double[] _DefaultModelOrigin; private readonly IGeoreferncingHost _Host; private readonly string _DefaultTitle; @@ -25,6 +26,7 @@ public FormGeoreferncing(IGeoreferncingHost host, GeoreferencedSetting setting) { _Host = host ?? throw new ArgumentNullException(nameof(host)); _SiteInfo = _Host.GetModelSiteInfo(); + _DefaultModelOrigin = _Host.GetDefaultModelOrigin(); _ProjectFilePath = _Host.GetModelFilePath(); _DefaultTitle = Text; @@ -59,7 +61,7 @@ private void tabMain_SelectedIndexChanged(object sender, EventArgs e) private void InitUI() { - #region 初始化 "原点位置选择" 下拉框 + #region 初始化 "模型坐标系" 下拉框 { var originTypes = _Host.GetSupportOriginTypes(); @@ -101,6 +103,38 @@ private void InitUI() } #endregion + #region 初始化 站心坐标 + { + _Host.Adapter.SetDirectionLetters(lblEnuModelOriginE, lblEnuModelOriginN, lblEnuModelOriginH); + + txtEnuModelOriginN.OnValidating(t => { TryParseNumber(t, out _); }); + txtEnuModelOriginE.OnValidating(t => { TryParseNumber(t, out _); }); + txtEnuModelOriginH.OnValidating(t => { TryParseNumber(t, out _); }); + + txtEnuLatitude.OnValidating(t => { TryParseLatitude(t, out _); }); + txtEnuLongitude.OnValidating(t => { TryParseLongitude(t, out _); }); + txtEnuHeight.OnValidating(t => { TryParseHeight(t, out _); }); + txtEnuRotation.OnValidating(t => { TryParseRotation(t, out _); }); + } + #endregion + + #region 初始化 暂不配准 + { + _Host.Adapter.SetDirectionLetters(lblLocalModelOriginE, lblLocalModelOriginN, lblLocalModelOriginH); + + txtLocalModelOriginN.OnValidating(t => { TryParseNumber(t, out _); }); + txtLocalModelOriginE.OnValidating(t => { TryParseNumber(t, out _); }); + txtLocalModelOriginH.OnValidating(t => { TryParseNumber(t, out _); }); + + txtLocalLatitude.OnValidating(t => { TryParseLatitude(t, out _); }); + txtLocalLongitude.OnValidating(t => { TryParseLongitude(t, out _); }); + txtLocalHeight.OnValidating(t => { TryParseHeight(t, out _); }); + txtLocalRotation.OnValidating(t => { TryParseRotation(t, out _); }); + } + #endregion + + #region 初始化 投影坐标 + #region 初始化 "投影参考定义" 下拉框 { var items = _Host.GetProjSourceItems(); @@ -132,8 +166,7 @@ private void InitUI() e.Effect = DragDropEffects.None; if (e.Data.TryParsePath(out var path) && File.Exists(path)) { - var projDefinition = _Host.GetProjDefinition(path); - if (string.IsNullOrWhiteSpace(projDefinition) == false) + if (CheckProjFile(path)) { e.Effect = DragDropEffects.Link; } @@ -142,6 +175,44 @@ private void InitUI() } #endregion + txtProjCoordinateOffset.OnValidating(t => + { + errorProvider1.SetError(t, null); + + var ret = true; + var s = t.Text; + if (string.IsNullOrWhiteSpace(s)) + { + t.Text = @"0,0,0"; + } + else if (TryParseOffsets(s, out _) == false) + { + ret = false; //e.Cancel = true; + errorProvider1.SetError(btnProjCoordinateOffsetSave, GeoStrings.InvalidData); + } + return ret; + }); + + txtProjElevation.OnValidating(t => { TryParseHeight(t, out _); }); + + txtProjDefinition.OnValidating(t => + { + var s = t.Text; + if (_Host.CheckProjDefinition(s, out _) == false) + { + t.ForeColor = Color.Red; + errorProvider1.SetError(t, GeoStrings.InvalidProjectDefinition); + } + else + { + t.ForeColor = Color.Green; + errorProvider1.SetError(t, null); + } + }); + + #endregion + + if (_SiteInfo == null) { cbEnuUseProjectLocation.Visible = false; @@ -194,6 +265,15 @@ private void UpdateToTabEnu(ParameterEnu p) cbEnuAlignOriginToSitePlaneCenter.Checked = p.AlignOriginToSitePlaneCenter; + if (p.AlignOriginToSitePlaneCenter == false && + p.OriginOffset != null && + p.OriginOffset.Length >= 3) + { + txtEnuModelOriginN.Text = GetDoubleString(p.OriginOffset[1], 10); + txtEnuModelOriginE.Text = GetDoubleString(p.OriginOffset[0], 10); + txtEnuModelOriginH.Text = GetDoubleString(p.OriginOffset[2], 10); + } + cbEnuUseProjectLocation.Checked = p.UseProjectLocation; txtEnuLatitude.Text = GetDoubleString(p.Latitude, 10); txtEnuLongitude.Text = GetDoubleString(p.Longitude, 10); @@ -209,6 +289,15 @@ private void UpdateToTabLocal(ParameterLocal p) cbLocalAlignOriginToSitePlaneCenter.Checked = p.AlignOriginToSitePlaneCenter; + if (p.AlignOriginToSitePlaneCenter == false && + p.OriginOffset != null && + p.OriginOffset.Length >= 3) + { + txtLocalModelOriginN.Text = GetDoubleString(p.OriginOffset[1], 10); + txtLocalModelOriginE.Text = GetDoubleString(p.OriginOffset[0], 10); + txtLocalModelOriginH.Text = GetDoubleString(p.OriginOffset[2], 10); + } + cbLocalUseProjectLocation.Checked = p.UseProjectLocation; txtLocalLatitude.Text = GetDoubleString(p.Latitude, 10); txtLocalLongitude.Text = GetDoubleString(p.Longitude, 10); @@ -306,13 +395,46 @@ private bool UpdateFromTabEnu(ParameterEnu p) var isActive = tabMain.SelectedTab == tabPageEnu; var ret = true; + TextBox errorTextBox = null; + p.Origin = cbEnuOriginLocation.GetSelectedValue(); - p.AlignOriginToSitePlaneCenter = cbEnuAlignOriginToSitePlaneCenter.Checked; + + if (cbEnuAlignOriginToSitePlaneCenter.Checked) + { + p.AlignOriginToSitePlaneCenter = true; + p.OriginOffset = null; + } + else + { + p.AlignOriginToSitePlaneCenter = false; + + if (TryParseNumber(txtEnuModelOriginN, out var y) == false) + { + errorTextBox = errorTextBox ?? txtEnuModelOriginN; + ret = false; + } + + if (TryParseNumber(txtEnuModelOriginE, out var x) == false) + { + errorTextBox = errorTextBox ?? txtEnuModelOriginE; + ret = false; + } + + if (TryParseNumber(txtEnuModelOriginH, out var z) == false) + { + errorTextBox = errorTextBox ?? txtEnuModelOriginH; + ret = false; + } + + if (ret) + { + p.OriginOffset = new[] { x, y, z }; + } + } + p.UseProjectLocation = cbEnuUseProjectLocation.Checked; p.UseAutoAlignToGround = cbEnuAutoAlignToGround.Checked; - TextBox errorTextBox = null; - if (TryParseLatitude(txtEnuLatitude, out var latitude)) { p.Latitude = latitude; @@ -366,11 +488,44 @@ private bool UpdateFromTabLocal(ParameterLocal p) var isActive = tabMain.SelectedTab == tabPageLocal; var ret = true; + TextBox errorTextBox = null; + p.Origin = cbLocalOriginLocation.GetSelectedValue(); - p.AlignOriginToSitePlaneCenter = cbLocalAlignOriginToSitePlaneCenter.Checked; - p.UseProjectLocation = cbLocalUseProjectLocation.Checked; - TextBox errorTextBox = null; + if (cbLocalAlignOriginToSitePlaneCenter.Checked) + { + p.AlignOriginToSitePlaneCenter = true; + p.OriginOffset = null; + } + else + { + p.AlignOriginToSitePlaneCenter = false; + + if (TryParseNumber(txtLocalModelOriginN, out var y) == false) + { + errorTextBox = errorTextBox ?? txtLocalModelOriginN; + ret = false; + } + + if (TryParseNumber(txtLocalModelOriginE, out var x) == false) + { + errorTextBox = errorTextBox ?? txtLocalModelOriginE; + ret = false; + } + + if (TryParseNumber(txtLocalModelOriginH, out var z) == false) + { + errorTextBox = errorTextBox ?? txtLocalModelOriginH; + ret = false; + } + + if (ret) + { + p.OriginOffset = new[] { x, y, z }; + } + } + + p.UseProjectLocation = cbLocalUseProjectLocation.Checked; if (TryParseLatitude(txtLocalLatitude, out var latitude)) { @@ -549,11 +704,6 @@ private void cbProjElevation_SelectedIndexChanged(object sender, EventArgs e) } } - private void txtProjElevation_Validating(object sender, System.ComponentModel.CancelEventArgs e) - { - TryParseHeight(txtProjElevation, out _); - } - private void cbProjDefinition_SelectedIndexChanged(object sender, EventArgs e) { if (cbProjDefinition.SelectedItem is ProjSourceItem item) @@ -593,6 +743,15 @@ private void cbProjDefinition_SelectedIndexChanged(object sender, EventArgs e) txtProjDefinition.Text = item.ProjDefinition.ToWindowsFormat(); txtProjDefinition.ReadOnly = true; break; + case ProjSourceType.MetadataXml: + { + if (MetadataXml.TryParse(item.FilePath, out var meta) && + meta.TryGetProj(_Host, out var proj)) + { + UseMetadataXmlProj(proj); + } + break; + } case ProjSourceType.ProjectFolder: txtProjDefinition.Text = item.ProjDefinition.ToWindowsFormat(); txtProjDefinition.ReadOnly = true; @@ -607,22 +766,6 @@ private void cbProjDefinition_SelectedIndexChanged(object sender, EventArgs e) } } - private void txtProjCoordinateOffset_Validating(object sender, System.ComponentModel.CancelEventArgs e) - { - errorProvider1.SetError(txtProjCoordinateOffset, null); - - var s = txtProjCoordinateOffset.Text; - if (string.IsNullOrWhiteSpace(s)) - { - txtProjCoordinateOffset.Text = @"0,0,0"; - } - else if (TryParseOffsets(s, out var offsets) == false) - { - e.Cancel = true; - errorProvider1.SetError(btnProjCoordinateOffsetSave, GeoStrings.InvalidData); - } - } - private void txtProjDefinition_Enter(object sender, EventArgs e) { txtProjDefinition.ForeColor = SystemColors.WindowText; @@ -637,61 +780,6 @@ private void txtProjDefinition_DoubleClick(object sender, EventArgs e) } } - private void txtProjDefinition_Validating(object sender, System.ComponentModel.CancelEventArgs e) - { - var s = txtProjDefinition.Text; - if (_Host.CheckProjDefinition(s, out _) == false) - { - txtProjDefinition.ForeColor = Color.Red; - errorProvider1.SetError(txtProjDefinition, GeoStrings.InvalidProjectDefinition); - } - else - { - txtProjDefinition.ForeColor = Color.Green; - errorProvider1.SetError(txtProjDefinition, null); - } - } - - private void txtLocalLatitude_Validating(object sender, System.ComponentModel.CancelEventArgs e) - { - TryParseLatitude(txtLocalLatitude, out _); - } - - private void txtLocalLongitude_Validating(object sender, System.ComponentModel.CancelEventArgs e) - { - TryParseLongitude(txtLocalLongitude, out _); - } - - private void txtLocalHeight_Validating(object sender, System.ComponentModel.CancelEventArgs e) - { - TryParseHeight(txtLocalHeight, out _); - } - - private void txtLocalRotation_Validating(object sender, System.ComponentModel.CancelEventArgs e) - { - TryParseRotation(txtLocalRotation, out _); - } - - private void txtEnuLatitude_Validating(object sender, System.ComponentModel.CancelEventArgs e) - { - TryParseLatitude(txtEnuLatitude, out _); - } - - private void txtEnuLongitude_Validating(object sender, System.ComponentModel.CancelEventArgs e) - { - TryParseLongitude(txtEnuLongitude, out _); - } - - private void txtEnuHeight_Validating(object sender, System.ComponentModel.CancelEventArgs e) - { - TryParseHeight(txtEnuHeight, out _); - } - - private void txtEnuRotation_Validating(object sender, System.ComponentModel.CancelEventArgs e) - { - TryParseRotation(txtEnuRotation, out _); - } - private bool TryParseLatitude(TextBox text, out double n) { return TryParse(text, -90.0, 90.0, GeoStrings.ErrorMessageLatitude, out n); @@ -712,6 +800,11 @@ private bool TryParseRotation(TextBox text, out double n) return TryParse(text, -360.0, 360.0, GeoStrings.ErrorMessageRotation, out n); } + private bool TryParseNumber(TextBox text, out double n) + { + return TryParse(text, double.MinValue, double.MaxValue, GeoStrings.ErrorMessageNumber, out n); + } + private bool TryParse(TextBox text, double min, double max, string errorInfo, out double n) { errorProvider1.SetError(text, null); @@ -730,6 +823,14 @@ private bool TryParse(TextBox text, double min, double max, string errorInfo, ou private bool UseProjFile(string projFilePath) { + if (string.Compare(Path.GetExtension(projFilePath), @".xml", StringComparison.OrdinalIgnoreCase) == 0 && + MetadataXml.TryParse(projFilePath, out var meta) && + meta.TryGetProj(_Host, out var proj)) + { + UseMetadataXmlProj(proj); + return true; + } + var projDefinition = _Host.GetProjDefinition(projFilePath); if (string.IsNullOrWhiteSpace(projDefinition) == false) { @@ -747,6 +848,34 @@ private bool UseProjFile(string projFilePath) return false; } + private void UseMetadataXmlProj(MetadataXmlProj metaProj) + { + txtProjCoordinateOffset.Text = metaProj.SrsOrigin == null + ? @"0,0,0" + : string.Join(@",", metaProj.SrsOrigin); + txtProjDefinition.Text = metaProj.Srs; + + cbProjDefinition.SelectedIndex = 0; //ProjSourceType.Custom + cbProjElevation.SelectedIndex = 0; //ProjElevationType.Default + } + + private bool CheckProjFile(string projFilePath) + { + if (string.Compare(Path.GetExtension(projFilePath), @".xml", StringComparison.OrdinalIgnoreCase) == 0 && + MetadataXml.TryParse(projFilePath, out _)) + { + return true; + } + + var projDefinition = _Host.GetProjDefinition(projFilePath); + if (string.IsNullOrWhiteSpace(projDefinition) == false) + { + return true; + } + + return false; + } + private bool TryParseOffsets(string s, out double[] offsets) { var values = s.Split(new[] { ',', '/', ';', ' ' }, StringSplitOptions.RemoveEmptyEntries); @@ -794,6 +923,31 @@ private void btnCancel_Click(object sender, EventArgs e) Close(); } + private void cbEnuAlignOriginToSitePlaneCenter_CheckedChanged(object sender, EventArgs e) + { + if (cbEnuAlignOriginToSitePlaneCenter.Checked) + { + txtEnuModelOriginN.Text = GeoStrings.Auto; + txtEnuModelOriginE.Text = GeoStrings.Auto; + txtEnuModelOriginH.Text = GetDoubleString(0, 10); + + txtEnuModelOriginN.ReadOnly = true; + txtEnuModelOriginE.ReadOnly = true; + txtEnuModelOriginH.ReadOnly = true; + } + else + { + var modelOrigin = _DefaultModelOrigin ?? new double[] { 0, 0, 0 }; + txtEnuModelOriginN.Text = GetDoubleString(modelOrigin[1], 10); + txtEnuModelOriginE.Text = GetDoubleString(modelOrigin[0], 10); + txtEnuModelOriginH.Text = GetDoubleString(modelOrigin[2], 10); + + txtEnuModelOriginN.ReadOnly = false; + txtEnuModelOriginE.ReadOnly = false; + txtEnuModelOriginH.ReadOnly = false; + } + } + private void cbEnuUseProjectLocation_CheckedChanged(object sender, EventArgs e) { if (cbEnuUseProjectLocation.Checked) @@ -814,6 +968,31 @@ private void cbEnuUseProjectLocation_CheckedChanged(object sender, EventArgs e) txtEnuRotation.ReadOnly = cbEnuUseProjectLocation.Checked; } + private void cbLocalAlignOriginToSitePlaneCenter_CheckedChanged(object sender, EventArgs e) + { + if (cbLocalAlignOriginToSitePlaneCenter.Checked) + { + txtLocalModelOriginN.Text = GeoStrings.Auto; + txtLocalModelOriginE.Text = GeoStrings.Auto; + txtLocalModelOriginH.Text = GetDoubleString(0, 10); + + txtLocalModelOriginN.ReadOnly = true; + txtLocalModelOriginE.ReadOnly = true; + txtLocalModelOriginH.ReadOnly = true; + } + else + { + var modelOrigin = _DefaultModelOrigin ?? new double[] { 0, 0, 0 }; + txtLocalModelOriginN.Text = GetDoubleString(modelOrigin[1], 10); + txtLocalModelOriginE.Text = GetDoubleString(modelOrigin[0], 10); + txtLocalModelOriginH.Text = GetDoubleString(modelOrigin[2], 10); + + txtLocalModelOriginN.ReadOnly = false; + txtLocalModelOriginE.ReadOnly = false; + txtLocalModelOriginH.ReadOnly = false; + } + } + private void cbLocalUseProjectLocation_CheckedChanged(object sender, EventArgs e) { if (cbLocalUseProjectLocation.Checked) diff --git a/Bimangle.ForgeEngine.Georeferncing/FormGeoreferncing.resx b/Bimangle.ForgeEngine.Georeferncing/FormGeoreferncing.resx index 3c8c61c..f1459b5 100644 --- a/Bimangle.ForgeEngine.Georeferncing/FormGeoreferncing.resx +++ b/Bimangle.ForgeEngine.Georeferncing/FormGeoreferncing.resx @@ -117,1616 +117,2015 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPageLocal + + + Top, Bottom, Left, Right - - 7 + + FlatButtons - - - 7 + + Top, Bottom, Left, Right - - 385, 20 - - - 12, 12 - - + 21, 67 - - - Top, Left, Right + + + True - - 4 + + Vertical - - MiddleRight + + 401, 213 - - MiddleRight + + 2 - - 75, 32 + + txtAutoSummary - - + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPageEnu + + tabPageAuto - + 0 - - 387, 20 - - - txtProjDefinition + + Top, Left, Right - - 69, 21 + + 20, 40 - - 2 + + 402, 20 - - NoControl + + 1 - - + + cbAutoOriginLocation - - MiddleRight + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPageAuto - - tabPageProj + + 1 - - Use Site Location + + Top, Left, Right - - MiddleRight + + NoControl - - MiddleRight + + 20, 17 - - 11 + + 369, 20 - + 0 - - - - - tabPageEnu + + Model Coordinate System: - - + + MiddleLeft - - 327, 149 + + lblAutoOriginLocation - - Top, Left, Right + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + tabPageAuto - - MiddleRight + + 2 - - 0 + + 4, 25 - - ENU + + 3, 3, 3, 3 - - + + 453, 320 - - 4 + + 0 - - 3 + + Auto - + tabPageAuto - - Bottom, Right + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + tabMain - - MiddleRight + + 0 - - tabPageEnu + + Top, Right - - MiddleRight + + Disable - - 98, 176 + + 326, 90 - - cbEnuUseProjectLocation + + 96, 21 - - &Reset + + 8 - - tabMain + + 0 - - MiddleLeft + + 17, 17 + + + metre - - 73, 21 + + txtEnuModelOriginH - - + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 252, 122 + + tabPageEnu - - + + 0 - - + + Top, Right - - txtProjCoordinateOffset + + NoControl - - btnProjCoordinateOffsetSave + + 247, 90 - - 19, 122 + + 73, 21 - - lblEnuRotation + + 7 - - 12 + + H(Z): - - Height: + + MiddleRight - - Latitude: + + lblEnuModelOriginH - - 0 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabMain + + tabPageEnu - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - 0 + + Top, Left, Right - - MiddleRight + + Disable - - 14 + + 97, 114 - - 6 + + 144, 21 - - 355, 87 + + 6 - - tabPageProj + + 0 - - tabPageLocal + + metre - - toolTip1 + + txtEnuModelOriginE - - Degree, range: -360.0 to 360.0 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Disable + + tabPageEnu - - Disable + + 2 - - + + NoControl - - 11 + + 8, 114 - - 2 + + 83, 21 - - 1 + + 5 - - 0 + + E(X): - + MiddleRight - - 0 + + lblEnuModelOriginE - - Top, Left, Right + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPageEnu - - + + 3 - - metre + + NoControl - - 12345678.12 + + 6, 90 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 85, 21 - - + + 3 - - 37.9118094000 + + N(Y): - - lblEnuHeight + + MiddleRight - - 0 + + lblEnuModelOriginN - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + tabPageEnu - - 4, 25 + + 4 - - 2 + + Top, Left, Right - - MiddleRight + + Disable - - 21, 67 + + 97, 90 - - Origin Location: + + 144, 21 + + + 4 - + 0 - - tabPageLocal + + metre - + + txtEnuModelOriginN + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPageEnu - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 5 - - 2 + + Top, Left, Right - - 0 + + NoControl - - 51, 21 + + 20, 69 - - cbProjElevation + + 369, 20 - - 144, 21 + + 2 - - + + Origin Model Coordinate (unit: metre): - - 385, 20 + + MiddleLeft - - Top, Left, Right + + lblEnuModelOriginCoordinate - - 385, 20 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MiddleLeft + + tabPageEnu - - 5 + + 6 - - 11 + + True - - 20, 161 + + NoControl - - 19, 17 + + 98, 291 - - metre + + 258, 16 - - MiddleRight + + 21 - - tabPageProj + + Automatic alignment to ground curvature - - MiddleRight + + cbEnuAutoAlignToGround - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPageProj + + tabPageEnu + + + 7 Top, Left, Right - - 3 + + NoControl - - 1 + + 20, 268 - - Degree, range: -360.0 to 360.0 + + 370, 20 - - MiddleRight + + 20 - - tabPageLocal + + Advanced Options: - - tabPageProj + + MiddleLeft - - System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + lblEnuAdvanced - - Rotation: + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Latitude: + + tabPageEnu - - + + 8 - - tabMain + + Top, Left, Right - - + + 97, 141 - - 3 + + 314, 20 - - 75, 32 + + 9 - - MiddleRight + + Use the center of the site plan - - tabPageEnu + + cbEnuAlignOriginToSitePlaneCenter - - 453, 320 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Top, Left, Right + + tabPageEnu - - 0 + + 9 - - 71, 21 + + True - - Prj File|*.prj;*.txt|All File|*.* + + 97, 243 - - 0 + + 252, 16 - - MiddleLeft + + 19 - - 19, 17 + + Use the default coordinate of the site - - + + cbEnuUseProjectLocation - - MiddleRight + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + tabPageEnu - + 10 - - txtEnuLongitude - - - Automatic alignment to ground curvature - - - errorProvider1 - - - + + Top, Right - - MiddleLeft + + Disable - - + + 326, 216 - - 3 + + 96, 21 - - Top, Left, Right + + 18 - - 3 + + 0 - - Disable + + Degree, range: -360.0 to 360.0 txtEnuRotation - - 385, 20 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + tabPageEnu - - + + 11 - - 387, 20 + + Top, Right - - 4 + + NoControl - - Height: + + 249, 216 - - + + 71, 21 - - CenterParent + + 17 - - 3, 3, 3, 3 + + Rotation: - - 4, 25 + + MiddleRight - - + + lblEnuRotation - - 385, 20 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + tabPageEnu - - + + 12 - - 9 + + Top, Right - - Align origin to site plane center + + Disable - - 4 + + 326, 189 - - 2 + + 96, 21 - - Top, Left, Right + + 16 - - 6, 12 + + 0 - - Top, Left, Right + + metre - + + txtEnuHeight + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPageEnu - - 19, 122 + + 13 - - MiddleRight + + Top, Right - - lblLocalLongitude + + NoControl - - lblLocalLatitude + + 251, 189 - - tabPageProj + + 69, 21 - - 2 + + 15 + + + Height: - + MiddleRight - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + lblEnuHeight - - NoControl + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Projected Elevation: + + tabPageEnu - - lblEnuLongitude + + 14 - - NoControl + + Top, Left, Right - - 12 + + Disable - - NoControl + + 97, 216 - - 2 + + 144, 21 - - Local + + 14 - - + + 115.3864691 - + Degree, range: -180.0 to 180.0 - - - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + txtEnuLongitude - + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPageEnu - - 10 + + 15 - - Save offset data as model's default offset + + NoControl - - MiddleRight + + 6, 216 - - + + 85, 21 - - Georeferncing + + 13 - - tabPageEnu + + Longitude: - + MiddleRight - - Top, Left, Right + + lblEnuLongitude - - tabPageAuto + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + tabPageEnu - - 327, 149 + + 16 - - + + Top, Left, Right - - tabPageLocal + + Disable - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 97, 189 - - Top, Right + + 144, 21 - - MiddleRight + + 12 - - lblProjElevation + + 37.9118094 - - + + Degree, range: -90.0 to 90.0 - - + + txtEnuLatitude - - MiddleRight + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPageEnu + + + 17 - - + + NoControl - - + + 6, 189 - - MiddleRight + + 85, 21 - - MiddleRight + + 11 - - 4 + + Latitude: - + MiddleRight - - 0 + + lblEnuLatitude - - 4, 25 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl + + tabPageEnu - - NoControl + + 18 - - txtEnuLatitude + + Top, Left, Right - + NoControl - - 0 - - - - - - cbEnuOriginLocation + + 20, 166 - - &Cancel + + 369, 20 - - 8 + + 10 - - + + Origin Geographic Coordinate: MiddleLeft - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + lblEnuOriginCoordinate - - tabPageLocal + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + tabPageEnu - - 385, 20 + + 19 - - 98, 149 + + Top, Left, Right - - NoControl + + 20, 40 - - + + 402, 20 - - 9 + + 1 - - 98, 122 + + cbEnuOriginLocation - - 8 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 7 + + tabPageEnu - - Projected Definition: + + 20 - - NoControl + + Top, Left, Right - - MiddleRight + + 20, 17 - - + + 369, 20 - - MiddleRight + + 0 - - + + Model Coordinate System: - - 144, 21 + + MiddleLeft - - 1 + + lblEnuOriginLocation - - System.Windows.Forms.ErrorProvider, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabPageEnu - - &OK - - - lblEnuLatitude - - - 1 + + 21 - - MiddleRight + + 4, 25 - - 269, 134 + + 3, 3, 3, 3 - - 331, 21 + + 453, 320 - - 0 + + 1 - - MiddleLeft + + ENU - - tabPageProj + + tabPageEnu - - 7 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + tabMain - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - cbAutoOriginLocation + + Top, Right - - 1 + + Disable - - 484, 411 + + 326, 90 - - 21, 212 + + 96, 21 - - MiddleRight + + 8 - + 0 - - - - - tabPageAuto + + metre - - Advanced Options: + + txtLocalModelOriginH - + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + tabPageLocal - - tabPageAuto + + 0 - - NoControl + + Top, Right - - MiddleRight + + NoControl - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 251, 90 - - + + 69, 21 - - 21, 185 + + 7 - - 11 + + H(Z): - - 0 + + MiddleRight - - cbEnuAlignOriginToSitePlaneCenter + + lblLocalModelOriginH - - + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 9 + + tabPageLocal - - 2 + + 1 - - MiddleRight + + Top, Left, Right - - 0 + + Disable - - Origin Coordinate: + + 97, 114 - - 9 + + 144, 21 - - lblEnuOriginLocation + + 6 - - 19, 207 + + 0 - - 98, 149 + + metre - - cbLocalOriginLocation + + txtLocalModelOriginE - - Save + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + tabPageLocal - - + + 2 - + NoControl - - 1 + + 5, 114 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 86, 21 - - 13 + + 5 - - MiddleRight + + E(X): - - Origin Location: + + MiddleRight - - 1 + + lblLocalModelOriginE - - 453, 320 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabPageLocal - - + + 3 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - + + 3, 90 - - 8 + + 88, 21 - - 2 + + 3 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + N(Y): - - 14 + + MiddleRight - - lblEnuAdvanced + + lblLocalModelOriginN - - + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Top, Bottom, Left, Right + + tabPageLocal - - Save + + 4 - - tabPageProj + + Top, Left, Right - + Disable - - 355, 185 - - - 0 - - - Top, Left, Right + + 97, 90 - - NoControl + + 144, 21 - - tabPageLocal + + 4 - - + + 0 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + metre - - + + txtLocalModelOriginN - - 12 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MiddleRight + + tabPageLocal - - + + 5 - - cbProjOriginLocation + + Top, Left, Right - - 453, 320 + + NoControl - - $this + + 20, 69 - - 0 + + 369, 20 - - 5 + + 2 - - 1 + + Origin Model Coordinate (unit: metre): - - + + MiddleLeft - - 0 + + lblLocalModelOriginCoordinate - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MiddleRight + + tabPageLocal - - 115.3864691000 + + 6 - - + + Top, Left, Right - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - + + 97, 141 - - tabPageEnu + + 314, 20 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 9 - - Top, Left, Right + + Use the center of the site plan - - + + cbLocalAlignOriginToSitePlaneCenter - - 10 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MiddleRight + + tabPageLocal - - 3 + + 7 - - btnOK + + True - + NoControl - - - - - 21, 69 - - - Use Site Location + + 97, 243 - - + + 252, 16 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 19 - - 0 + + Use the default coordinate of the site cbLocalUseProjectLocation - - 0 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + tabPageLocal - - 0 + + 8 - - txtLocalHeight - - - 0 - - - $this - - - 73, 21 - - - 387, 20 + + Top, Right Disable - - 3 - - - 6 + + 326, 216 - - 240, 20 + + 96, 21 - - + + 18 - - + + 0 - - 387, 20 + + Degree, range: -360.0 to 360.0 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + txtLocalRotation - - 250, 149 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 51, 22 + + tabPageLocal - - 2 + + 9 - - tabPageProj + + Top, Right - + NoControl - - MiddleLeft - - - 8 + + 249, 216 - - 98, 176 + + 71, 21 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17 - - Top, Bottom, Left, Right + + Rotation: - + MiddleRight - - Disable + + lblLocalRotation - - NoControl + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabPageLocal - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 10 - - NoControl + + Top, Right - - 19, 149 + + Disable - - 500, 450 + + 326, 189 - - lblLocalRotation + + 96, 21 - - tabPageEnu + + 16 - - MiddleLeft + + 0 - - MiddleRight + + metre - - btnReset + + txtLocalHeight - - + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - lblLocalOriginCoordinate + + tabPageLocal - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 11 - - 5 + + Top, Right - + NoControl - - MiddleRight + + 251, 189 - - Origin Default Coordinate: + + 69, 21 - - 0 + + 15 - - 144, 21 + + Height: - + MiddleRight - - 9 + + lblLocalHeight - - tabPageEnu + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + tabPageLocal - - tabPageEnu + + 12 - + + Top, Left, Right + + Disable - - MiddleRight + + 97, 216 - - 0 + + 144, 21 - - 8 + + 14 - - 21, 40 + + 115.3864691 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Degree, range: -180.0 to 180.0 - - 1 + + txtLocalLongitude - + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Save projected definition as model's projected definition - - - MiddleRight - - - 252, 122 + + tabPageLocal - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 13 - - + + NoControl - - tabMain + + 9, 216 - - 0 + + 82, 21 - - 0 + + 13 - - 0 + + Longitude: - - lblLocalOriginLocation + + MiddleRight - - 3 + + lblLocalLongitude - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MiddleRight + + tabPageLocal - - txtLocalLongitude + + 14 - - + + Top, Left, Right - - Align origin to site plane center + + Disable - - 4, 25 + + 97, 189 - - True + + 144, 21 - - 0 + + 12 - - 6 + + 37.9118094 - - True + + Degree, range: -90.0 to 90.0 - - + + txtLocalLatitude - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 + + tabPageLocal - - 11 + + 15 - - 327, 122 + + NoControl - - 137, 21 + + 7, 189 - - MiddleRight + + 84, 21 - - 0 + + 11 - + + Latitude: + + MiddleRight - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + lblLocalLatitude - - metre + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + tabPageLocal - - Top, Right + + 16 - + Top, Left, Right - - Projected + + NoControl - - tabPageLocal + + 20, 166 - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 369, 20 - - 2 + + 10 - - $this + + Origin Geographic Coordinate (default): - - + + MiddleLeft - - 73, 21 + + lblLocalOriginCoordinate - - Top, Bottom, Left, Right + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 386, 20 + + tabPageLocal - - True + + 17 - - txtLocalLatitude + + Top, Left, Right - - cbEnuAutoAlignToGround + + 20, 40 - - MiddleRight + + 402, 20 - - 11 + + 1 - + + cbLocalOriginLocation + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageLocal + + + 18 + + + Top, Left, Right + + NoControl - - MiddleRight + + 20, 17 - - 0 + + 391, 20 - + 0 - - 0 + + Model Coordinate System: - - 387, 20 + + MiddleLeft - + + lblLocalOriginLocation + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + tabPageLocal - - 96, 21 + + 19 - - + + 4, 25 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 453, 320 - - + + 2 - - 1 + + Local - - Disable + + tabPageLocal - - MiddleRight + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 126, 16 + + tabMain - - 21, 40 + + 2 - - 23, 135 + + Top, Right - - 461, 349 + + Disable - - 19, 17 + + 264, 134 - - + + 158, 21 - - Top, Left, Right + + 7 - + + metre + + + txtProjElevation + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + tabPageProj + + 0 - - 8 + + Top, Left, Right - + + 20, 135 + + + 238, 20 + + + 6 + + + cbProjElevation + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageProj + + + 1 + + Top, Left, Right - - 144, 21 + + NoControl - - MiddleRight + + 20, 112 - + + 370, 20 + + + 5 + + + Projected Elevation: + + MiddleLeft - - Disable + + lblProjElevation - - NoControl + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + tabPageProj - - 0 + + 2 - - + + Top, Right - - lblProjCoordinateOffset + + NoControl - - Degree, range: -90.0 to 90.0 + + 371, 185 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 51, 21 - - 0 + + 10 - - MiddleRight + + Save - - MiddleRight + + Save projected definition as model's projected definition - - 96, 21 + + btnProjDefinitionSave - - + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 258, 16 + + tabPageProj - - txtLocalRotation + + 3 - - - AAABAAcAAAAAAAEAIAAoIAQAdgAAAICAAAABACAAKAgBAJ4gBABAQAAAAQAgAChCAADGKAUAMDAAAAEA - IACoJQAA7moFACAgAAABACAAqBAAAJaQBQAYGAAAAQAgAIgJAAA+oQUAEBAAAAEAIABoBAAAxqoFACgA - AAAAAQAAAAIAAAEAIAAAAAAAACAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + + Top, Right + + + 371, 87 + + + 51, 22 + + + 4 + + + Save + + + Save offset data as model's default offset + + + btnProjCoordinateOffsetSave + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageProj + + + 4 + + + Top, Bottom, Left, Right + + + Disable + + + 20, 212 + + + True + + + Both + + + 402, 78 + + + 11 + + + txtProjDefinition + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageProj + + + 5 + + + Top, Left, Right + + + 20, 185 + + + 345, 20 + + + 9 + + + cbProjDefinition + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageProj + + + 6 + + + Top, Left, Right + + + Disable + + + 20, 87 + + + 345, 21 + + + 3 + + + format: x,y,z | dx,dy,dz,rx,ry,rz,k + + + txtProjCoordinateOffset + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageProj + + + 7 + + + Top, Left, Right + + + NoControl + + + 20, 69 + + + 391, 20 + + + 2 + + + Model Coordinate Offset(3 param.)/Transform(7 param.): + + + MiddleLeft + + + lblProjCoordinateOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageProj + + + 8 + + + Top, Left, Right + + + NoControl + + + 20, 161 + + + 370, 20 + + + 8 + + + Projected Definition: + + + MiddleLeft + + + lblProjDefinition + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageProj + + + 9 + + + Top, Left, Right + + + 20, 40 + + + 402, 20 + + + 1 + + + cbProjOriginLocation + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageProj + + + 10 + + + Top, Left, Right + + + NoControl + + + 20, 17 + + + 371, 20 + + + 0 + + + Model Coordinate System: + + + MiddleLeft + + + lblProjOriginLocation + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageProj + + + 11 + + + 4, 25 + + + 453, 320 + + + 3 + + + Projected + + + tabPageProj + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabMain + + + 3 + + + 12, 12 + + + 461, 349 + + + 0 + + + tabMain + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + Bottom, Left + + + 37, 367 + + + 75, 32 + + + 1 + + + &Reset + + + btnReset + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Bottom, Right + + + NoControl + + + 286, 367 + + + 75, 32 + + + 2 + + + &OK + + + btnOK + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Bottom, Right + + + NoControl + + + 366, 367 + + + 75, 32 + + + 3 + + + &Cancel + + + btnCancel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + 118, 17 + + + True + + + 6, 12 + + + 484, 411 + + + + AAABAAcAAAAAAAEAIAAoIAQAdgAAAICAAAABACAAKAgBAJ4gBABAQAAAAQAgAChCAADGKAUAMDAAAAEA + IACoJQAA7moFACAgAAABACAAqBAAAJaQBQAYGAAAAQAgAIgJAAA+oQUAEBAAAAEAIABoBAAAxqoFACgA + AAAAAQAAAAIAAAEAIAAAAAAAACAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -7868,581 +8267,107 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAP////////////////7gB//+g8H//h/4//4f/D/+H/8/+/APn/PgB4/zwAPP55AJ5+cS - SOfnAADn7yZk9+9mZvfvZmb37yZk9+cAAOfnAADn55JJ5/PAA8/x4AfP+fAP3/z/+H/8P/h//x/4f/+D - wX//4Ad/////////////////KAAAABgAAAAwAAAAAQAgAAAAAABgCQAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABQAAAEMAAAB1AAAAegAA - AHoAAAB1AAAAQgAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAeAAAAAgAAABuAAAAfwAAADwAAAAGAAAAAAAAAAAAAAAGAAAAPAAAAH4AAABtAAAACAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAigAAAJoAAAAqAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAjAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAGkAAABWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAwAAAIMAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAwAAAAAAAA - AAAAAAAAAAAAAAAAAD4AAAB9AAAAvgAAALkAAAB8AAAANwAAAAAAAAAAAAAAAAAAAAMAAACMAAAACAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG4AAAAdAAAAAAAAAAAAAAAIAAAAgwAAAEoAAABsAAAAfwAA - AHsAAABiAAAAUgAAAH4AAAAFAAAAAAAAAAAAAAAeAAAAbQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAA - AH4AAAAAAAAAAAAAAAAAAACFAAAAGQAAAC8AAABkAAAARAAAADUAAABwAAAAIwAAACEAAAB+AAAAAAAA - AAAAAAAAAAAAfgAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAQwAAADsAAAAAAAAAAAAAAEYAAABqAAAAKAAA - AJcAAAAsAAAAYgAAAFUAAAAwAAAAkwAAACgAAAB2AAAANwAAAAAAAAAAAAAAPAAAAEIAAAAAAAAAAAAA - AAAAAAAAAAAAdQAAAAYAAAAAAAAAAAAAAIMAAABRAAAAVwAAAKAAAABRAAAAgAAAAHYAAABRAAAApgAA - AFIAAABRAAAAfQAAAAAAAAAAAAAABgAAAHUAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAA - AHoAAAAAAAAAJQAAAFUAAAAAAAAARAAAADUAAAAAAAAAZQAAABUAAAAAAAAAegAAAAAAAAAAAAAAAAAA - AHoAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAHoAAAAAAAAAJwAAAFMAAAAAAAAARAAA - ADUAAAAAAAAAYwAAABcAAAAAAAAAegAAAAAAAAAAAAAAAAAAAHoAAAAAAAAAAAAAAAAAAAAAAAAAdQAA - AAYAAAAAAAAAAAAAAIIAAABFAAAATwAAAJYAAABFAAAAdwAAAGwAAABFAAAAngAAAEgAAABFAAAAfgAA - AAAAAAAAAAAABgAAAHUAAAAAAAAAAAAAAAAAAAAAAAAAQwAAADsAAAAAAAAAAAAAAEwAAABvAAAANAAA - AJ4AAAA0AAAAawAAAF8AAAA1AAAAnQAAADQAAAB7AAAAPAAAAAAAAAAAAAAAOwAAAEMAAAAAAAAAAAAA - AAAAAAAAAAAABQAAAH4AAAAAAAAAAAAAAAEAAACJAAAAEwAAAFAAAAA9AAAARAAAADUAAABKAAAAQgAA - ABoAAACCAAAAAAAAAAAAAAAAAAAAfgAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG0AAAAeAAAAAAAA - AAAAAAALAAAAiAAAAD8AAACLAAAAVAAAAEsAAACGAAAARgAAAIQAAAAHAAAAAAAAAAAAAAAdAAAAbgAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAACMAAAAAwAAAAAAAAAAAAAAAQAAAEsAAACOAAAAvQAA - ALwAAACJAAAAQwAAAAAAAAAAAAAAAAAAAAAAAAAwAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAkAAAAgwAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDAAAARwAA - ACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAIwAAAAeAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABLAAAAsAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAABtAAAAfgAAADsAAAAGAAAAAAAAAAAAAAAGAAAAOwAA - AH4AAABtAAAACAAAAHoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAABQAAAEMAAAB1AAAAegAAAHoAAAB1AAAAQgAAAAUAAAAAAAAAAAAAABMAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAP////////////////7gB//+g8H//h/4//4f/D/+H/8/+/APn/PgB4/zwAPP55AJ5+cS + SOfnAADn7yZk9+9mZvfvZmb37yZk9+cAAOfnAADn55JJ5/PAA8/x4AfP+fAP3/z/+H/8P/h//x/4f/+D + wX//4Ad/////////////////KAAAABgAAAAwAAAAAQAgAAAAAABgCQAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wD///8A+wD/APgYPwD4/x8A+P+PAOeBxwDmAGcAzgBzAMwA - MwDMADMA3SS7AN0kuwDMADMAzAAzAMwAcwDmAGcA4wHnAPH/HwD4/x8A/BgfAP8A3wD///8A////ACgA - AAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA - AAAAAAACAAAANgAAAFEAAABRAAAANgAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AFAAAABGAAAAVwAAAB0AAAAAAAAAAAAAAB0AAABWAAAARgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAA+AAAAawAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAABaAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAA4AAAAAAAAAAAAAAAUAAAAWAAAAKUAAACgAAAAWAAAABEAAAAAAAAAHAAAAEYAAAAAAAAAAAAA - AAAAAAACAAAAVgAAAAAAAAAWAAAAWgAAAEYAAABNAAAASQAAAEEAAABeAAAAEQAAAAAAAABWAAAAAgAA - AAAAAAAAAAAANwAAAB0AAAAAAAAAdQAAAFIAAACOAAAAcAAAAGkAAACOAAAAUwAAAHAAAAAAAAAAHQAA - ADYAAAAAAAAAAAAAAFEAAAAAAAAAAAAAAFIAAAATAAAAPgAAAC0AAAAjAAAASAAAAAoAAABSAAAAAAAA - AAAAAABRAAAAAAAAAAAAAABRAAAAAAAAAAAAAABSAAAAFQAAADwAAAAtAAAAIwAAAEYAAAALAAAAUgAA - AAAAAAAAAAAAUQAAAAAAAAAAAAAANgAAAB0AAAAAAAAAdQAAAFIAAACNAAAAcAAAAGkAAACNAAAAUgAA - AHEAAAAAAAAAHQAAADYAAAAAAAAAAAAAAAIAAABXAAAAAAAAABkAAABWAAAAVAAAADoAAAAzAAAAUQAA - AFsAAAATAAAAAAAAAFYAAAACAAAAAAAAAAAAAAAAAAAARgAAABwAAAAAAAAAGAAAAF0AAACmAAAAoQAA - AFsAAAAVAAAAAAAAAAAAAAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAABaAAAAHAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAFwAAAGYAAAArAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEYAAABXAAAAHQAA - AAAAAAAAAAAAHQAAAFYAAABGAAAAUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA - ADYAAABRAAAAUQAAADYAAAACAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAOgfAADhjwAA4+cAANgT - AACQCQAAkAkAALANAACwDQAAkAkAAJAJAADIGwAA58cAAPGHAAD4FwAA//8AAA== - - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - lblLocalHeight - - - lblAutoOriginLocation - - - FlatButtons - - - 385, 94 - - - Longitude: - - - Top, Left, Right - - - tabPageEnu - - - tabPageProj - - - - - - 0 - - - - - - 97, 21 - - - - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - Origin Location: - - - 13 - - - tabPageProj - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - btnCancel - - - txtEnuHeight - - - 286, 367 - - - 453, 320 - - - - - - tabPageLocal - - - 10 - - - 9 - - - cbProjDefinition - - - 0 - - - 71, 21 - - - 69, 21 - - - openFileDialog1 - - - 98, 230 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageLocal - - - tabPageProj - - - 0 - - - 385, 20 - - - - - - - - - 0 - - - NoControl - - - 0 - - - txtAutoSummary - - - 97, 21 - - - 385, 20 - - - 7 - - - Top, Right - - - 0 - - - 6 - - - - - - 0 - - - Vertical - - - 37, 367 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Top, Left, Right - - - 3, 3, 3, 3 - - - 0 - - - 12 - - - - - - True - - - Disable - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - btnProjDefinitionSave - - - - - - 21, 40 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Origin Location: - - - MiddleRight - - - Longitude: - - - 0 - - - 1 - - - MiddleRight - - - - - - 7 - - - tabPageEnu - - - 2 - - - - - - - - - - - - 5 - - - Rotation: - - - 5 - - - Auto - - - 4 - - - 0 - - - 331, 20 + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABQAAAEMAAAB1AAAAegAA + AHoAAAB1AAAAQgAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAeAAAAAgAAABuAAAAfwAAADwAAAAGAAAAAAAAAAAAAAAGAAAAPAAAAH4AAABtAAAACAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAigAAAJoAAAAqAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAjAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAGkAAABWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAwAAAIMAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAwAAAAAAAA + AAAAAAAAAAAAAAAAAD4AAAB9AAAAvgAAALkAAAB8AAAANwAAAAAAAAAAAAAAAAAAAAMAAACMAAAACAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG4AAAAdAAAAAAAAAAAAAAAIAAAAgwAAAEoAAABsAAAAfwAA + AHsAAABiAAAAUgAAAH4AAAAFAAAAAAAAAAAAAAAeAAAAbQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAA + AH4AAAAAAAAAAAAAAAAAAACFAAAAGQAAAC8AAABkAAAARAAAADUAAABwAAAAIwAAACEAAAB+AAAAAAAA + AAAAAAAAAAAAfgAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAQwAAADsAAAAAAAAAAAAAAEYAAABqAAAAKAAA + AJcAAAAsAAAAYgAAAFUAAAAwAAAAkwAAACgAAAB2AAAANwAAAAAAAAAAAAAAPAAAAEIAAAAAAAAAAAAA + AAAAAAAAAAAAdQAAAAYAAAAAAAAAAAAAAIMAAABRAAAAVwAAAKAAAABRAAAAgAAAAHYAAABRAAAApgAA + AFIAAABRAAAAfQAAAAAAAAAAAAAABgAAAHUAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAA + AHoAAAAAAAAAJQAAAFUAAAAAAAAARAAAADUAAAAAAAAAZQAAABUAAAAAAAAAegAAAAAAAAAAAAAAAAAA + AHoAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAHoAAAAAAAAAJwAAAFMAAAAAAAAARAAA + ADUAAAAAAAAAYwAAABcAAAAAAAAAegAAAAAAAAAAAAAAAAAAAHoAAAAAAAAAAAAAAAAAAAAAAAAAdQAA + AAYAAAAAAAAAAAAAAIIAAABFAAAATwAAAJYAAABFAAAAdwAAAGwAAABFAAAAngAAAEgAAABFAAAAfgAA + AAAAAAAAAAAABgAAAHUAAAAAAAAAAAAAAAAAAAAAAAAAQwAAADsAAAAAAAAAAAAAAEwAAABvAAAANAAA + AJ4AAAA0AAAAawAAAF8AAAA1AAAAnQAAADQAAAB7AAAAPAAAAAAAAAAAAAAAOwAAAEMAAAAAAAAAAAAA + AAAAAAAAAAAABQAAAH4AAAAAAAAAAAAAAAEAAACJAAAAEwAAAFAAAAA9AAAARAAAADUAAABKAAAAQgAA + ABoAAACCAAAAAAAAAAAAAAAAAAAAfgAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG0AAAAeAAAAAAAA + AAAAAAALAAAAiAAAAD8AAACLAAAAVAAAAEsAAACGAAAARgAAAIQAAAAHAAAAAAAAAAAAAAAdAAAAbgAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAACMAAAAAwAAAAAAAAAAAAAAAQAAAEsAAACOAAAAvQAA + ALwAAACJAAAAQwAAAAAAAAAAAAAAAAAAAAAAAAAwAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAkAAAAgwAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDAAAARwAA + ACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAIwAAAAeAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABLAAAAsAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAABtAAAAfgAAADsAAAAGAAAAAAAAAAAAAAAGAAAAOwAA + AH4AAABtAAAACAAAAHoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAABQAAAEMAAAB1AAAAegAAAHoAAAB1AAAAQgAAAAUAAAAAAAAAAAAAABMAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wD///8A+wD/APgYPwD4/x8A+P+PAOeBxwDmAGcAzgBzAMwA + MwDMADMA3SS7AN0kuwDMADMAzAAzAMwAcwDmAGcA4wHnAPH/HwD4/x8A/BgfAP8A3wD///8A////ACgA + AAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA + AAAAAAACAAAANgAAAFEAAABRAAAANgAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AFAAAABGAAAAVwAAAB0AAAAAAAAAAAAAAB0AAABWAAAARgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAA+AAAAawAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAABaAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAA4AAAAAAAAAAAAAAAUAAAAWAAAAKUAAACgAAAAWAAAABEAAAAAAAAAHAAAAEYAAAAAAAAAAAAA + AAAAAAACAAAAVgAAAAAAAAAWAAAAWgAAAEYAAABNAAAASQAAAEEAAABeAAAAEQAAAAAAAABWAAAAAgAA + AAAAAAAAAAAANwAAAB0AAAAAAAAAdQAAAFIAAACOAAAAcAAAAGkAAACOAAAAUwAAAHAAAAAAAAAAHQAA + ADYAAAAAAAAAAAAAAFEAAAAAAAAAAAAAAFIAAAATAAAAPgAAAC0AAAAjAAAASAAAAAoAAABSAAAAAAAA + AAAAAABRAAAAAAAAAAAAAABRAAAAAAAAAAAAAABSAAAAFQAAADwAAAAtAAAAIwAAAEYAAAALAAAAUgAA + AAAAAAAAAAAAUQAAAAAAAAAAAAAANgAAAB0AAAAAAAAAdQAAAFIAAACNAAAAcAAAAGkAAACNAAAAUgAA + AHEAAAAAAAAAHQAAADYAAAAAAAAAAAAAAAIAAABXAAAAAAAAABkAAABWAAAAVAAAADoAAAAzAAAAUQAA + AFsAAAATAAAAAAAAAFYAAAACAAAAAAAAAAAAAAAAAAAARgAAABwAAAAAAAAAGAAAAF0AAACmAAAAoQAA + AFsAAAAVAAAAAAAAAAAAAAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAABaAAAAHAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAFwAAAGYAAAArAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEYAAABXAAAAHQAA + AAAAAAAAAAAAHQAAAFYAAABGAAAAUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA + ADYAAABRAAAAUQAAADYAAAACAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAOgfAADhjwAA4+cAANgT + AACQCQAAkAkAALANAACwDQAAkAkAAJAJAADIGwAA58cAAPGHAAD4FwAA//8AAA== + - - 0 + + 500, 450 - - 5 + + CenterParent - - NoControl + + Georeferncing - - 21, 67 + + toolTip1 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 19, 99 + + errorProvider1 - - Degree, range: -90.0 to 90.0 + + System.Windows.Forms.ErrorProvider, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPageEnu + + openFileDialog1 - - tabPageEnu + + System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 FormGeoreferncing - - lblProjOriginLocation - - - tabPageLocal - - - Bottom, Right - - - tabPageLocal - - - 126, 16 - - - 250, 149 - - - lblProjDefinition - - - MiddleRight - - - 0 - - - Bottom, Left - - - cbLocalAlignOriginToSitePlaneCenter - - - NoControl - - - 21, 112 - - - 385, 218 - - - Coordinate Offset(3 param.)/Transform(7 param.): - - - tabMain - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - MiddleRight - - - 98, 122 - - - Disable - - - 10 - - - 6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - 21, 40 - - - 3 - - - MiddleRight - - - 0 - - - 21, 87 - - - - - - - - - 0 - - - 19, 17 - - - 10 - - - 387, 20 - - - 387, 20 - - - txtProjElevation - - - - - - 327, 122 - - - 73, 21 - - - 19, 99 - - - True - - - Top, Left, Right - - - tabPageProj - - - 75, 32 - - - - - - Top, Left, Right - - - MiddleLeft - - - NoControl - - - - - - 0 - - - - - - lblEnuOriginCoordinate - - - MiddleRight - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - MiddleRight - - - 0 - - - 3 - - - MiddleRight - - - Degree, range: -180.0 to 180.0 - - - 19, 149 - - - MiddleRight - - - - - - 366, 367 - - - - - - format: x,y,z | dx,dy,dz,rx,ry,rz,k + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - 255, 17 - - 118, 17 - - - 17, 17 - + + ProjCS File|*.prj;*.txt;*.xml|All File|*.* + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Georeferncing/FormGeoreferncing.zh-Hans.resx b/Bimangle.ForgeEngine.Georeferncing/FormGeoreferncing.zh-Hans.resx index 10a3c91..578e0a5 100644 --- a/Bimangle.ForgeEngine.Georeferncing/FormGeoreferncing.zh-Hans.resx +++ b/Bimangle.ForgeEngine.Georeferncing/FormGeoreferncing.zh-Hans.resx @@ -6343,44 +6343,44 @@ 地理配准 - - 383, 216 - - - 383, 20 - - - 385, 20 - - 原点位置选择: + 模型坐标系: 自动 - - 180, 16 + + 米 - - 自动将高程值对齐到地球曲率 + + 高 H(Z): + + + 米 + + + 东 E(X): + + + 北 N(Y): + + + 米 - - 385, 20 + + 站心模型坐标 (单位: 米): + + + 自动将输出的坐标高程值对齐到地球曲率 高级处理选项: - - 383, 20 - - 移动原点到场地平面中心 - - - 96, 16 + 使用场地平面中心点坐标 - 使用场地位置 + 使用场地默认地理坐标 角度值, 范围: -360.0 to 360.0 @@ -6406,35 +6406,41 @@ 纬度: - - 385, 20 - - 原点地理坐标: - - - 383, 20 - - - 385, 20 + 站心地理坐标: - 原点位置选择: + 模型坐标系: 站心坐标 - - 383, 20 + + 米 - - 移动原点到场地平面中心 + + 高 H(Z): + + + 米 - - 96, 16 + + 东 E(X): + + + 北 N(Y): + + + 米 + + + 站心模型坐标 (单位: 米): + + + 使用场地平面中心点坐标 - 使用场地位置 + 使用场地默认地理坐标 角度值, 范围: -360.0 to 360.0 @@ -6460,86 +6466,41 @@ 纬度: - - 385, 20 - - 原点默认坐标: - - - 383, 20 - - - 385, 20 + 站心地理坐标 (作为交互配准的默认值): - 原点位置选择: + 模型坐标系: 暂不配准 - - 267, 134 - 米 - - 238, 20 - - - 383, 20 - 投影高程基准: - - 353, 185 - 保存 保存当前的投影参考定义为当前模型的默认投影参考定义 - - 353, 87 - 保存 保存当前坐标偏移数据为当前模型的默认坐标偏移 - - 383, 92 - - - 329, 20 - - - 329, 21 - - - 383, 20 - 本地坐标偏移(3参数)/转换(7参数): - - 384, 20 - 投影参考定义: - - 383, 20 - - - 385, 20 - - 原点位置选择: + 模型坐标系: 投影坐标 diff --git a/Bimangle.ForgeEngine.Georeferncing/FormProjParamCalc.cs b/Bimangle.ForgeEngine.Georeferncing/FormProjParamCalc.cs index fd5b123..3ef840f 100644 --- a/Bimangle.ForgeEngine.Georeferncing/FormProjParamCalc.cs +++ b/Bimangle.ForgeEngine.Georeferncing/FormProjParamCalc.cs @@ -34,7 +34,7 @@ private void FormProjParamCalc_Load(object sender, EventArgs e) txtRefPointGeoLat.Text = _LastState?.RefPointGeoLat ?? string.Empty; txtRefPointGeoLon.Text = _LastState?.RefPointGeoLon ?? string.Empty; - _Host.Adapter.SetDirectionLetters(lblRefPointLocalX, lblRefPointLocalY); + _Host.Adapter.SetDirectionLetters(lblRefPointLocalX, lblRefPointLocalY, null); } private void FormProjParamCalc_FormClosed(object sender, FormClosedEventArgs e) diff --git a/Bimangle.ForgeEngine.Georeferncing/GeoStrings.Designer.cs b/Bimangle.ForgeEngine.Georeferncing/GeoStrings.Designer.cs index 9033181..d82858c 100644 --- a/Bimangle.ForgeEngine.Georeferncing/GeoStrings.Designer.cs +++ b/Bimangle.ForgeEngine.Georeferncing/GeoStrings.Designer.cs @@ -61,7 +61,7 @@ internal GeoStrings() { } /// - /// 查找类似 Align origin to site plane center 的本地化字符串。 + /// 查找类似 Use the center of the site plan 的本地化字符串。 /// internal static string AlignOriginToSitePlaneCenter { get { @@ -69,6 +69,15 @@ internal static string AlignOriginToSitePlaneCenter { } } + /// + /// 查找类似 (Auto) 的本地化字符串。 + /// + internal static string Auto { + get { + return ResourceManager.GetString("Auto", resourceCulture); + } + } + /// /// 查找类似 Automatic alignment to ground 的本地化字符串。 /// @@ -340,7 +349,7 @@ internal static string InvalidData { } /// - /// 查找类似 Invalid Projected Defintion 的本地化字符串。 + /// 查找类似 Invalid Projected Definition 的本地化字符串。 /// internal static string InvalidProjectDefinition { get { @@ -349,7 +358,7 @@ internal static string InvalidProjectDefinition { } /// - /// 查找类似 Origin Corrdinate 的本地化字符串。 + /// 查找类似 Origin Geographic Coordinate 的本地化字符串。 /// internal static string OriginCoordinate { get { @@ -358,7 +367,7 @@ internal static string OriginCoordinate { } /// - /// 查找类似 Origin Default Corrdinate 的本地化字符串。 + /// 查找类似 Origin Geographic Coordinate (Default) 的本地化字符串。 /// internal static string OriginDefaultCoordinate { get { @@ -367,7 +376,7 @@ internal static string OriginDefaultCoordinate { } /// - /// 查找类似 Origin Location 的本地化字符串。 + /// 查找类似 Coordinate System 的本地化字符串。 /// internal static string OriginLocation { get { @@ -375,6 +384,15 @@ internal static string OriginLocation { } } + /// + /// 查找类似 Origin Model Coordinate 的本地化字符串。 + /// + internal static string OriginModelCoordinate { + get { + return ResourceManager.GetString("OriginModelCoordinate", resourceCulture); + } + } + /// /// 查找类似 Automatic 的本地化字符串。 /// @@ -385,7 +403,16 @@ internal static string OriginTypeAuto { } /// - /// 查找类似 Internal Origin (Orient: Project North) 的本地化字符串。 + /// 查找类似 Default 的本地化字符串。 + /// + internal static string OriginTypeDefault { + get { + return ResourceManager.GetString("OriginTypeDefault", resourceCulture); + } + } + + /// + /// 查找类似 Internal (Orient: Project North) 的本地化字符串。 /// internal static string OriginTypeInternal { get { @@ -394,7 +421,7 @@ internal static string OriginTypeInternal { } /// - /// 查找类似 Project Base Point (Orient: Project North) 的本地化字符串。 + /// 查找类似 Project (Orient: Project North) 的本地化字符串。 /// internal static string OriginTypeProject { get { @@ -403,7 +430,7 @@ internal static string OriginTypeProject { } /// - /// 查找类似 Shared Coordinate Origin (Orient: True North) 的本地化字符串。 + /// 查找类似 Shared Coordinates (Orient: True North) 的本地化字符串。 /// internal static string OriginTypeShared { get { @@ -412,7 +439,7 @@ internal static string OriginTypeShared { } /// - /// 查找类似 Survey Point (Orient: True North) 的本地化字符串。 + /// 查找类似 Survey (Orient: True North) 的本地化字符串。 /// internal static string OriginTypeSurvey { get { @@ -536,5 +563,14 @@ internal static string UnitMetre { return ResourceManager.GetString("UnitMetre", resourceCulture); } } + + /// + /// 查找类似 Use the default coordinate of the site 的本地化字符串。 + /// + internal static string UseProjectLocation { + get { + return ResourceManager.GetString("UseProjectLocation", resourceCulture); + } + } } } diff --git a/Bimangle.ForgeEngine.Georeferncing/GeoStrings.resx b/Bimangle.ForgeEngine.Georeferncing/GeoStrings.resx index 81b14a6..6bb9d95 100644 --- a/Bimangle.ForgeEngine.Georeferncing/GeoStrings.resx +++ b/Bimangle.ForgeEngine.Georeferncing/GeoStrings.resx @@ -133,16 +133,16 @@ Automatic - Internal Origin (Orient: Project North) + Internal (Orient: Project North) - Project Base Point (Orient: Project North) + Project (Orient: Project North) - Shared Coordinate Origin (Orient: True North) + Shared Coordinates (Orient: True North) - Survey Point (Orient: True North) + Survey (Orient: True North) Project Default @@ -175,13 +175,13 @@ Projected - Origin Location + Coordinate System - Origin Default Corrdinate + Origin Geographic Coordinate (Default) - Origin Corrdinate + Origin Geographic Coordinate Definition Source @@ -196,10 +196,10 @@ Invalid Data - Invalid Projected Defintion + Invalid Projected Definition - Align origin to site plane center + Use the center of the site plan Really want to save the current coordinate offset as the model default? @@ -276,4 +276,16 @@ Default + + Default + + + (Auto) + + + Origin Model Coordinate + + + Use the default coordinate of the site + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Georeferncing/GeoStrings.zh-hans.resx b/Bimangle.ForgeEngine.Georeferncing/GeoStrings.zh-hans.resx index 1759fc9..2fdd833 100644 --- a/Bimangle.ForgeEngine.Georeferncing/GeoStrings.zh-hans.resx +++ b/Bimangle.ForgeEngine.Georeferncing/GeoStrings.zh-hans.resx @@ -24,19 +24,19 @@ 最新使用 - (方向: 项目北) 内部坐标原点 + (方向: 项目北) 内部坐标系 - (方向: 项目北) 项目基点 + (方向: 项目北) 项目坐标系 - (方向: 正北) 共享坐标原点 + (方向: 正北) 共享坐标系 - (方向: 正北) 测量点 + (方向: 正北) 测量坐标系 - 自动选择原点类型 + 自动 项目默认 @@ -69,13 +69,13 @@ 投影坐标 - 原点位置选择 + 模型坐标数据 - 原点默认坐标 + 站心地理坐标(默认) - 原点地理坐标 + 站心地理坐标 投影定义来源 @@ -93,7 +93,7 @@ 无效投影坐标系定义 - 自动移动原点到场地平面中心 + 使用场地平面中心点 确定要保存当前坐标偏移信息为模型默认吗? @@ -170,4 +170,16 @@ 默认 + + 默认坐标系 + + + (自动) + + + 站心模型坐标 + + + 使用场地默认地理坐标 + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Georeferncing/GeoreferncingHelper.cs b/Bimangle.ForgeEngine.Georeferncing/GeoreferncingHelper.cs index 455b25f..6bcbb0c 100644 --- a/Bimangle.ForgeEngine.Georeferncing/GeoreferncingHelper.cs +++ b/Bimangle.ForgeEngine.Georeferncing/GeoreferncingHelper.cs @@ -7,6 +7,7 @@ using Bimangle.ForgeEngine.Common.Georeferenced; using Bimangle.ForgeEngine.Common.Utils; using Bimangle.ForgeEngine.Georeferncing.Interface; +using Bimangle.ForgeEngine.Georeferncing.Utility; using Newtonsoft.Json; namespace Bimangle.ForgeEngine.Georeferncing @@ -87,6 +88,8 @@ public static string GetString(this ProjSourceType t) return GeoStrings.DefinitionSourceProjectFolder; case ProjSourceType.Recently: return GeoStrings.DefinitionSourceRecently; + case ProjSourceType.MetadataXml: + return MetadataXml.FILE_NAME; default: throw new ArgumentOutOfRangeException(nameof(t), t, null); } @@ -197,24 +200,72 @@ private static string GetDetails(this GeoreferencedSetting setting, bool sourceI case GeoreferencedMode.Local: { var p = setting.Local; - sb.AppendLine($@"{GeoStrings.OriginLocation}: {adapter.GetLocalString(p.Origin)}"); - sb.AppendLine($@"{GeoStrings.AlignOriginToSitePlaneCenter}: {p.AlignOriginToSitePlaneCenter}"); - sb.AppendLine($@"{GeoStrings.OriginDefaultCoordinate}: {GetDoubleString(p.Rotation, 10)}@{GetDoubleString(p.Latitude, 10)},{GetDoubleString(p.Longitude, 10)},{GetDoubleString(p.Height, 6)}z"); + if (adapter.IsRevit() || p.Origin != OriginType.Default) + { + sb.AppendLine($@"{GeoStrings.OriginLocation}: {adapter.GetLocalString(p.Origin)}"); + } + + if (p.AlignOriginToSitePlaneCenter) + { + sb.AppendLine($@"{GeoStrings.OriginModelCoordinate}: ({GeoStrings.AlignOriginToSitePlaneCenter})"); + } + else if(p.OriginOffset != null && p.OriginOffset.Length >= 3) + { + var n = p.OriginOffset; + sb.AppendLine($@"{GeoStrings.OriginModelCoordinate}: (N:{GetDoubleString(n[1], 10)}, E:{GetDoubleString(n[0], 10)}, H:{GetDoubleString(n[2], 10)})"); + } + + var siteString = $@"{GetDoubleString(p.Rotation, 10)}@{GetDoubleString(p.Latitude, 10)},{GetDoubleString(p.Longitude, 10)},{GetDoubleString(p.Height, 6)}z"; + if (p.UseProjectLocation) + { + sb.AppendLine($@"{GeoStrings.OriginCoordinate}: ({GeoStrings.UseProjectLocation}: {siteString})"); + } + else + { + sb.AppendLine($@"{GeoStrings.OriginCoordinate}: {siteString}"); + } + break; } case GeoreferencedMode.Enu: { var p = setting.Enu; - sb.AppendLine($@"{GeoStrings.OriginLocation}: {adapter.GetLocalString(p.Origin)}"); - sb.AppendLine($@"{GeoStrings.AlignOriginToSitePlaneCenter}: {p.AlignOriginToSitePlaneCenter}"); - sb.AppendLine($@"{GeoStrings.OriginCoordinate}: {GetDoubleString(p.Rotation, 10)}@{GetDoubleString(p.Latitude, 10)},{GetDoubleString(p.Longitude, 10)},{GetDoubleString(p.Height, 6)}z"); + if (adapter.IsRevit() || p.Origin != OriginType.Default) + { + sb.AppendLine($@"{GeoStrings.OriginLocation}: {adapter.GetLocalString(p.Origin)}"); + } + + if (p.AlignOriginToSitePlaneCenter) + { + sb.AppendLine($@"{GeoStrings.OriginModelCoordinate}: ({GeoStrings.AlignOriginToSitePlaneCenter})"); + } + else if (p.OriginOffset != null && p.OriginOffset.Length >= 3) + { + var n = p.OriginOffset; + sb.AppendLine($@"{GeoStrings.OriginModelCoordinate}: (N:{GetDoubleString(n[1], 10)}, E:{GetDoubleString(n[0], 10)}, H:{GetDoubleString(n[2], 10)})"); + } + + var siteString = $@"{GetDoubleString(p.Rotation, 10)}@{GetDoubleString(p.Latitude, 10)},{GetDoubleString(p.Longitude, 10)},{GetDoubleString(p.Height, 6)}z"; + if (p.UseProjectLocation) + { + sb.AppendLine($@"{GeoStrings.OriginCoordinate}: ({GeoStrings.UseProjectLocation}: {siteString})"); + } + else + { + sb.AppendLine($@"{GeoStrings.OriginCoordinate}: {siteString}"); + } + sb.AppendLine($@"{GeoStrings.AutoAlignToGround}: {p.UseAutoAlignToGround}"); break; } case GeoreferencedMode.Proj: { var p = setting.Proj; - sb.AppendLine($@"{GeoStrings.OriginLocation}: {adapter.GetLocalString(p.Origin)}"); + if (adapter.IsRevit() || p.Origin != OriginType.Default) + { + sb.AppendLine($@"{GeoStrings.OriginLocation}: {adapter.GetLocalString(p.Origin)}"); + } + sb.AppendLine($@"{GeoStrings.CoordinateOffset}: {GetOffsetsString(p.Offset)}"); if (p.ElevationType == ProjElevationType.Custom) @@ -250,7 +301,11 @@ public static string ToBase64(this GeoreferencedSetting setting) { if (setting == null) return null; - var json = JsonConvert.SerializeObject(setting, Formatting.None); + var options = new JsonSerializerSettings + { + NullValueHandling = NullValueHandling.Ignore, + }; + var json = JsonConvert.SerializeObject(setting, Formatting.None, options); return Convert.ToBase64String(Encoding.UTF8.GetBytes(json)); } diff --git a/Bimangle.ForgeEngine.Georeferncing/GeoreferncingHost.cs b/Bimangle.ForgeEngine.Georeferncing/GeoreferncingHost.cs index cd1ef28..324baf9 100644 --- a/Bimangle.ForgeEngine.Georeferncing/GeoreferncingHost.cs +++ b/Bimangle.ForgeEngine.Georeferncing/GeoreferncingHost.cs @@ -10,6 +10,7 @@ using Bimangle.ForgeEngine.Common.Types; using Bimangle.ForgeEngine.Common.Utils; using Bimangle.ForgeEngine.Georeferncing.Interface; +using Bimangle.ForgeEngine.Georeferncing.Utility; using Newtonsoft.Json.Linq; using Formatting = Newtonsoft.Json.Formatting; @@ -144,6 +145,16 @@ public IList GetProjSourceItems() } } + //加入项目文件夹下 metadata.xml 文件选项 + { + var sourceType = ProjSourceType.MetadataXml; + var metadataXml = GetDefaultMetadataXml(); + if (metadataXml != null) + { + items.Add(new ProjSourceItem(MetadataXml.FILE_NAME, sourceType, metadataXml.FilePath, null)); + } + } + //加入项目文件夹下 *.proj 文件选项 { var sourceType = ProjSourceType.ProjectFolder; @@ -243,6 +254,25 @@ public string GetDefaultProjFilePath() return Path.ChangeExtension(modelFilePath, @".prj"); } + private MetadataXml GetDefaultMetadataXml() + { + var modelFilePath = GetModelFilePath(); + if (string.IsNullOrWhiteSpace(modelFilePath)) return null; + + var modelFolderPath = Path.GetDirectoryName(modelFilePath); + if (string.IsNullOrWhiteSpace(modelFolderPath)) return null; + + var metadataXmlFilePath = Path.Combine(modelFolderPath, MetadataXml.FILE_NAME); + if (File.Exists(metadataXmlFilePath) == false) return null; + + if (MetadataXml.TryParse(metadataXmlFilePath, out var meta) == false) + { + return null; + } + + return meta; + } + public string GetDefaultOffsetFilePath() { var modelFilePath = GetModelFilePath(); @@ -380,6 +410,7 @@ public GeoreferencedSetting CreateDefaultSetting() setting.Enu = new ParameterEnu { Origin = internalOnly ? OriginType.Internal : OriginType.Project, + OriginOffset = null, AlignOriginToSitePlaneCenter = true, Latitude = site.Latitude, Longitude = site.Longitude, @@ -391,6 +422,7 @@ public GeoreferencedSetting CreateDefaultSetting() setting.Local = new ParameterLocal { Origin = internalOnly ? OriginType.Internal : OriginType.Project, + OriginOffset = null, AlignOriginToSitePlaneCenter = true, Latitude = site.Latitude, Longitude = site.Longitude, @@ -400,6 +432,50 @@ public GeoreferencedSetting CreateDefaultSetting() }; setting.Proj = CreateParameterProj(internalOnly); + // metadata.xml 优先级最高 + var metadataXml = GetDefaultMetadataXml(); + if (metadataXml != null) + { + if (metadataXml.Enu != null) + { + if (_Adapter.IsRevit() && internalOnly == false) + { + //对于 Revit 项目来说，如果使用了 metadata.xml, 则模型坐标系使用共享坐标系 + setting.Enu.Origin = OriginType.Shared; + setting.Local.Origin = OriginType.Shared; + } + + setting.Enu.AlignOriginToSitePlaneCenter = false; + setting.Enu.OriginOffset = metadataXml.Enu.SrsOrigin?.CloneArray(); + setting.Enu.UseProjectLocation = true; + setting.Enu.Latitude = metadataXml.Enu.EnuOrigin[0]; + setting.Enu.Longitude = metadataXml.Enu.EnuOrigin[1]; + setting.Enu.Height = metadataXml.Enu.EnuOrigin[2]; + setting.Enu.Rotation = 0.0; + + setting.Local.AlignOriginToSitePlaneCenter = false; + setting.Local.OriginOffset = metadataXml.Enu.SrsOrigin?.CloneArray(); + setting.Local.UseProjectLocation = true; + setting.Local.Latitude = metadataXml.Enu.EnuOrigin[0]; + setting.Local.Longitude = metadataXml.Enu.EnuOrigin[1]; + setting.Local.Height = metadataXml.Enu.EnuOrigin[2]; + setting.Local.Rotation = 0.0; + + setting.Mode = GeoreferencedMode.Enu; + } + + if (metadataXml.Proj != null) + { + setting.Proj.DefinitionSource = ProjSourceType.MetadataXml; + setting.Proj.DefinitionFileName = metadataXml.FilePath; + setting.Proj.Definition = metadataXml.Proj.Srs; + + setting.Proj.Offset = metadataXml.Proj.SrsOrigin?.CloneArray(); + + setting.Mode = GeoreferencedMode.Proj; + } + } + return setting; } @@ -420,7 +496,8 @@ public GeoreferencedSetting CreateTargetSetting(GeoreferencedSetting setting) if (s.Proj != null) { if (s.Proj.DefinitionSource == ProjSourceType.Embed || - s.Proj.DefinitionSource == ProjSourceType.Default) + s.Proj.DefinitionSource == ProjSourceType.Default || + s.Proj.DefinitionSource == ProjSourceType.MetadataXml) { var result = new GeoreferencedSetting(); result.Mode = GeoreferencedMode.Proj; @@ -435,15 +512,15 @@ public GeoreferencedSetting CreateTargetSetting(GeoreferencedSetting setting) } } - //按照 Local 模式返回 + //按照 ENU 模式返回 { var result = new GeoreferencedSetting(); - result.Mode = GeoreferencedMode.Local; - result.Local = s.Local.Clone(); + result.Mode = GeoreferencedMode.Enu; + result.Enu = s.Enu.Clone(); if (targetOriginType != OriginType.Auto) { - result.Local.Origin = targetOriginType; + result.Enu.Origin = targetOriginType; } return CreateSuitedSetting(result); @@ -496,7 +573,17 @@ public bool CheckInProjFile(string filePath) public SiteInfo GetModelSiteInfo() { - return _Adapter.GetSiteInfo() ?? GetDefaultSiteInfo(); + return GetDefaultMetadataXml()?.GetSiteInfo() ?? + _Adapter.GetSiteInfo() ?? + GetDefaultSiteInfo(); + } + + public double[] GetDefaultModelOrigin() + { + var metadataXml = GetDefaultMetadataXml(); + + return metadataXml?.Enu?.SrsOrigin?.CloneArray() ?? + new[] { 0.0, 0.0, 0.0 }; } public bool ShowPickPositionDialog() diff --git a/Bimangle.ForgeEngine.Georeferncing/IGeoreferncingHost.cs b/Bimangle.ForgeEngine.Georeferncing/IGeoreferncingHost.cs index 1222ba1..38ce617 100644 --- a/Bimangle.ForgeEngine.Georeferncing/IGeoreferncingHost.cs +++ b/Bimangle.ForgeEngine.Georeferncing/IGeoreferncingHost.cs @@ -120,6 +120,12 @@ public interface IGeoreferncingHost /// SiteInfo GetModelSiteInfo(); + /// + /// 获得默认站心模型坐标 + /// + /// + double[] GetDefaultModelOrigin(); + /// /// 显示拾取坐标对话框 /// diff --git a/Bimangle.ForgeEngine.Georeferncing/Interface/Adapter.cs b/Bimangle.ForgeEngine.Georeferncing/Interface/Adapter.cs index 98be527..45626bd 100644 --- a/Bimangle.ForgeEngine.Georeferncing/Interface/Adapter.cs +++ b/Bimangle.ForgeEngine.Georeferncing/Interface/Adapter.cs @@ -78,17 +78,29 @@ public virtual string GetEmbedProjDefinition() return null; } + /// + /// 当前平台是否是 Revit + /// + /// + public virtual bool IsRevit() + { + return false; + } + /// /// 当前模型是否为局部模型 /// /// public virtual bool IsLocal() { - var filePath = GetFilePath(); - if (string.IsNullOrWhiteSpace(filePath) == false) + if (IsRevit()) { - var ext = Path.GetExtension(filePath)?.ToLower(); - if (ext == @".rfa") return true; + var filePath = GetFilePath(); + if (string.IsNullOrWhiteSpace(filePath) == false) + { + var ext = Path.GetExtension(filePath)?.ToLower(); + if (ext == @".rfa") return true; + } } return false; } @@ -96,9 +108,10 @@ public virtual bool IsLocal() /// /// 修正本地坐标方向标签 /// - /// - /// - public virtual void SetDirectionLetters(Label lblLocalX, Label lblLocalY) + /// + /// + /// + public virtual void SetDirectionLetters(Label lblLocalE, Label lblLocalN, Label lblLocalH) { //do nothing } @@ -136,7 +149,7 @@ public virtual string GetLocalString(OriginType originType) case OriginType.Auto: return GeoStrings.OriginTypeAuto; case OriginType.Internal: - return GeoStrings.OriginTypeInternal; + return IsRevit() ? GeoStrings.OriginTypeInternal : GeoStrings.OriginTypeDefault; case OriginType.Project: return GeoStrings.OriginTypeProject; case OriginType.Shared: diff --git a/Bimangle.ForgeEngine.Georeferncing/Properties/AssemblyInfo.cs b/Bimangle.ForgeEngine.Georeferncing/Properties/AssemblyInfo.cs index 366a399..7d3ee5a 100644 --- a/Bimangle.ForgeEngine.Georeferncing/Properties/AssemblyInfo.cs +++ b/Bimangle.ForgeEngine.Georeferncing/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Bimangle.ForgeEngine.Georeferncing")] -[assembly: AssemblyCopyright("Copyright © BimAngle 2017-2023")] +[assembly: AssemblyCopyright("Copyright © BimAngle 2017-2024")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Bimangle.ForgeEngine.Georeferncing/Utility/ControlEventHandlers.cs b/Bimangle.ForgeEngine.Georeferncing/Utility/ControlEventHandlers.cs new file mode 100644 index 0000000..ef7c8db --- /dev/null +++ b/Bimangle.ForgeEngine.Georeferncing/Utility/ControlEventHandlers.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Bimangle.ForgeEngine.Georeferncing.Utility +{ + static class ControlEventHandlers + { + public static void OnValidating(this TextBox textBox, Func callback) + { + TextboxValidatingHandler.Bind(textBox, callback); + } + + public static void OnValidating(this TextBox textBox, Action callback) + { + TextboxValidatingHandler.Bind(textBox, callback); + } + + class TextboxValidatingHandler + { + public static void Bind(TextBox textBox, Func callback) + { + if (textBox == null) throw new ArgumentNullException(nameof(textBox)); + if (callback == null) throw new ArgumentNullException(nameof(callback)); + + var handler = new TextboxValidatingHandler(callback, null); + textBox.Validating += handler.TextBox_Validating; + } + + public static void Bind(TextBox textBox, Action callback) + { + if (textBox == null) throw new ArgumentNullException(nameof(textBox)); + if (callback == null) throw new ArgumentNullException(nameof(callback)); + + var handler = new TextboxValidatingHandler(null, callback); + textBox.Validating += handler.TextBox_Validating; + } + + private readonly Func _Callback1; + private readonly Action _Callback2; + + private TextboxValidatingHandler(Func callback1, Action callback2) + { + _Callback1 = callback1; + _Callback2 = callback2; + } + + private void TextBox_Validating(object sender, System.ComponentModel.CancelEventArgs e) + { + if (_Callback1 != null) + { + if (_Callback1(sender as TextBox) == false) + { + e.Cancel = true; + } + return; + } + + _Callback2?.Invoke(sender as TextBox); + } + } + + } +} diff --git a/Bimangle.ForgeEngine.Georeferncing/Utility/MetadataXml.cs b/Bimangle.ForgeEngine.Georeferncing/Utility/MetadataXml.cs new file mode 100644 index 0000000..dfce031 --- /dev/null +++ b/Bimangle.ForgeEngine.Georeferncing/Utility/MetadataXml.cs @@ -0,0 +1,233 @@ +using System; +using System.Diagnostics; +using System.IO; +using System.Xml; +using Bimangle.ForgeEngine.Common.Types; +using Bimangle.ForgeEngine.Common.Utils; + +namespace Bimangle.ForgeEngine.Georeferncing.Utility +{ + class MetadataXml + { + public const string FILE_NAME = @"metadata.xml"; + + private const string PREFIX_ENU = @"ENU:"; + private const string PREFIX_EPSG = @"EPSG:"; + + public static bool TryParse(string filePath, out MetadataXml meta) + { + meta = null; + + if (string.IsNullOrWhiteSpace(filePath)) return false; + if (File.Exists(filePath) == false) return false; + + try + { + var doc = new XmlDocument(); + doc.Load(filePath); + + //解析空间参考系统定义 + var srsXml = doc.SelectSingleNode(@"/ModelMetadata/SRS"); + var srs = srsXml?.InnerText?.Trim().ToWindowsFormat(); + if (srs == null || IsValidSrs(srs) == false) return false; + + //解析站心模型原点坐标 + var srsOriginXml = doc.SelectSingleNode(@"/ModelMetadata/SRSOrigin") ?? + doc.SelectSingleNode(@"/ModelMetadata/SRsorigin"); + var srsOriginString = srsOriginXml?.InnerText?.Trim(); + if (TryParseSrsOrigin(srsOriginString, out var srsOrigin) == false) + { + return false; + } + + MetadataXmlEnu enu; + MetadataXmlProj proj; + + if (srs.StartsWith(PREFIX_ENU, StringComparison.OrdinalIgnoreCase)) + { + if (TryParseEnuOrigin(srs, out var enuOrigin) == false) + { + //如果解析 ENU 站心地理坐标失败 + return false; + } + + enu = new MetadataXmlEnu(enuOrigin, srsOrigin); + proj = null; + } + else + { + enu = null; + proj = new MetadataXmlProj(srs, srsOrigin); + } + + meta = new MetadataXml(filePath, enu, proj); + return true; + } + catch (Exception ex) + { + Trace.WriteLine(ex.ToString()); + return false; + } + } + + private static bool IsValidSrs(string srs) + { + if (string.IsNullOrWhiteSpace(srs)) return false; + + var s = srs.Trim(); + if (s.StartsWith(PREFIX_ENU, StringComparison.OrdinalIgnoreCase) || + s.StartsWith(PREFIX_EPSG, StringComparison.OrdinalIgnoreCase) || + ProjFile.IsValidOgcWkt(s)) + { + return true; + } + + return false; + } + + /// + /// 解析 ENU 坐标 + /// + /// + /// + /// + private static bool TryParseEnuOrigin(string srs, out double[] result) + { + result = null; + + var s = srs.Substring(PREFIX_ENU.Length); + var items = s.Split(new[] { ',' }, StringSplitOptions.None); + if (items.Length < 2) return false; + + var values = new[] { 0.0, 0.0, 0.0 }; + for (var i = 0; i < items.Length; i++) + { + if (double.TryParse(items[i], out var n)) + { + values[i] = n; + } + else + { + return false; + } + } + + result = values; + return true; + } + + /// + /// 解析站心模型坐标 + /// + /// + /// + /// + private static bool TryParseSrsOrigin(string srsOrigin, out double[] result) + { + result = null; + + if (string.IsNullOrWhiteSpace(srsOrigin)) return false; + + var items = srsOrigin.Split(new[] { ',' }, StringSplitOptions.None); + if (items.Length < 2) return false; + + var values = new[] { 0.0, 0.0, 0.0 }; + for (var i = 0; i < items.Length; i++) + { + if (double.TryParse(items[i], out var n)) + { + values[i] = n; + } + else + { + return false; + } + } + + result = values; + return true; + } + + public string FilePath { get; } + public MetadataXmlEnu Enu { get; } + public MetadataXmlProj Proj { get; private set; } + + public MetadataXml(string filePath, MetadataXmlEnu enu, MetadataXmlProj proj) + { + FilePath = filePath; + Enu = enu; + Proj = proj; + } + + public bool TryGetProj(IGeoreferncingHost host, out MetadataXmlProj proj) + { + if (Proj == null) + { + //将 ENU 转换得到 PROJCS + var validator = host.GetProjValidator(); + var gcs = ProjBuilder.GeoGCS.GCS_China_Geodetic_Coordinate_System_2000; + var projDefinition = validator.CreateProj(gcs, null, Enu.SrsOrigin[0], Enu.SrsOrigin[1], Enu.EnuOrigin[1], Enu.EnuOrigin[0]); + if (projDefinition != null) + { + var srs = projDefinition.ToWKT(); + var srsOrigin = new[] { 0.0, 0.0, Enu.SrsOrigin[2] - Enu.EnuOrigin[2] }; + Proj = new MetadataXmlProj(srs, srsOrigin); + } + } + + proj = Proj; + return proj != null; + } + + public SiteInfo GetSiteInfo() + { + if (Enu == null) return null; + + return new SiteInfo + { + Latitude = Enu.EnuOrigin[0], + Longitude = Enu.EnuOrigin[1], + Height = Enu.EnuOrigin[2], + Rotation = 0.0 + }; + } + } + + class MetadataXmlEnu + { + /// + /// 站心地理坐标 (lat, long, [height]) + /// + public double[] EnuOrigin { get; } + + /// + /// 站心模型坐标（x,y,z) + /// + public double[] SrsOrigin { get; } + + public MetadataXmlEnu(double[] enuOrigin, double[] srsOrigin) + { + EnuOrigin = enuOrigin; + SrsOrigin = srsOrigin; + } + } + + class MetadataXmlProj + { + /// + /// 投影坐标参考系定义 + /// + public string Srs { get; } + + /// + /// 站心模型坐标（x,y,z) + /// + public double[] SrsOrigin { get; } + + public MetadataXmlProj(string srs, double[] srsOrigin) + { + Srs = srs; + SrsOrigin = srsOrigin; + } + } +} diff --git a/Bimangle.ForgeEngine.Georeferncing/Utility/ProjFile.cs b/Bimangle.ForgeEngine.Georeferncing/Utility/ProjFile.cs new file mode 100644 index 0000000..4a9ad6d --- /dev/null +++ b/Bimangle.ForgeEngine.Georeferncing/Utility/ProjFile.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Bimangle.ForgeEngine.Georeferncing.Utility +{ + class ProjFile + { + private const string PREFIX_PROJCS = @"PROJCS["; + private const string PREFIX_PROJCRS = @"PROJCRS["; + private const string PREFIX_COMPOUNDCRS = @"COMPOUNDCRS["; + + /// + /// 检查是否为有效的 OGC WKT/WKT2 定义格式 + /// + /// + /// + public static bool IsValidOgcWkt(string srs) + { + if (string.IsNullOrWhiteSpace(srs)) return false; + + var s = srs.Trim(); + if (s.StartsWith(PREFIX_PROJCS, StringComparison.OrdinalIgnoreCase) || + s.StartsWith(PREFIX_PROJCRS, StringComparison.OrdinalIgnoreCase) || + s.StartsWith(PREFIX_COMPOUNDCRS, StringComparison.OrdinalIgnoreCase)) + { + return true; + } + + return false; + } + } +} diff --git a/Bimangle.ForgeEngine.Georeferncing/packages.config b/Bimangle.ForgeEngine.Georeferncing/packages.config index 2e3fb73..ae74a1d 100644 --- a/Bimangle.ForgeEngine.Georeferncing/packages.config +++ b/Bimangle.ForgeEngine.Georeferncing/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2014.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2014.csproj index b1bdc0b..3f7ce1b 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2014.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2014.csproj @@ -52,17 +52,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2014\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2014.4.0.7\lib\net45\Bimangle.ForgeEngine.Nw2014.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2014.4.1.5\lib\net45\Bimangle.ForgeEngine.Nw2014.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2014.4.0.7\lib\net45\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2014.4.1.5\lib\net45\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2014.4.0.7\lib\net45\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2014.4.1.5\lib\net45\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2015.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2015.csproj index 46e6208..5832a89 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2015.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2015.csproj @@ -52,17 +52,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2015\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2015.4.0.7\lib\net45\Bimangle.ForgeEngine.Nw2015.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2015.4.1.5\lib\net45\Bimangle.ForgeEngine.Nw2015.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2015.4.0.7\lib\net45\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2015.4.1.5\lib\net45\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2015.4.0.7\lib\net45\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2015.4.1.5\lib\net45\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2016.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2016.csproj index 8dcc120..ae51e02 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2016.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2016.csproj @@ -52,17 +52,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2016\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2016.4.0.7\lib\net45\Bimangle.ForgeEngine.Nw2016.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2016.4.1.5\lib\net45\Bimangle.ForgeEngine.Nw2016.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2016.4.0.7\lib\net45\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2016.4.1.5\lib\net45\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2016.4.0.7\lib\net45\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2016.4.1.5\lib\net45\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2017.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2017.csproj index 158e763..bc390cc 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2017.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2017.csproj @@ -52,17 +52,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2017\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2017.4.0.7\lib\net452\Bimangle.ForgeEngine.Nw2017.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2017.4.1.5\lib\net452\Bimangle.ForgeEngine.Nw2017.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2017.4.0.7\lib\net452\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2017.4.1.5\lib\net452\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2017.4.0.7\lib\net452\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2017.4.1.5\lib\net452\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2018.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2018.csproj index c323910..a8288be 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2018.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2018.csproj @@ -52,17 +52,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2018\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2018.4.0.7\lib\net452\Bimangle.ForgeEngine.Nw2018.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2018.4.1.5\lib\net452\Bimangle.ForgeEngine.Nw2018.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2018.4.0.7\lib\net452\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2018.4.1.5\lib\net452\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2018.4.0.7\lib\net452\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2018.4.1.5\lib\net452\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2019.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2019.csproj index 2b4e67c..9c2f694 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2019.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2019.csproj @@ -53,17 +53,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2019\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2019.4.0.7\lib\net47\Bimangle.ForgeEngine.Nw2019.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2019.4.1.5\lib\net47\Bimangle.ForgeEngine.Nw2019.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2019.4.0.7\lib\net47\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2019.4.1.5\lib\net47\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2019.4.0.7\lib\net47\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2019.4.1.5\lib\net47\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2020.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2020.csproj index bf24d92..1d53600 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2020.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2020.csproj @@ -53,17 +53,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2020\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2020.4.0.7\lib\net47\Bimangle.ForgeEngine.Nw2020.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2020.4.1.5\lib\net47\Bimangle.ForgeEngine.Nw2020.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2020.4.0.7\lib\net47\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2020.4.1.5\lib\net47\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2020.4.0.7\lib\net47\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2020.4.1.5\lib\net47\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2021.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2021.csproj index f17f3c1..bd9e046 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2021.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2021.csproj @@ -53,17 +53,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2021\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2021.4.0.7\lib\net47\Bimangle.ForgeEngine.Nw2021.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2021.4.1.5\lib\net47\Bimangle.ForgeEngine.Nw2021.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2021.4.0.7\lib\net47\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2021.4.1.5\lib\net47\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2021.4.0.7\lib\net47\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2021.4.1.5\lib\net47\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2022.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2022.csproj index 695c01b..bea1fff 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2022.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2022.csproj @@ -53,17 +53,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2022\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2022.4.0.7\lib\net47\Bimangle.ForgeEngine.Nw2022.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2022.4.1.5\lib\net47\Bimangle.ForgeEngine.Nw2022.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2022.4.0.7\lib\net47\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2022.4.1.5\lib\net47\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2022.4.0.7\lib\net47\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2022.4.1.5\lib\net47\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2023.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2023.csproj index e4b08ee..f048a98 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2023.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2023.csproj @@ -50,17 +50,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2023\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2023.4.0.7\lib\net48\Bimangle.ForgeEngine.Nw2023.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2023.4.1.5\lib\net48\Bimangle.ForgeEngine.Nw2023.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2023.4.0.7\lib\net48\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2023.4.1.5\lib\net48\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2023.4.0.7\lib\net48\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2023.4.1.5\lib\net48\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2024.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2024.csproj index 31f34ab..fcceee2 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2024.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2024.csproj @@ -50,17 +50,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2024\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2024.4.0.7\lib\net48\Bimangle.ForgeEngine.Nw2024.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2024.4.1.5\lib\net48\Bimangle.ForgeEngine.Nw2024.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2024.4.0.7\lib\net48\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2024.4.1.5\lib\net48\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2024.4.0.7\lib\net48\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2024.4.1.5\lib\net48\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2025.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2025.csproj index b244ae6..2434b52 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2025.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2025.csproj @@ -49,17 +49,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2025\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2025.4.0.7\lib\net48\Bimangle.ForgeEngine.Nw2025.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2025.4.1.5\lib\net48\Bimangle.ForgeEngine.Nw2025.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2025.4.0.7\lib\net48\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2025.4.1.5\lib\net48\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2025.4.0.7\lib\net48\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2025.4.1.5\lib\net48\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Core/GeoreferncingAdapter.cs b/Bimangle.ForgeEngine.Navisworks/Core/GeoreferncingAdapter.cs index 56ceab6..f732ece 100644 --- a/Bimangle.ForgeEngine.Navisworks/Core/GeoreferncingAdapter.cs +++ b/Bimangle.ForgeEngine.Navisworks/Core/GeoreferncingAdapter.cs @@ -81,13 +81,14 @@ public override bool IsLocal() return true; } - public override void SetDirectionLetters(Label lblLocalX, Label lblLocalY) + public override void SetDirectionLetters(Label lblLocalE, Label lblLocalN, Label lblLocalH) { var doc = Autodesk.Navisworks.Api.Application.ActiveDocument; if (doc.Models.Count > 0) { - lblLocalX.SetDirectionLetter(doc.RightVector, @"X"); - lblLocalY.SetDirectionLetter(doc.FrontVector, @"Y"); + lblLocalE.SetDirectionLetter(doc.RightVector, @"X"); + lblLocalN.SetDirectionLetter(doc.FrontVector, @"Y"); + lblLocalH?.SetDirectionLetter(doc.UpVector, @"Z"); } } diff --git a/Bimangle.ForgeEngine.Navisworks/Core/ProjValidator.cs b/Bimangle.ForgeEngine.Navisworks/Core/ProjValidator.cs index 4949bad..c3fe6b9 100644 --- a/Bimangle.ForgeEngine.Navisworks/Core/ProjValidator.cs +++ b/Bimangle.ForgeEngine.Navisworks/Core/ProjValidator.cs @@ -74,7 +74,8 @@ public bool Check(string definition, out string wkt) using (proj) { var type = proj.GetProjType(); - if (type == ProjType.PROJECTED_CRS) + if (type == ProjType.PROJECTED_CRS || + type == ProjType.COMPOUND_CRS) { wkt = Context.AsWKT(proj); return true; diff --git a/Bimangle.ForgeEngine.Navisworks/Toolset/PickPosition/FormPickPosition.resx b/Bimangle.ForgeEngine.Navisworks/Toolset/PickPosition/FormPickPosition.resx index 7ba52c4..45fcf09 100644 --- a/Bimangle.ForgeEngine.Navisworks/Toolset/PickPosition/FormPickPosition.resx +++ b/Bimangle.ForgeEngine.Navisworks/Toolset/PickPosition/FormPickPosition.resx @@ -539,7 +539,7 @@ Top, Right - Origin: + Model CS: System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/Bimangle.ForgeEngine.Navisworks/Toolset/PickPosition/FormPickPosition.zh-Hans.resx b/Bimangle.ForgeEngine.Navisworks/Toolset/PickPosition/FormPickPosition.zh-Hans.resx index ba7cdd9..663f132 100644 --- a/Bimangle.ForgeEngine.Navisworks/Toolset/PickPosition/FormPickPosition.zh-Hans.resx +++ b/Bimangle.ForgeEngine.Navisworks/Toolset/PickPosition/FormPickPosition.zh-Hans.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 参考原点: + 模型坐标系: 北 N(Y): diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2014.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2014.config index 94a34fc..f3b9b6e 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2014.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2014.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2015.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2015.config index b16f903..fab641a 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2015.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2015.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2016.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2016.config index dd44bc9..dd88891 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2016.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2016.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2017.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2017.config index 5b32b1f..7c36417 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2017.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2017.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2018.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2018.config index 4d8547d..6f447cf 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2018.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2018.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2019.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2019.config index cd612fa..3249b35 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2019.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2019.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2020.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2020.config index bda94b0..1b40875 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2020.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2020.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2021.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2021.config index 4ad94d9..036bce7 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2021.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2021.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2022.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2022.config index 1bca5d8..923b00d 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2022.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2022.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2023.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2023.config index 5bb3a4f..c4c0447 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2023.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2023.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2024.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2024.config index c6dcd63..a536a04 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2024.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2024.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2025.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2025.config index b63f588..2f0aee0 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2025.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2025.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2014.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2014.csproj index 4f9c109..f12cbc1 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2014.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2014.csproj @@ -38,23 +38,23 @@ true - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2014.7.1.1\lib\net45\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2014.7.2.8\lib\net45\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2014.7.1.1\lib\net45\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2014.7.2.8\lib\net45\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2014.7.1.1\lib\net45\Bimangle.ForgeEngine.Revit2014.dll + + ..\packages\Bimangle.ForgeEngine.Revit2014.7.2.8\lib\net45\Bimangle.ForgeEngine.Revit2014.dll - - ..\packages\Bimangle.ForgeEngine.Revit2014.7.1.1\lib\net45\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2014.7.2.8\lib\net45\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2014.7.1.1\lib\net45\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2014.7.2.8\lib\net45\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2015.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2015.csproj index 2495980..4d8df98 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2015.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2015.csproj @@ -38,23 +38,23 @@ true - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2015.7.1.1\lib\net45\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2015.7.2.8\lib\net45\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2015.7.1.1\lib\net45\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2015.7.2.8\lib\net45\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2015.7.1.1\lib\net45\Bimangle.ForgeEngine.Revit2015.dll + + ..\packages\Bimangle.ForgeEngine.Revit2015.7.2.8\lib\net45\Bimangle.ForgeEngine.Revit2015.dll - - ..\packages\Bimangle.ForgeEngine.Revit2015.7.1.1\lib\net45\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2015.7.2.8\lib\net45\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2015.7.1.1\lib\net45\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2015.7.2.8\lib\net45\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2016.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2016.csproj index 30e20ea..d4811b2 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2016.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2016.csproj @@ -39,23 +39,23 @@ true - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2016.7.1.1\lib\net45\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2016.7.2.8\lib\net45\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2016.7.1.1\lib\net45\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2016.7.2.8\lib\net45\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2016.7.1.1\lib\net45\Bimangle.ForgeEngine.Revit2016.dll + + ..\packages\Bimangle.ForgeEngine.Revit2016.7.2.8\lib\net45\Bimangle.ForgeEngine.Revit2016.dll - - ..\packages\Bimangle.ForgeEngine.Revit2016.7.1.1\lib\net45\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2016.7.2.8\lib\net45\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2016.7.1.1\lib\net45\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2016.7.2.8\lib\net45\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2017.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2017.csproj index 4c6d0a8..131ded2 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2017.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2017.csproj @@ -38,23 +38,23 @@ true - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2017.7.1.1\lib\net452\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2017.7.2.8\lib\net452\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2017.7.1.1\lib\net452\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2017.7.2.8\lib\net452\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2017.7.1.1\lib\net452\Bimangle.ForgeEngine.Revit2017.dll + + ..\packages\Bimangle.ForgeEngine.Revit2017.7.2.8\lib\net452\Bimangle.ForgeEngine.Revit2017.dll - - ..\packages\Bimangle.ForgeEngine.Revit2017.7.1.1\lib\net452\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2017.7.2.8\lib\net452\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2017.7.1.1\lib\net452\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2017.7.2.8\lib\net452\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2018.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2018.csproj index 663759a..53b3b13 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2018.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2018.csproj @@ -37,23 +37,23 @@ true - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2018.7.1.1\lib\net452\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2018.7.2.8\lib\net452\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2018.7.1.1\lib\net452\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2018.7.2.8\lib\net452\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2018.7.1.1\lib\net452\Bimangle.ForgeEngine.Revit2018.dll + + ..\packages\Bimangle.ForgeEngine.Revit2018.7.2.8\lib\net452\Bimangle.ForgeEngine.Revit2018.dll - - ..\packages\Bimangle.ForgeEngine.Revit2018.7.1.1\lib\net452\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2018.7.2.8\lib\net452\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2018.7.1.1\lib\net452\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2018.7.2.8\lib\net452\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2019.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2019.csproj index 6246972..fd8ada8 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2019.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2019.csproj @@ -35,23 +35,23 @@ false - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2019.7.1.1\lib\net47\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2019.7.2.8\lib\net47\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2019.7.1.1\lib\net47\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2019.7.2.8\lib\net47\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2019.7.1.1\lib\net47\Bimangle.ForgeEngine.Revit2019.dll + + ..\packages\Bimangle.ForgeEngine.Revit2019.7.2.8\lib\net47\Bimangle.ForgeEngine.Revit2019.dll - - ..\packages\Bimangle.ForgeEngine.Revit2019.7.1.1\lib\net47\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2019.7.2.8\lib\net47\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2019.7.1.1\lib\net47\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2019.7.2.8\lib\net47\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2020.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2020.csproj index a66a3a4..333b99c 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2020.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2020.csproj @@ -35,23 +35,23 @@ false - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2020.7.1.1\lib\net47\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2020.7.2.8\lib\net47\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2020.7.1.1\lib\net47\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2020.7.2.8\lib\net47\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2020.7.1.1\lib\net47\Bimangle.ForgeEngine.Revit2020.dll + + ..\packages\Bimangle.ForgeEngine.Revit2020.7.2.8\lib\net47\Bimangle.ForgeEngine.Revit2020.dll - - ..\packages\Bimangle.ForgeEngine.Revit2020.7.1.1\lib\net47\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2020.7.2.8\lib\net47\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2020.7.1.1\lib\net47\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2020.7.2.8\lib\net47\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2021.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2021.csproj index 6928115..cc8ce24 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2021.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2021.csproj @@ -35,23 +35,23 @@ false - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2021.7.1.1\lib\net48\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2021.7.2.8\lib\net48\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2021.7.1.1\lib\net48\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2021.7.2.8\lib\net48\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2021.7.1.1\lib\net48\Bimangle.ForgeEngine.Revit2021.dll + + ..\packages\Bimangle.ForgeEngine.Revit2021.7.2.8\lib\net48\Bimangle.ForgeEngine.Revit2021.dll - - ..\packages\Bimangle.ForgeEngine.Revit2021.7.1.1\lib\net48\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2021.7.2.8\lib\net48\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2021.7.1.1\lib\net48\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2021.7.2.8\lib\net48\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2022.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2022.csproj index 4cf089d..062c628 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2022.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2022.csproj @@ -35,23 +35,23 @@ false - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2022.7.1.1\lib\net48\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2022.7.2.8\lib\net48\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2022.7.1.1\lib\net48\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2022.7.2.8\lib\net48\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2022.7.1.1\lib\net48\Bimangle.ForgeEngine.Revit2022.dll + + ..\packages\Bimangle.ForgeEngine.Revit2022.7.2.8\lib\net48\Bimangle.ForgeEngine.Revit2022.dll - - ..\packages\Bimangle.ForgeEngine.Revit2022.7.1.1\lib\net48\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2022.7.2.8\lib\net48\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2022.7.1.1\lib\net48\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2022.7.2.8\lib\net48\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2023.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2023.csproj index 149099b..ba5849c 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2023.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2023.csproj @@ -35,23 +35,23 @@ false - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2023.7.1.1\lib\net48\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2023.7.2.8\lib\net48\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2023.7.1.1\lib\net48\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2023.7.2.8\lib\net48\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2023.7.1.1\lib\net48\Bimangle.ForgeEngine.Revit2023.dll + + ..\packages\Bimangle.ForgeEngine.Revit2023.7.2.8\lib\net48\Bimangle.ForgeEngine.Revit2023.dll - - ..\packages\Bimangle.ForgeEngine.Revit2023.7.1.1\lib\net48\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2023.7.2.8\lib\net48\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2023.7.1.1\lib\net48\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2023.7.2.8\lib\net48\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2024.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2024.csproj index 01feb41..f1bfa9a 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2024.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2024.csproj @@ -35,23 +35,23 @@ false - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2024.7.1.1\lib\net48\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2024.7.2.8\lib\net48\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2024.7.1.1\lib\net48\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2024.7.2.8\lib\net48\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2024.7.1.1\lib\net48\Bimangle.ForgeEngine.Revit2024.dll + + ..\packages\Bimangle.ForgeEngine.Revit2024.7.2.8\lib\net48\Bimangle.ForgeEngine.Revit2024.dll - - ..\packages\Bimangle.ForgeEngine.Revit2024.7.1.1\lib\net48\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2024.7.2.8\lib\net48\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2024.7.1.1\lib\net48\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2024.7.2.8\lib\net48\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2025.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2025.csproj index 080604a..d8c7a46 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2025.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2025.csproj @@ -121,7 +121,7 @@ - + diff --git a/Bimangle.ForgeEngine.Revit/Core/GeoreferncingAdapter.cs b/Bimangle.ForgeEngine.Revit/Core/GeoreferncingAdapter.cs index 82f5ccf..2628771 100644 --- a/Bimangle.ForgeEngine.Revit/Core/GeoreferncingAdapter.cs +++ b/Bimangle.ForgeEngine.Revit/Core/GeoreferncingAdapter.cs @@ -103,6 +103,11 @@ public override string GetEmbedProjDefinition() return base.GetEmbedProjDefinition(); } + public override bool IsRevit() + { + return true; + } + public override bool IsLocal() { return _Document?.IsFamilyDocument ?? false; diff --git a/Bimangle.ForgeEngine.Revit/Core/ProjValidator.cs b/Bimangle.ForgeEngine.Revit/Core/ProjValidator.cs index db91e14..7fd9511 100644 --- a/Bimangle.ForgeEngine.Revit/Core/ProjValidator.cs +++ b/Bimangle.ForgeEngine.Revit/Core/ProjValidator.cs @@ -74,7 +74,8 @@ public bool Check(string definition, out string wkt) using (proj) { var type = proj.GetProjType(); - if (type == ProjType.PROJECTED_CRS) + if (type == ProjType.PROJECTED_CRS || + type == ProjType.COMPOUND_CRS) { wkt = Context.AsWKT(proj); return true; diff --git a/Bimangle.ForgeEngine.Revit/Toolset/PickPosition/FormPickPosition.cs b/Bimangle.ForgeEngine.Revit/Toolset/PickPosition/FormPickPosition.cs index 39abfd3..c6485b7 100644 --- a/Bimangle.ForgeEngine.Revit/Toolset/PickPosition/FormPickPosition.cs +++ b/Bimangle.ForgeEngine.Revit/Toolset/PickPosition/FormPickPosition.cs @@ -267,6 +267,10 @@ public void Execute(UIApplication app) { _Callback?.Invoke(null); } + catch (Autodesk.Revit.Exceptions.OperationCanceledException) + { + _Callback?.Invoke(null); + } catch (InvalidOperationException ex) { Debug.WriteLine(ex.ToString()); diff --git a/Bimangle.ForgeEngine.Revit/Toolset/PickPosition/FormPickPosition.resx b/Bimangle.ForgeEngine.Revit/Toolset/PickPosition/FormPickPosition.resx index be19a76..cfb8247 100644 --- a/Bimangle.ForgeEngine.Revit/Toolset/PickPosition/FormPickPosition.resx +++ b/Bimangle.ForgeEngine.Revit/Toolset/PickPosition/FormPickPosition.resx @@ -133,7 +133,7 @@ 0 - Origin: + Model CS: MiddleRight diff --git a/Bimangle.ForgeEngine.Revit/Toolset/PickPosition/FormPickPosition.zh-Hans.resx b/Bimangle.ForgeEngine.Revit/Toolset/PickPosition/FormPickPosition.zh-Hans.resx index ba7cdd9..663f132 100644 --- a/Bimangle.ForgeEngine.Revit/Toolset/PickPosition/FormPickPosition.zh-Hans.resx +++ b/Bimangle.ForgeEngine.Revit/Toolset/PickPosition/FormPickPosition.zh-Hans.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 参考原点: + 模型坐标系: 北 N(Y): diff --git a/Bimangle.ForgeEngine.Revit/obj-Bimangle.ForgeEngine.Revit_R2025/Bimangle.ForgeEngine.Revit_R2025.csproj.nuget.dgspec.json b/Bimangle.ForgeEngine.Revit/obj-Bimangle.ForgeEngine.Revit_R2025/Bimangle.ForgeEngine.Revit_R2025.csproj.nuget.dgspec.json index 0f8e81d..dc86c2d 100644 --- a/Bimangle.ForgeEngine.Revit/obj-Bimangle.ForgeEngine.Revit_R2025/Bimangle.ForgeEngine.Revit_R2025.csproj.nuget.dgspec.json +++ b/Bimangle.ForgeEngine.Revit/obj-Bimangle.ForgeEngine.Revit_R2025/Bimangle.ForgeEngine.Revit_R2025.csproj.nuget.dgspec.json @@ -75,7 +75,7 @@ "dependencies": { "Bimangle.ForgeEngine.Revit2025": { "target": "Package", - "version": "[7.1.1, )" + "version": "[7.2.8, )" }, "DotNetZip": { "target": "Package", @@ -109,7 +109,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.302/PortableRuntimeIdentifierGraph.json" } } } diff --git a/Bimangle.ForgeEngine.Revit/obj-Bimangle.ForgeEngine.Revit_R2025/Bimangle.ForgeEngine.Revit_R2025.csproj.nuget.g.props b/Bimangle.ForgeEngine.Revit/obj-Bimangle.ForgeEngine.Revit_R2025/Bimangle.ForgeEngine.Revit_R2025.csproj.nuget.g.props index 9e32c0d..926cea7 100644 --- a/Bimangle.ForgeEngine.Revit/obj-Bimangle.ForgeEngine.Revit_R2025/Bimangle.ForgeEngine.Revit_R2025.csproj.nuget.g.props +++ b/Bimangle.ForgeEngine.Revit/obj-Bimangle.ForgeEngine.Revit_R2025/Bimangle.ForgeEngine.Revit_R2025.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\kent\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 6.10.0 + 6.10.1 diff --git a/Bimangle.ForgeEngine.Revit/obj-Bimangle.ForgeEngine.Revit_R2025/project.assets.json b/Bimangle.ForgeEngine.Revit/obj-Bimangle.ForgeEngine.Revit_R2025/project.assets.json index e55da3b..f9fb8f9 100644 --- a/Bimangle.ForgeEngine.Revit/obj-Bimangle.ForgeEngine.Revit_R2025/project.assets.json +++ b/Bimangle.ForgeEngine.Revit/obj-Bimangle.ForgeEngine.Revit_R2025/project.assets.json @@ -2,7 +2,7 @@ "version": 3, "targets": { "net8.0-windows7.0": { - "Bimangle.ForgeEngine.Common/1.8.6": { + "Bimangle.ForgeEngine.Common/1.8.8": { "type": "package", "compile": { "lib/net45/Bimangle.ForgeEngine.Common.dll": {} @@ -11,10 +11,10 @@ "lib/net45/Bimangle.ForgeEngine.Common.dll": {} } }, - "Bimangle.ForgeEngine.Revit2025/7.1.1": { + "Bimangle.ForgeEngine.Revit2025/7.2.8": { "type": "package", "dependencies": { - "Bimangle.ForgeEngine.Common": "[1.8.6]", + "Bimangle.ForgeEngine.Common": "[1.8.8]", "DotNetZip": "1.16.0", "Newtonsoft.Json": "13.0.1" }, @@ -256,25 +256,25 @@ } }, "libraries": { - "Bimangle.ForgeEngine.Common/1.8.6": { - "sha512": "ZrrwNai64/X6B+MVACFX/k8GrCBmML1nkxdTYNINQXzMeVDmQStpuXmnyemCiyJ3ZrHkF5h8EhCll5CdseIjRQ==", + "Bimangle.ForgeEngine.Common/1.8.8": { + "sha512": "4L8PXi9v+wQPVsoyx+rMu7dS8zdJwTW5wzGfz+69BHTfNRrB9RAS65eMZSaWZN7l1bbgCdwCDkc0sC2zFt5WYw==", "type": "package", - "path": "bimangle.forgeengine.common/1.8.6", + "path": "bimangle.forgeengine.common/1.8.8", "files": [ ".nupkg.metadata", ".signature.p7s", - "bimangle.forgeengine.common.1.8.6.nupkg.sha512", + "bimangle.forgeengine.common.1.8.8.nupkg.sha512", "bimangle.forgeengine.common.nuspec", "lib/net45/Bimangle.ForgeEngine.Common.dll" ] }, - "Bimangle.ForgeEngine.Revit2025/7.1.1": { - "sha512": "RtvLNelDxIAl9kFXJDvfyOaBW/Ncfeq4h12xWs3aLnyKChQMTny82OuA10+49501ErIQhn5Na/45JJQymTPeog==", + "Bimangle.ForgeEngine.Revit2025/7.2.8": { + "sha512": "djEKo1S0vphwewgRkyiTYy/4VsMDMwRZkjX2IMNVANhC5s0c8ow9YDVUONN6eIsWYZszo0XpoBBTzog8VtTj6A==", "type": "package", - "path": "bimangle.forgeengine.revit2025/7.1.1", + "path": "bimangle.forgeengine.revit2025/7.2.8", "files": [ ".nupkg.metadata", - "bimangle.forgeengine.revit2025.7.1.1.nupkg.sha512", + "bimangle.forgeengine.revit2025.7.2.8.nupkg.sha512", "bimangle.forgeengine.revit2025.nuspec", "lib/net8.0/Bimangle.ForgeEngine.Dwf.Base.dll", "lib/net8.0/Bimangle.ForgeEngine.Dwf.Support.dll", @@ -699,7 +699,7 @@ "projectFileDependencyGroups": { "net8.0-windows7.0": [ "Bimangle.ForgeEngine.Georeferncing >= 1.0.0", - "Bimangle.ForgeEngine.Revit2025 >= 7.1.1", + "Bimangle.ForgeEngine.Revit2025 >= 7.2.8", "DotNetZip >= 1.16.0", "Microsoft.CSharp >= 4.7.0", "System.Data.DataSetExtensions >= 4.5.0" @@ -765,7 +765,7 @@ "dependencies": { "Bimangle.ForgeEngine.Revit2025": { "target": "Package", - "version": "[7.1.1, )" + "version": "[7.2.8, )" }, "DotNetZip": { "target": "Package", @@ -799,7 +799,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.302/PortableRuntimeIdentifierGraph.json" } } } diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2014.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2014.config index 7517b88..2fbbeaf 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2014.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2014.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2015.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2015.config index 5e4f441..9e0e126 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2015.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2015.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2016.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2016.config index f585153..9dd7fd7 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2016.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2016.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2017.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2017.config index 532e107..b4d7da1 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2017.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2017.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2018.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2018.config index 092a8a1..cf79d9e 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2018.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2018.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2019.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2019.config index bce0a60..cda8ec8 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2019.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2019.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2020.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2020.config index fb72dd4..00f230d 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2020.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2020.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2021.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2021.config index 62012cc..d14be77 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2021.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2021.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2022.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2022.config index 3271e0a..9333232 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2022.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2022.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2023.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2023.config index 4768720..28c1819 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2023.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2023.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2024.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2024.config index 811d84a..ef9a20f 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2024.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2024.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Skp/Bimangle.ForgeEngine.Skp.csproj b/Bimangle.ForgeEngine.Skp/Bimangle.ForgeEngine.Skp.csproj index bfc56ce..0fef2b2 100644 --- a/Bimangle.ForgeEngine.Skp/Bimangle.ForgeEngine.Skp.csproj +++ b/Bimangle.ForgeEngine.Skp/Bimangle.ForgeEngine.Skp.csproj @@ -68,17 +68,17 @@ - - ..\packages\Bimangle.ForgeEngine.Common.1.8.6\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.8\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Skp.1.5.8\lib\net452\Bimangle.ForgeEngine.Skp.dll + + ..\packages\Bimangle.ForgeEngine.Skp.1.6.2\lib\net452\Bimangle.ForgeEngine.Skp.dll - - ..\packages\Bimangle.ForgeEngine.Skp.1.5.8\lib\net452\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Skp.1.6.2\lib\net452\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Skp.1.5.8\lib\net452\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Skp.1.6.2\lib\net452\Bimangle.Libs.Proj.dll ..\packages\CommandLineParser.2.8.0\lib\net45\CommandLine.dll @@ -267,7 +267,7 @@ 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - + - + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Skp/Core/GeoreferncingAdapter.cs b/Bimangle.ForgeEngine.Skp/Core/GeoreferncingAdapter.cs index 2da9c9c..f665512 100644 --- a/Bimangle.ForgeEngine.Skp/Core/GeoreferncingAdapter.cs +++ b/Bimangle.ForgeEngine.Skp/Core/GeoreferncingAdapter.cs @@ -81,11 +81,6 @@ public override bool IsLocal() return true; } - public override void SetDirectionLetters(Label lblLocalX, Label lblLocalY) - { - //do nothing - } - public override bool IsTrueNorth(OriginType originType) { return true; diff --git a/Bimangle.ForgeEngine.Skp/Core/ProjValidator.cs b/Bimangle.ForgeEngine.Skp/Core/ProjValidator.cs index 3ddb0e3..626b184 100644 --- a/Bimangle.ForgeEngine.Skp/Core/ProjValidator.cs +++ b/Bimangle.ForgeEngine.Skp/Core/ProjValidator.cs @@ -74,7 +74,8 @@ public bool Check(string definition, out string wkt) using (proj) { var type = proj.GetProjType(); - if (type == ProjType.PROJECTED_CRS) + if (type == ProjType.PROJECTED_CRS || + type == ProjType.COMPOUND_CRS) { wkt = Context.AsWKT(proj); return true; diff --git a/Bimangle.ForgeEngine.Skp/packages.config b/Bimangle.ForgeEngine.Skp/packages.config index 20ffd8a..84200f7 100644 --- a/Bimangle.ForgeEngine.Skp/packages.config +++ b/Bimangle.ForgeEngine.Skp/packages.config @@ -1,7 +1,7 @@  - - + +