Browse Source

修改一些配置

cxs 2 years ago
parent
commit
46671281be

+ 3 - 3
Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -705,7 +705,7 @@
 	  <Control name="ToolStripMenuItem3" text="Duplicate image" />
 	  <Control name="str1" text="Number" />
 	  <Control name="str2" text="Average(um)Level" />
-	  <Control name="str3" text="Area(um²)" />
+	  <Control name="str3" text="AverageArea(um²)" />
 	  <Control name="str4" text="Diameter(um)" />
 	  <Control name="str5" text="Max(um)Level" />
 	  <Control name="str6" text="MaxArea(um²)" />
@@ -911,7 +911,7 @@
 	  <Control name="rbMeasureRectangle" text="Rectangle" />
 	  <Control name="ribCircle" text="Circle" />
 	  <Control name="ribRectangle" text="Rectangle" />
-	  <Control name="ribPolygon" text="polygon" />
+	  <Control name="ribPolygon" text="Polygon" />
 	  <Control name="rbPanelFunction" text="MeasurementControl" />
 	  <Control name="rbStart" text="Start" />
 	  <Control name="rbStop" text="Stop" />
@@ -1466,7 +1466,7 @@
 	  <Control name="str6" text="ParticleId" />
 	  <Control name="str7" text="ParticleName" />
 	  <Control name="str8" text="Name" />
-	  <Control name="str9" text="Representative" />
+	  <Control name="str9" text="Color" />
 	  <Control name="str10" text="Parameters" />
 	  <Control name="str11" text="MinGray" />
 	  <Control name="str12" text="MaxGray" />

+ 6 - 4
OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.Designer.cs

@@ -533,23 +533,25 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(540, 14);
+            this.label3.Location = new System.Drawing.Point(671, 14);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(65, 12);
             this.label3.TabIndex = 36;
             this.label3.Text = "ParticleId";
+            this.label3.Visible = false;
             // 
             // tB_ParticleId
             // 
-            this.tB_ParticleId.Location = new System.Drawing.Point(611, 10);
+            this.tB_ParticleId.Location = new System.Drawing.Point(742, 10);
             this.tB_ParticleId.Name = "tB_ParticleId";
             this.tB_ParticleId.Size = new System.Drawing.Size(76, 21);
             this.tB_ParticleId.TabIndex = 37;
+            this.tB_ParticleId.Visible = false;
             // 
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(697, 15);
+            this.label7.Location = new System.Drawing.Point(542, 15);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(47, 12);
             this.label7.TabIndex = 38;
@@ -557,7 +559,7 @@
             // 
             // tB_FieldId
             // 
-            this.tB_FieldId.Location = new System.Drawing.Point(750, 11);
+            this.tB_FieldId.Location = new System.Drawing.Point(595, 11);
             this.tB_FieldId.Name = "tB_FieldId";
             this.tB_FieldId.Size = new System.Drawing.Size(68, 21);
             this.tB_FieldId.TabIndex = 39;

+ 1 - 1
OTSPartA_STDEditor/App.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
 </configuration>

+ 2 - 2
OTSPartA_STDEditor/OTSPartA_STDEditor.csproj

@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>OTSPartA_STDEditor</RootNamespace>
     <AssemblyName>OTSPartA_STDEditor</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
@@ -39,7 +39,7 @@
     <OutputPath>..\Bin\x64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>