diff --git a/uBIM_EarthTools.sln b/uBIMEarthTools.sln similarity index 88% rename from uBIM_EarthTools.sln rename to uBIMEarthTools.sln index af00ed5..eb26e93 100644 --- a/uBIM_EarthTools.sln +++ b/uBIMEarthTools.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27703.2000 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "uBIM_EarthTools", "地质建模\uBIM_EarthTools.csproj", "{85A8FB17-CF6E-4D07-AD0D-F860C37B08F5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "uBIMEarthTools", "uBIMEarthTools\uBIMEarthTools.csproj", "{85A8FB17-CF6E-4D07-AD0D-F860C37B08F5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/地质建模/BasicCode.cs b/uBIMEarthTools/BasicCode.cs similarity index 100% rename from 地质建模/BasicCode.cs rename to uBIMEarthTools/BasicCode.cs diff --git a/地质建模/Class1 - 副本 (2).cs b/uBIMEarthTools/Class1 - 副本 (2).cs similarity index 100% rename from 地质建模/Class1 - 副本 (2).cs rename to uBIMEarthTools/Class1 - 副本 (2).cs diff --git a/地质建模/Class1 - 副本.cs b/uBIMEarthTools/Class1 - 副本.cs similarity index 100% rename from 地质建模/Class1 - 副本.cs rename to uBIMEarthTools/Class1 - 副本.cs diff --git a/地质建模/Comments/均不等.png b/uBIMEarthTools/Comments/均不等.png similarity index 100% rename from 地质建模/Comments/均不等.png rename to uBIMEarthTools/Comments/均不等.png diff --git a/地质建模/Comments/均等.png b/uBIMEarthTools/Comments/均等.png similarity index 100% rename from 地质建模/Comments/均等.png rename to uBIMEarthTools/Comments/均等.png diff --git a/地质建模/Comments/常规模型族.png b/uBIMEarthTools/Comments/常规模型族.png similarity index 100% rename from 地质建模/Comments/常规模型族.png rename to uBIMEarthTools/Comments/常规模型族.png diff --git a/地质建模/Comments/部分相等.png b/uBIMEarthTools/Comments/部分相等.png similarity index 100% rename from 地质建模/Comments/部分相等.png rename to uBIMEarthTools/Comments/部分相等.png diff --git a/地质建模/DWGDataExport.cs b/uBIMEarthTools/DWGDataExport.cs similarity index 100% rename from 地质建模/DWGDataExport.cs rename to uBIMEarthTools/DWGDataExport.cs diff --git a/地质建模/DataClass/Borehole.cs b/uBIMEarthTools/DataClass/Borehole.cs similarity index 100% rename from 地质建模/DataClass/Borehole.cs rename to uBIMEarthTools/DataClass/Borehole.cs diff --git a/地质建模/DataClass/GeologyBlock.cs b/uBIMEarthTools/DataClass/GeologyBlock.cs similarity index 100% rename from 地质建模/DataClass/GeologyBlock.cs rename to uBIMEarthTools/DataClass/GeologyBlock.cs diff --git a/地质建模/DataClass/GeologyLayer.cs b/uBIMEarthTools/DataClass/GeologyLayer.cs similarity index 100% rename from 地质建模/DataClass/GeologyLayer.cs rename to uBIMEarthTools/DataClass/GeologyLayer.cs diff --git a/地质建模/DataClass/GeologyParams.cs b/uBIMEarthTools/DataClass/GeologyParams.cs similarity index 100% rename from 地质建模/DataClass/GeologyParams.cs rename to uBIMEarthTools/DataClass/GeologyParams.cs diff --git a/地质建模/DataClass/TypeEquals.cs b/uBIMEarthTools/DataClass/TypeEquals.cs similarity index 100% rename from 地质建模/DataClass/TypeEquals.cs rename to uBIMEarthTools/DataClass/TypeEquals.cs diff --git a/地质建模/GeologyCompute.cs b/uBIMEarthTools/GeologyCompute.cs similarity index 100% rename from 地质建模/GeologyCompute.cs rename to uBIMEarthTools/GeologyCompute.cs diff --git a/地质建模/GeologyCylinder.cs b/uBIMEarthTools/GeologyCylinder.cs similarity index 100% rename from 地质建模/GeologyCylinder.cs rename to uBIMEarthTools/GeologyCylinder.cs diff --git a/地质建模/GeologyModel.cs b/uBIMEarthTools/GeologyModel.cs similarity index 100% rename from 地质建模/GeologyModel.cs rename to uBIMEarthTools/GeologyModel.cs diff --git a/地质建模/GeologyModelForm.Designer.cs b/uBIMEarthTools/GeologyModelForm.Designer.cs similarity index 100% rename from 地质建模/GeologyModelForm.Designer.cs rename to uBIMEarthTools/GeologyModelForm.Designer.cs diff --git a/地质建模/GeologyModelForm.cs b/uBIMEarthTools/GeologyModelForm.cs similarity index 100% rename from 地质建模/GeologyModelForm.cs rename to uBIMEarthTools/GeologyModelForm.cs diff --git a/地质建模/GeologyModelForm.resx b/uBIMEarthTools/GeologyModelForm.resx similarity index 100% rename from 地质建模/GeologyModelForm.resx rename to uBIMEarthTools/GeologyModelForm.resx diff --git a/地质建模/Old/DWGDataExport.cs b/uBIMEarthTools/Old/DWGDataExport.cs similarity index 100% rename from 地质建模/Old/DWGDataExport.cs rename to uBIMEarthTools/Old/DWGDataExport.cs diff --git a/地质建模/Old/地质建模.cs b/uBIMEarthTools/Old/地质建模.cs similarity index 100% rename from 地质建模/Old/地质建模.cs rename to uBIMEarthTools/Old/地质建模.cs diff --git a/地质建模/ProgressForm.cs b/uBIMEarthTools/ProgressForm.cs similarity index 100% rename from 地质建模/ProgressForm.cs rename to uBIMEarthTools/ProgressForm.cs diff --git a/地质建模/ProgressForm.designer.cs b/uBIMEarthTools/ProgressForm.designer.cs similarity index 100% rename from 地质建模/ProgressForm.designer.cs rename to uBIMEarthTools/ProgressForm.designer.cs diff --git a/地质建模/ProgressForm.resx b/uBIMEarthTools/ProgressForm.resx similarity index 100% rename from 地质建模/ProgressForm.resx rename to uBIMEarthTools/ProgressForm.resx diff --git a/地质建模/Properties/AssemblyInfo.cs b/uBIMEarthTools/Properties/AssemblyInfo.cs similarity index 100% rename from 地质建模/Properties/AssemblyInfo.cs rename to uBIMEarthTools/Properties/AssemblyInfo.cs diff --git a/地质建模/Properties/Resources.Designer.cs b/uBIMEarthTools/Properties/Resources.Designer.cs similarity index 95% rename from 地质建模/Properties/Resources.Designer.cs rename to uBIMEarthTools/Properties/Resources.Designer.cs index e40f84d..af0c2a0 100644 --- a/地质建模/Properties/Resources.Designer.cs +++ b/uBIMEarthTools/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace uBIM_EarthTools.Properties { +namespace uBIMEarthTools.Properties { using System; @@ -39,7 +39,7 @@ namespace uBIM_EarthTools.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("uBIM_EarthTools.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("uBIMEarthTools.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/地质建模/Properties/Resources.resx b/uBIMEarthTools/Properties/Resources.resx similarity index 100% rename from 地质建模/Properties/Resources.resx rename to uBIMEarthTools/Properties/Resources.resx diff --git a/地质建模/Properties/licenses.licx b/uBIMEarthTools/Properties/licenses.licx similarity index 100% rename from 地质建模/Properties/licenses.licx rename to uBIMEarthTools/Properties/licenses.licx diff --git a/地质建模/Resource.Designer.cs b/uBIMEarthTools/Resource.Designer.cs similarity index 84% rename from 地质建模/Resource.Designer.cs rename to uBIMEarthTools/Resource.Designer.cs index b452266..8544741 100644 --- a/地质建模/Resource.Designer.cs +++ b/uBIMEarthTools/Resource.Designer.cs @@ -39,7 +39,7 @@ namespace uBIM_EarthTools { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("uBIM_EarthTools.Resource", typeof(Resource).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("uBIMEarthTools.Resource", typeof(Resource).Assembly); resourceMan = temp; } return resourceMan; @@ -47,7 +47,7 @@ namespace uBIM_EarthTools { } /// - /// 使用此强类型资源类，为所有资源查找 + /// 重写当前线程的 CurrentUICulture 属性 /// 重写当前线程的 CurrentUICulture 属性。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] @@ -61,12 +61,11 @@ namespace uBIM_EarthTools { } /// - /// 查找 System.Byte[] 类型的本地化资源。 + /// 查找类似 Resources\地质钻孔圆柱.rfa;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 的本地化字符串。 /// - internal static byte[] 地质钻孔圆柱 { + internal static string 地质钻孔圆柱 { get { - object obj = ResourceManager.GetObject("地质钻孔圆柱", resourceCulture); - return ((byte[])(obj)); + return ResourceManager.GetString("地质钻孔圆柱", resourceCulture); } } } diff --git a/地质建模/Resource.resx b/uBIMEarthTools/Resource.resx similarity index 100% rename from 地质建模/Resource.resx rename to uBIMEarthTools/Resource.resx diff --git a/地质建模/Resources/contract.png b/uBIMEarthTools/Resources/contract.png similarity index 100% rename from 地质建模/Resources/contract.png rename to uBIMEarthTools/Resources/contract.png diff --git a/地质建模/Resources/pyramid.png b/uBIMEarthTools/Resources/pyramid.png similarity index 100% rename from 地质建模/Resources/pyramid.png rename to uBIMEarthTools/Resources/pyramid.png diff --git a/地质建模/Resources/地质钻孔圆柱.rfa b/uBIMEarthTools/Resources/地质钻孔圆柱.rfa similarity index 100% rename from 地质建模/Resources/地质钻孔圆柱.rfa rename to uBIMEarthTools/Resources/地质钻孔圆柱.rfa diff --git a/地质建模/Resources/常规模型地质块.rfa b/uBIMEarthTools/Resources/常规模型地质块.rfa similarity index 100% rename from 地质建模/Resources/常规模型地质块.rfa rename to uBIMEarthTools/Resources/常规模型地质块.rfa diff --git a/地质建模/Resources/钻孔标记.rfa b/uBIMEarthTools/Resources/钻孔标记.rfa similarity index 100% rename from 地质建模/Resources/钻孔标记.rfa rename to uBIMEarthTools/Resources/钻孔标记.rfa diff --git a/地质建模/Ribbon.cs b/uBIMEarthTools/Ribbon.cs similarity index 100% rename from 地质建模/Ribbon.cs rename to uBIMEarthTools/Ribbon.cs diff --git a/地质建模/Utils/AppConfig.cs b/uBIMEarthTools/Utils/AppConfig.cs similarity index 100% rename from 地质建模/Utils/AppConfig.cs rename to uBIMEarthTools/Utils/AppConfig.cs diff --git a/地质建模/Utils/Common.cs b/uBIMEarthTools/Utils/Common.cs similarity index 100% rename from 地质建模/Utils/Common.cs rename to uBIMEarthTools/Utils/Common.cs diff --git a/地质建模/Utils/ExcelHelper-Zhuangkh.cs b/uBIMEarthTools/Utils/ExcelHelper-Zhuangkh.cs similarity index 100% rename from 地质建模/Utils/ExcelHelper-Zhuangkh.cs rename to uBIMEarthTools/Utils/ExcelHelper-Zhuangkh.cs diff --git a/地质建模/Utils/ExcelHelper.cs b/uBIMEarthTools/Utils/ExcelHelper.cs similarity index 100% rename from 地质建模/Utils/ExcelHelper.cs rename to uBIMEarthTools/Utils/ExcelHelper.cs diff --git a/地质建模/Utils/FailureHandler.cs b/uBIMEarthTools/Utils/FailureHandler.cs similarity index 100% rename from 地质建模/Utils/FailureHandler.cs rename to uBIMEarthTools/Utils/FailureHandler.cs diff --git a/地质建模/Utils/LoadOpts.cs b/uBIMEarthTools/Utils/LoadOpts.cs similarity index 100% rename from 地质建模/Utils/LoadOpts.cs rename to uBIMEarthTools/Utils/LoadOpts.cs diff --git a/地质建模/packages.config b/uBIMEarthTools/packages.config similarity index 100% rename from 地质建模/packages.config rename to uBIMEarthTools/packages.config diff --git a/地质建模/uBIM_EarthTools.csproj b/uBIMEarthTools/uBIMEarthTools.csproj similarity index 98% rename from 地质建模/uBIM_EarthTools.csproj rename to uBIMEarthTools/uBIMEarthTools.csproj index 9a1a282..5395fb5 100644 --- a/地质建模/uBIM_EarthTools.csproj +++ b/uBIMEarthTools/uBIMEarthTools.csproj @@ -7,8 +7,8 @@ {85A8FB17-CF6E-4D07-AD0D-F860C37B08F5} Library Properties - uBIM_EarthTools - uBIM_EarthTools + uBIMEarthTools + uBIMEarthTools v4.5.2 512 diff --git a/地质建模/地质建模 - 副本 (2).cs b/uBIMEarthTools/地质建模 - 副本 (2).cs similarity index 100% rename from 地质建模/地质建模 - 副本 (2).cs rename to uBIMEarthTools/地质建模 - 副本 (2).cs diff --git a/地质建模/地质建模 - 副本.cs b/uBIMEarthTools/地质建模 - 副本.cs similarity index 100% rename from 地质建模/地质建模 - 副本.cs rename to uBIMEarthTools/地质建模 - 副本.cs