From 4c87a3c4254c7cf771d9d563d8908c2b32d7469b Mon Sep 17 00:00:00 2001
From: "zhengxuan.zhang" <zhengxuan.zhang@hexagon.com>
Date: Sun, 8 Oct 2023 17:02:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E6=A0=87=E5=85=83?=
 =?UTF-8?q?=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HexcalMC/HexcalMC.csproj      |  9 +++--
 HexcalMC/MainFrom.Designer.cs | 62 +++++++++++++++++------------------
 HexcalMC/MainFrom.cs          |  1 +
 3 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/HexcalMC/HexcalMC.csproj b/HexcalMC/HexcalMC.csproj
index 88f5c3a..939fe72 100644
--- a/HexcalMC/HexcalMC.csproj
+++ b/HexcalMC/HexcalMC.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HexcalMC</RootNamespace>
-    <AssemblyName>ACS_Motion</AssemblyName>
+    <AssemblyName>HexcalMC</AssemblyName>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
@@ -59,6 +59,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Hexagon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ACS.SPiiPlusNET">
       <HintPath>bin\Debug\ACS.SPiiPlusNET.dll</HintPath>
@@ -188,7 +191,9 @@
   <ItemGroup>
     <None Include="Resources\Hexagon.ico" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="Hexagon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/HexcalMC/MainFrom.Designer.cs b/HexcalMC/MainFrom.Designer.cs
index 5bb7203..77658a1 100644
--- a/HexcalMC/MainFrom.Designer.cs
+++ b/HexcalMC/MainFrom.Designer.cs
@@ -78,7 +78,6 @@
 			this.splitContainer1 = new System.Windows.Forms.SplitContainer();
 			this.groupBox7 = new System.Windows.Forms.GroupBox();
 			this.groupBox1 = new System.Windows.Forms.GroupBox();
-			this.lamp_hexcal = new HexcalMC.Lamp();
 			this.textBox2 = new System.Windows.Forms.TextBox();
 			this.textBox3 = new System.Windows.Forms.TextBox();
 			this.btn_HexcalStop = new System.Windows.Forms.Button();
@@ -122,7 +121,6 @@
 			this.btnEnable = new System.Windows.Forms.Button();
 			this.btnDisable = new System.Windows.Forms.Button();
 			this.groupBox2 = new System.Windows.Forms.GroupBox();
-			this.lamp_acs = new HexcalMC.Lamp();
 			this.txtPort = new System.Windows.Forms.TextBox();
 			this.txtIP = new System.Windows.Forms.TextBox();
 			this.btn_ACSStop = new System.Windows.Forms.Button();
@@ -135,6 +133,8 @@
 			this.textBox_Msg = new System.Windows.Forms.TextBox();
 			this.tmrMonitor = new System.Windows.Forms.Timer(this.components);
 			this.timer_RefreshUI = new System.Windows.Forms.Timer(this.components);
+			this.lamp_hexcal = new HexcalMC.Lamp();
+			this.lamp_acs = new HexcalMC.Lamp();
 			((System.ComponentModel.ISupportInitialize)(this.radRibbonBar1)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.radRibbonBarBackstageView1)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.radStatusStrip1)).BeginInit();
@@ -377,12 +377,12 @@
 			// 
 			this.radRibbonBar1.RootElement.AutoSizeMode = Telerik.WinControls.RadAutoSizeMode.WrapAroundChildren;
 			this.radRibbonBar1.ShowExpandButton = false;
-			this.radRibbonBar1.Size = new System.Drawing.Size(1192, 176);
+			this.radRibbonBar1.Size = new System.Drawing.Size(1192, 173);
 			this.radRibbonBar1.StartButtonImage = global::HexcalMC.Properties.Resources.Hexagon;
 			this.radRibbonBar1.StartMenuItems.AddRange(new Telerik.WinControls.RadItem[] {
             this.radMenuItem2});
 			this.radRibbonBar1.TabIndex = 0;
-			this.radRibbonBar1.Text = "直线电机平台运动补偿软件";
+			this.radRibbonBar1.Text = "直线电机平台运动补偿";
 			// 
 			// radRibbonBarBackstageView1
 			// 
@@ -583,7 +583,7 @@
 			// splitContainer1
 			// 
 			this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.splitContainer1.Location = new System.Drawing.Point(0, 176);
+			this.splitContainer1.Location = new System.Drawing.Point(0, 173);
 			this.splitContainer1.Name = "splitContainer1";
 			// 
 			// splitContainer1.Panel1
@@ -597,7 +597,7 @@
 			// 
 			this.splitContainer1.Panel2.BackColor = System.Drawing.SystemColors.Control;
 			this.splitContainer1.Panel2.Controls.Add(this.groupBox3);
-			this.splitContainer1.Size = new System.Drawing.Size(1192, 693);
+			this.splitContainer1.Size = new System.Drawing.Size(1192, 696);
 			this.splitContainer1.SplitterDistance = 760;
 			this.splitContainer1.TabIndex = 2;
 			// 
@@ -627,18 +627,6 @@
 			this.groupBox1.TabStop = false;
 			this.groupBox1.Text = "Hexcal通讯设置";
 			// 
-			// lamp_hexcal
-			// 
-			this.lamp_hexcal.Font = new System.Drawing.Font("宋体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134)));
-			this.lamp_hexcal.Location = new System.Drawing.Point(57, 49);
-			this.lamp_hexcal.LText = "";
-			this.lamp_hexcal.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-			this.lamp_hexcal.Name = "lamp_hexcal";
-			this.lamp_hexcal.Shadow = false;
-			this.lamp_hexcal.Size = new System.Drawing.Size(24, 24);
-			this.lamp_hexcal.State = -1;
-			this.lamp_hexcal.TabIndex = 29;
-			// 
 			// textBox2
 			// 
 			this.textBox2.Location = new System.Drawing.Point(103, 52);
@@ -1068,18 +1056,6 @@
 			this.groupBox2.TabStop = false;
 			this.groupBox2.Text = "ACS通讯设置";
 			// 
-			// lamp_acs
-			// 
-			this.lamp_acs.Font = new System.Drawing.Font("宋体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134)));
-			this.lamp_acs.Location = new System.Drawing.Point(57, 50);
-			this.lamp_acs.LText = "";
-			this.lamp_acs.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-			this.lamp_acs.Name = "lamp_acs";
-			this.lamp_acs.Shadow = false;
-			this.lamp_acs.Size = new System.Drawing.Size(24, 24);
-			this.lamp_acs.State = -1;
-			this.lamp_acs.TabIndex = 30;
-			// 
 			// txtPort
 			// 
 			this.txtPort.Location = new System.Drawing.Point(103, 52);
@@ -1184,6 +1160,30 @@
 			this.timer_RefreshUI.Interval = 1000;
 			this.timer_RefreshUI.Tick += new System.EventHandler(this.timer_RefreshUI_Tick);
 			// 
+			// lamp_hexcal
+			// 
+			this.lamp_hexcal.Font = new System.Drawing.Font("宋体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134)));
+			this.lamp_hexcal.Location = new System.Drawing.Point(57, 49);
+			this.lamp_hexcal.LText = "";
+			this.lamp_hexcal.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+			this.lamp_hexcal.Name = "lamp_hexcal";
+			this.lamp_hexcal.Shadow = false;
+			this.lamp_hexcal.Size = new System.Drawing.Size(24, 24);
+			this.lamp_hexcal.State = -1;
+			this.lamp_hexcal.TabIndex = 29;
+			// 
+			// lamp_acs
+			// 
+			this.lamp_acs.Font = new System.Drawing.Font("宋体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(134)));
+			this.lamp_acs.Location = new System.Drawing.Point(57, 50);
+			this.lamp_acs.LText = "";
+			this.lamp_acs.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+			this.lamp_acs.Name = "lamp_acs";
+			this.lamp_acs.Shadow = false;
+			this.lamp_acs.Size = new System.Drawing.Size(24, 24);
+			this.lamp_acs.State = -1;
+			this.lamp_acs.TabIndex = 30;
+			// 
 			// MainFrom
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1201,7 +1201,7 @@
 			// 
 			this.RootElement.ApplyShapeToControl = true;
 			this.ShowIcon = false;
-			this.Text = "直线电机平台运动补偿软件";
+			this.Text = "直线电机平台运动补偿     ";
 			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainFrom_FormClosed);
 			this.Load += new System.EventHandler(this.MainFrom_Load);
 			((System.ComponentModel.ISupportInitialize)(this.radRibbonBar1)).EndInit();
diff --git a/HexcalMC/MainFrom.cs b/HexcalMC/MainFrom.cs
index fa28359..f99f959 100644
--- a/HexcalMC/MainFrom.cs
+++ b/HexcalMC/MainFrom.cs
@@ -411,6 +411,7 @@ namespace HexcalMC
 		private void rtb_about_Click(object sender, EventArgs e) //关于界面
 		{
 			AboutBox mAboutBox = new AboutBox();
+			mAboutBox.StartPosition = FormStartPosition.CenterScreen;
 			mAboutBox.Show();
 		}