From a6167e1963ebbd56076c9bedb928357236151143 Mon Sep 17 00:00:00 2001 From: lhiven Date: Sun, 3 Dec 2023 17:36:41 +0900 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E9=AB=98=E4=BC=A0=E6=84=9F=E5=99=A8?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuxiliaryEquipment/DeviceFactory.cs | 23 +++ .../AuxiliaryEquipment/LaserEquipment.cs | 11 +- Rs.SkyLine/Commom/Ops.cs | 2 + Rs.SkyLine/FormMain.cs | 2 +- Rs.SkyLine/FormMain.designer.cs | 169 +++++++++--------- Rs.SkyLine/Rs.SkyLine.csproj | 1 + 6 files changed, 117 insertions(+), 91 deletions(-) create mode 100644 Rs.SkyLine/AuxiliaryEquipment/DeviceFactory.cs diff --git a/Rs.SkyLine/AuxiliaryEquipment/DeviceFactory.cs b/Rs.SkyLine/AuxiliaryEquipment/DeviceFactory.cs new file mode 100644 index 0000000..5d87a14 --- /dev/null +++ b/Rs.SkyLine/AuxiliaryEquipment/DeviceFactory.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Rs.MotionPlat.AuxiliaryEquipment +{ + public class DeviceFactory + { + /// + /// Check height + /// + public static LaserEquipment checkHeightDev { get; set; } + + + public static void Init() + { + checkHeightDev = new LaserEquipment(); + checkHeightDev.Open(); + } + } +} diff --git a/Rs.SkyLine/AuxiliaryEquipment/LaserEquipment.cs b/Rs.SkyLine/AuxiliaryEquipment/LaserEquipment.cs index c672ed2..576345a 100644 --- a/Rs.SkyLine/AuxiliaryEquipment/LaserEquipment.cs +++ b/Rs.SkyLine/AuxiliaryEquipment/LaserEquipment.cs @@ -1,4 +1,5 @@ -using System; +using Rs.MotionPlat.Flow; +using System; using System.Collections.Generic; using System.Diagnostics; using System.IO.Ports; @@ -54,7 +55,6 @@ namespace Rs.MotionPlat.AuxiliaryEquipment public double Read() { bool readOk = false; - double val = -999.999; if (IsConnected) { serialPort.Write("%01#RMD**\r"); @@ -83,14 +83,14 @@ namespace Rs.MotionPlat.AuxiliaryEquipment } } } - return val; + return AlarmConstID.NG; } double ParseValue() { string val = Encoding.ASCII.GetString(bufferList.ToArray()); - + bufferList.Clear(); Regex reg = new Regex("[+-][^*]*"); if(reg.IsMatch(val)) { @@ -98,8 +98,7 @@ namespace Rs.MotionPlat.AuxiliaryEquipment double v2 = double.Parse(v1)/10000; return v2; } - bufferList.Clear(); - return -999.999; + return AlarmConstID.NG; } } } diff --git a/Rs.SkyLine/Commom/Ops.cs b/Rs.SkyLine/Commom/Ops.cs index 0da5752..a0bb132 100644 --- a/Rs.SkyLine/Commom/Ops.cs +++ b/Rs.SkyLine/Commom/Ops.cs @@ -14,6 +14,7 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement.ToolTip; using Rs.Controls; using System.Threading; using System.Diagnostics; +using Rs.MotionPlat.AuxiliaryEquipment; namespace Rs.MotionPlat.Commom { @@ -129,6 +130,7 @@ namespace Rs.MotionPlat.Commom TurnoverSlotOffset.Init(); MonitorSystemButton.Instance.Start(); TestCenter.Instance.Init(); + DeviceFactory.Init(); //StockManager.Instance.ChangeStatus(EStockType.Empty1, AutoDischarge.V3.Flow.ETrayStatus.Loaded); //StockManager.Instance.ChangeStatus(EStockType.Input, AutoDischarge.V3.Flow.ETrayStatus.Loaded); //StockManager.Instance.ChangeStatus(EStockType.Ok, AutoDischarge.V3.Flow.ETrayStatus.Loaded); diff --git a/Rs.SkyLine/FormMain.cs b/Rs.SkyLine/FormMain.cs index fcdfc4b..fb0fab3 100644 --- a/Rs.SkyLine/FormMain.cs +++ b/Rs.SkyLine/FormMain.cs @@ -6,6 +6,7 @@ using Rs.Controls; using Rs.DataAccess; using Rs.Framework; using Rs.Motion.Base; +using Rs.MotionPlat.AuxiliaryEquipment; using Rs.MotionPlat.Commom; using Rs.MotionPlat.Flow; using Rs.MotionPlat.Flow.Space; @@ -74,7 +75,6 @@ namespace Rs.MotionPlat private void timer1_Tick(object sender, EventArgs e) { - //获取运行信息 while (MessageQueue.Instance.HaveMessage()) { diff --git a/Rs.SkyLine/FormMain.designer.cs b/Rs.SkyLine/FormMain.designer.cs index ea810c3..5843d9b 100644 --- a/Rs.SkyLine/FormMain.designer.cs +++ b/Rs.SkyLine/FormMain.designer.cs @@ -229,6 +229,7 @@ // // timer1 // + this.timer1.Interval = 1000; this.timer1.Tick += new System.EventHandler(this.timer1_Tick); // // panel1 @@ -905,10 +906,10 @@ this.himgNozzle5.DrawModel = false; this.himgNozzle5.ForeColor = System.Drawing.Color.White; this.himgNozzle5.Image = null; - this.himgNozzle5.Location = new System.Drawing.Point(3, 21); + this.himgNozzle5.Location = new System.Drawing.Point(3, 17); this.himgNozzle5.Margin = new System.Windows.Forms.Padding(4); this.himgNozzle5.Name = "himgNozzle5"; - this.himgNozzle5.Size = new System.Drawing.Size(111, 168); + this.himgNozzle5.Size = new System.Drawing.Size(111, 172); this.himgNozzle5.TabIndex = 12; // // hWindow_Final1 @@ -944,10 +945,10 @@ this.himgNozzle1.DrawModel = false; this.himgNozzle1.ForeColor = System.Drawing.Color.White; this.himgNozzle1.Image = null; - this.himgNozzle1.Location = new System.Drawing.Point(3, 21); + this.himgNozzle1.Location = new System.Drawing.Point(3, 17); this.himgNozzle1.Margin = new System.Windows.Forms.Padding(4); this.himgNozzle1.Name = "himgNozzle1"; - this.himgNozzle1.Size = new System.Drawing.Size(111, 168); + this.himgNozzle1.Size = new System.Drawing.Size(111, 172); this.himgNozzle1.TabIndex = 12; // // tableLayoutPanel9 @@ -985,10 +986,10 @@ this.himgNozzle6.DrawModel = false; this.himgNozzle6.ForeColor = System.Drawing.Color.White; this.himgNozzle6.Image = null; - this.himgNozzle6.Location = new System.Drawing.Point(3, 21); + this.himgNozzle6.Location = new System.Drawing.Point(3, 17); this.himgNozzle6.Margin = new System.Windows.Forms.Padding(4); this.himgNozzle6.Name = "himgNozzle6"; - this.himgNozzle6.Size = new System.Drawing.Size(111, 168); + this.himgNozzle6.Size = new System.Drawing.Size(111, 172); this.himgNozzle6.TabIndex = 12; // // gboxNozzle2 @@ -1011,10 +1012,10 @@ this.himgNozzle2.DrawModel = false; this.himgNozzle2.ForeColor = System.Drawing.Color.White; this.himgNozzle2.Image = null; - this.himgNozzle2.Location = new System.Drawing.Point(3, 21); + this.himgNozzle2.Location = new System.Drawing.Point(3, 17); this.himgNozzle2.Margin = new System.Windows.Forms.Padding(4); this.himgNozzle2.Name = "himgNozzle2"; - this.himgNozzle2.Size = new System.Drawing.Size(111, 168); + this.himgNozzle2.Size = new System.Drawing.Size(111, 172); this.himgNozzle2.TabIndex = 12; // // tableLayoutPanel10 @@ -1052,10 +1053,10 @@ this.himgNozzle7.DrawModel = false; this.himgNozzle7.ForeColor = System.Drawing.Color.White; this.himgNozzle7.Image = null; - this.himgNozzle7.Location = new System.Drawing.Point(3, 21); + this.himgNozzle7.Location = new System.Drawing.Point(3, 17); this.himgNozzle7.Margin = new System.Windows.Forms.Padding(4); this.himgNozzle7.Name = "himgNozzle7"; - this.himgNozzle7.Size = new System.Drawing.Size(111, 168); + this.himgNozzle7.Size = new System.Drawing.Size(111, 172); this.himgNozzle7.TabIndex = 12; // // gboxNozzle3 @@ -1078,10 +1079,10 @@ this.himgNozzle3.DrawModel = false; this.himgNozzle3.ForeColor = System.Drawing.Color.White; this.himgNozzle3.Image = null; - this.himgNozzle3.Location = new System.Drawing.Point(3, 21); + this.himgNozzle3.Location = new System.Drawing.Point(3, 17); this.himgNozzle3.Margin = new System.Windows.Forms.Padding(4); this.himgNozzle3.Name = "himgNozzle3"; - this.himgNozzle3.Size = new System.Drawing.Size(111, 168); + this.himgNozzle3.Size = new System.Drawing.Size(111, 172); this.himgNozzle3.TabIndex = 12; // // tableLayoutPanel11 @@ -1119,10 +1120,10 @@ this.himgNozzle8.DrawModel = false; this.himgNozzle8.ForeColor = System.Drawing.Color.White; this.himgNozzle8.Image = null; - this.himgNozzle8.Location = new System.Drawing.Point(3, 21); + this.himgNozzle8.Location = new System.Drawing.Point(3, 17); this.himgNozzle8.Margin = new System.Windows.Forms.Padding(4); this.himgNozzle8.Name = "himgNozzle8"; - this.himgNozzle8.Size = new System.Drawing.Size(114, 168); + this.himgNozzle8.Size = new System.Drawing.Size(114, 172); this.himgNozzle8.TabIndex = 12; // // gboxNozzle4 @@ -1145,10 +1146,10 @@ this.himgNozzle4.DrawModel = false; this.himgNozzle4.ForeColor = System.Drawing.Color.White; this.himgNozzle4.Image = null; - this.himgNozzle4.Location = new System.Drawing.Point(3, 21); + this.himgNozzle4.Location = new System.Drawing.Point(3, 17); this.himgNozzle4.Margin = new System.Windows.Forms.Padding(4); this.himgNozzle4.Name = "himgNozzle4"; - this.himgNozzle4.Size = new System.Drawing.Size(114, 168); + this.himgNozzle4.Size = new System.Drawing.Size(114, 172); this.himgNozzle4.TabIndex = 12; // // tabPage2 @@ -1237,10 +1238,10 @@ this.hWindow_Final2.DrawModel = false; this.hWindow_Final2.ForeColor = System.Drawing.Color.White; this.hWindow_Final2.Image = null; - this.hWindow_Final2.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final2.Location = new System.Drawing.Point(3, 17); this.hWindow_Final2.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final2.Name = "hWindow_Final2"; - this.hWindow_Final2.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final2.Size = new System.Drawing.Size(85, 106); this.hWindow_Final2.TabIndex = 13; // // groupBox2 @@ -1263,10 +1264,10 @@ this.hWindow_Final3.DrawModel = false; this.hWindow_Final3.ForeColor = System.Drawing.Color.White; this.hWindow_Final3.Image = null; - this.hWindow_Final3.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final3.Location = new System.Drawing.Point(3, 17); this.hWindow_Final3.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final3.Name = "hWindow_Final3"; - this.hWindow_Final3.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final3.Size = new System.Drawing.Size(85, 106); this.hWindow_Final3.TabIndex = 13; // // groupBox3 @@ -1289,10 +1290,10 @@ this.hWindow_Final4.DrawModel = false; this.hWindow_Final4.ForeColor = System.Drawing.Color.White; this.hWindow_Final4.Image = null; - this.hWindow_Final4.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final4.Location = new System.Drawing.Point(3, 17); this.hWindow_Final4.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final4.Name = "hWindow_Final4"; - this.hWindow_Final4.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final4.Size = new System.Drawing.Size(85, 106); this.hWindow_Final4.TabIndex = 13; // // groupBox4 @@ -1315,10 +1316,10 @@ this.hWindow_Final5.DrawModel = false; this.hWindow_Final5.ForeColor = System.Drawing.Color.White; this.hWindow_Final5.Image = null; - this.hWindow_Final5.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final5.Location = new System.Drawing.Point(3, 17); this.hWindow_Final5.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final5.Name = "hWindow_Final5"; - this.hWindow_Final5.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final5.Size = new System.Drawing.Size(85, 106); this.hWindow_Final5.TabIndex = 13; // // groupBox5 @@ -1341,10 +1342,10 @@ this.hWindow_Final6.DrawModel = false; this.hWindow_Final6.ForeColor = System.Drawing.Color.White; this.hWindow_Final6.Image = null; - this.hWindow_Final6.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final6.Location = new System.Drawing.Point(3, 17); this.hWindow_Final6.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final6.Name = "hWindow_Final6"; - this.hWindow_Final6.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final6.Size = new System.Drawing.Size(85, 106); this.hWindow_Final6.TabIndex = 13; // // groupBox6 @@ -1367,10 +1368,10 @@ this.hWindow_Final7.DrawModel = false; this.hWindow_Final7.ForeColor = System.Drawing.Color.White; this.hWindow_Final7.Image = null; - this.hWindow_Final7.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final7.Location = new System.Drawing.Point(3, 17); this.hWindow_Final7.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final7.Name = "hWindow_Final7"; - this.hWindow_Final7.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final7.Size = new System.Drawing.Size(85, 106); this.hWindow_Final7.TabIndex = 13; // // groupBox7 @@ -1393,10 +1394,10 @@ this.hWindow_Final8.DrawModel = false; this.hWindow_Final8.ForeColor = System.Drawing.Color.White; this.hWindow_Final8.Image = null; - this.hWindow_Final8.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final8.Location = new System.Drawing.Point(3, 17); this.hWindow_Final8.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final8.Name = "hWindow_Final8"; - this.hWindow_Final8.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final8.Size = new System.Drawing.Size(85, 106); this.hWindow_Final8.TabIndex = 13; // // groupBox8 @@ -1419,10 +1420,10 @@ this.hWindow_Final10.DrawModel = false; this.hWindow_Final10.ForeColor = System.Drawing.Color.White; this.hWindow_Final10.Image = null; - this.hWindow_Final10.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final10.Location = new System.Drawing.Point(3, 17); this.hWindow_Final10.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final10.Name = "hWindow_Final10"; - this.hWindow_Final10.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final10.Size = new System.Drawing.Size(85, 106); this.hWindow_Final10.TabIndex = 13; // // groupBox9 @@ -1445,10 +1446,10 @@ this.hWindow_Final11.DrawModel = false; this.hWindow_Final11.ForeColor = System.Drawing.Color.White; this.hWindow_Final11.Image = null; - this.hWindow_Final11.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final11.Location = new System.Drawing.Point(3, 17); this.hWindow_Final11.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final11.Name = "hWindow_Final11"; - this.hWindow_Final11.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final11.Size = new System.Drawing.Size(85, 106); this.hWindow_Final11.TabIndex = 13; // // groupBox10 @@ -1471,10 +1472,10 @@ this.hWindow_Final12.DrawModel = false; this.hWindow_Final12.ForeColor = System.Drawing.Color.White; this.hWindow_Final12.Image = null; - this.hWindow_Final12.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final12.Location = new System.Drawing.Point(3, 17); this.hWindow_Final12.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final12.Name = "hWindow_Final12"; - this.hWindow_Final12.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final12.Size = new System.Drawing.Size(85, 106); this.hWindow_Final12.TabIndex = 13; // // groupBox11 @@ -1497,10 +1498,10 @@ this.hWindow_Final13.DrawModel = false; this.hWindow_Final13.ForeColor = System.Drawing.Color.White; this.hWindow_Final13.Image = null; - this.hWindow_Final13.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final13.Location = new System.Drawing.Point(3, 17); this.hWindow_Final13.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final13.Name = "hWindow_Final13"; - this.hWindow_Final13.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final13.Size = new System.Drawing.Size(85, 106); this.hWindow_Final13.TabIndex = 13; // // groupBox12 @@ -1523,10 +1524,10 @@ this.hWindow_Final14.DrawModel = false; this.hWindow_Final14.ForeColor = System.Drawing.Color.White; this.hWindow_Final14.Image = null; - this.hWindow_Final14.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final14.Location = new System.Drawing.Point(3, 17); this.hWindow_Final14.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final14.Name = "hWindow_Final14"; - this.hWindow_Final14.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final14.Size = new System.Drawing.Size(85, 106); this.hWindow_Final14.TabIndex = 13; // // groupBox13 @@ -1549,10 +1550,10 @@ this.hWindow_Final15.DrawModel = false; this.hWindow_Final15.ForeColor = System.Drawing.Color.White; this.hWindow_Final15.Image = null; - this.hWindow_Final15.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final15.Location = new System.Drawing.Point(3, 17); this.hWindow_Final15.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final15.Name = "hWindow_Final15"; - this.hWindow_Final15.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final15.Size = new System.Drawing.Size(85, 106); this.hWindow_Final15.TabIndex = 13; // // groupBox14 @@ -1575,10 +1576,10 @@ this.hWindow_Final16.DrawModel = false; this.hWindow_Final16.ForeColor = System.Drawing.Color.White; this.hWindow_Final16.Image = null; - this.hWindow_Final16.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final16.Location = new System.Drawing.Point(3, 17); this.hWindow_Final16.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final16.Name = "hWindow_Final16"; - this.hWindow_Final16.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final16.Size = new System.Drawing.Size(85, 106); this.hWindow_Final16.TabIndex = 13; // // groupBox15 @@ -1601,10 +1602,10 @@ this.hWindow_Final18.DrawModel = false; this.hWindow_Final18.ForeColor = System.Drawing.Color.White; this.hWindow_Final18.Image = null; - this.hWindow_Final18.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final18.Location = new System.Drawing.Point(3, 17); this.hWindow_Final18.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final18.Name = "hWindow_Final18"; - this.hWindow_Final18.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final18.Size = new System.Drawing.Size(85, 106); this.hWindow_Final18.TabIndex = 13; // // groupBox16 @@ -1627,10 +1628,10 @@ this.hWindow_Final19.DrawModel = false; this.hWindow_Final19.ForeColor = System.Drawing.Color.White; this.hWindow_Final19.Image = null; - this.hWindow_Final19.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final19.Location = new System.Drawing.Point(3, 17); this.hWindow_Final19.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final19.Name = "hWindow_Final19"; - this.hWindow_Final19.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final19.Size = new System.Drawing.Size(85, 106); this.hWindow_Final19.TabIndex = 13; // // groupBox17 @@ -1653,10 +1654,10 @@ this.hWindow_Final20.DrawModel = false; this.hWindow_Final20.ForeColor = System.Drawing.Color.White; this.hWindow_Final20.Image = null; - this.hWindow_Final20.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final20.Location = new System.Drawing.Point(3, 17); this.hWindow_Final20.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final20.Name = "hWindow_Final20"; - this.hWindow_Final20.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final20.Size = new System.Drawing.Size(85, 106); this.hWindow_Final20.TabIndex = 13; // // groupBox18 @@ -1679,10 +1680,10 @@ this.hWindow_Final21.DrawModel = false; this.hWindow_Final21.ForeColor = System.Drawing.Color.White; this.hWindow_Final21.Image = null; - this.hWindow_Final21.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final21.Location = new System.Drawing.Point(3, 17); this.hWindow_Final21.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final21.Name = "hWindow_Final21"; - this.hWindow_Final21.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final21.Size = new System.Drawing.Size(85, 106); this.hWindow_Final21.TabIndex = 13; // // groupBox19 @@ -1705,10 +1706,10 @@ this.hWindow_Final22.DrawModel = false; this.hWindow_Final22.ForeColor = System.Drawing.Color.White; this.hWindow_Final22.Image = null; - this.hWindow_Final22.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final22.Location = new System.Drawing.Point(3, 17); this.hWindow_Final22.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final22.Name = "hWindow_Final22"; - this.hWindow_Final22.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final22.Size = new System.Drawing.Size(85, 106); this.hWindow_Final22.TabIndex = 13; // // groupBox20 @@ -1731,10 +1732,10 @@ this.hWindow_Final23.DrawModel = false; this.hWindow_Final23.ForeColor = System.Drawing.Color.White; this.hWindow_Final23.Image = null; - this.hWindow_Final23.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final23.Location = new System.Drawing.Point(3, 17); this.hWindow_Final23.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final23.Name = "hWindow_Final23"; - this.hWindow_Final23.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final23.Size = new System.Drawing.Size(85, 106); this.hWindow_Final23.TabIndex = 13; // // groupBox21 @@ -1757,10 +1758,10 @@ this.hWindow_Final24.DrawModel = false; this.hWindow_Final24.ForeColor = System.Drawing.Color.White; this.hWindow_Final24.Image = null; - this.hWindow_Final24.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final24.Location = new System.Drawing.Point(3, 17); this.hWindow_Final24.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final24.Name = "hWindow_Final24"; - this.hWindow_Final24.Size = new System.Drawing.Size(85, 102); + this.hWindow_Final24.Size = new System.Drawing.Size(85, 106); this.hWindow_Final24.TabIndex = 13; // // groupBox22 @@ -1783,10 +1784,10 @@ this.hWindow_Final26.DrawModel = false; this.hWindow_Final26.ForeColor = System.Drawing.Color.White; this.hWindow_Final26.Image = null; - this.hWindow_Final26.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final26.Location = new System.Drawing.Point(3, 17); this.hWindow_Final26.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final26.Name = "hWindow_Final26"; - this.hWindow_Final26.Size = new System.Drawing.Size(85, 103); + this.hWindow_Final26.Size = new System.Drawing.Size(85, 107); this.hWindow_Final26.TabIndex = 13; // // groupBox23 @@ -1809,10 +1810,10 @@ this.hWindow_Final27.DrawModel = false; this.hWindow_Final27.ForeColor = System.Drawing.Color.White; this.hWindow_Final27.Image = null; - this.hWindow_Final27.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final27.Location = new System.Drawing.Point(3, 17); this.hWindow_Final27.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final27.Name = "hWindow_Final27"; - this.hWindow_Final27.Size = new System.Drawing.Size(85, 103); + this.hWindow_Final27.Size = new System.Drawing.Size(85, 107); this.hWindow_Final27.TabIndex = 13; // // groupBox24 @@ -1835,10 +1836,10 @@ this.hWindow_Final28.DrawModel = false; this.hWindow_Final28.ForeColor = System.Drawing.Color.White; this.hWindow_Final28.Image = null; - this.hWindow_Final28.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final28.Location = new System.Drawing.Point(3, 17); this.hWindow_Final28.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final28.Name = "hWindow_Final28"; - this.hWindow_Final28.Size = new System.Drawing.Size(85, 103); + this.hWindow_Final28.Size = new System.Drawing.Size(85, 107); this.hWindow_Final28.TabIndex = 13; // // groupBox25 @@ -1861,10 +1862,10 @@ this.hWindow_Final29.DrawModel = false; this.hWindow_Final29.ForeColor = System.Drawing.Color.White; this.hWindow_Final29.Image = null; - this.hWindow_Final29.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final29.Location = new System.Drawing.Point(3, 17); this.hWindow_Final29.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final29.Name = "hWindow_Final29"; - this.hWindow_Final29.Size = new System.Drawing.Size(85, 103); + this.hWindow_Final29.Size = new System.Drawing.Size(85, 107); this.hWindow_Final29.TabIndex = 13; // // groupBox26 @@ -1887,10 +1888,10 @@ this.hWindow_Final30.DrawModel = false; this.hWindow_Final30.ForeColor = System.Drawing.Color.White; this.hWindow_Final30.Image = null; - this.hWindow_Final30.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final30.Location = new System.Drawing.Point(3, 17); this.hWindow_Final30.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final30.Name = "hWindow_Final30"; - this.hWindow_Final30.Size = new System.Drawing.Size(85, 103); + this.hWindow_Final30.Size = new System.Drawing.Size(85, 107); this.hWindow_Final30.TabIndex = 13; // // groupBox27 @@ -1913,10 +1914,10 @@ this.hWindow_Final31.DrawModel = false; this.hWindow_Final31.ForeColor = System.Drawing.Color.White; this.hWindow_Final31.Image = null; - this.hWindow_Final31.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final31.Location = new System.Drawing.Point(3, 17); this.hWindow_Final31.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final31.Name = "hWindow_Final31"; - this.hWindow_Final31.Size = new System.Drawing.Size(85, 103); + this.hWindow_Final31.Size = new System.Drawing.Size(85, 107); this.hWindow_Final31.TabIndex = 13; // // groupBox28 @@ -1939,10 +1940,10 @@ this.hWindow_Final32.DrawModel = false; this.hWindow_Final32.ForeColor = System.Drawing.Color.White; this.hWindow_Final32.Image = null; - this.hWindow_Final32.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final32.Location = new System.Drawing.Point(3, 17); this.hWindow_Final32.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final32.Name = "hWindow_Final32"; - this.hWindow_Final32.Size = new System.Drawing.Size(85, 103); + this.hWindow_Final32.Size = new System.Drawing.Size(85, 107); this.hWindow_Final32.TabIndex = 13; // // groupBox31 @@ -1965,10 +1966,10 @@ this.hWindow_Final9.DrawModel = false; this.hWindow_Final9.ForeColor = System.Drawing.Color.White; this.hWindow_Final9.Image = null; - this.hWindow_Final9.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final9.Location = new System.Drawing.Point(3, 17); this.hWindow_Final9.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final9.Name = "hWindow_Final9"; - this.hWindow_Final9.Size = new System.Drawing.Size(86, 102); + this.hWindow_Final9.Size = new System.Drawing.Size(86, 106); this.hWindow_Final9.TabIndex = 13; // // groupBox32 @@ -1991,10 +1992,10 @@ this.hWindow_Final17.DrawModel = false; this.hWindow_Final17.ForeColor = System.Drawing.Color.White; this.hWindow_Final17.Image = null; - this.hWindow_Final17.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final17.Location = new System.Drawing.Point(3, 17); this.hWindow_Final17.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final17.Name = "hWindow_Final17"; - this.hWindow_Final17.Size = new System.Drawing.Size(86, 102); + this.hWindow_Final17.Size = new System.Drawing.Size(86, 106); this.hWindow_Final17.TabIndex = 13; // // groupBox33 @@ -2017,10 +2018,10 @@ this.hWindow_Final25.DrawModel = false; this.hWindow_Final25.ForeColor = System.Drawing.Color.White; this.hWindow_Final25.Image = null; - this.hWindow_Final25.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final25.Location = new System.Drawing.Point(3, 17); this.hWindow_Final25.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final25.Name = "hWindow_Final25"; - this.hWindow_Final25.Size = new System.Drawing.Size(86, 102); + this.hWindow_Final25.Size = new System.Drawing.Size(86, 106); this.hWindow_Final25.TabIndex = 13; // // groupBox34 @@ -2043,10 +2044,10 @@ this.hWindow_Final33.DrawModel = false; this.hWindow_Final33.ForeColor = System.Drawing.Color.White; this.hWindow_Final33.Image = null; - this.hWindow_Final33.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final33.Location = new System.Drawing.Point(3, 17); this.hWindow_Final33.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final33.Name = "hWindow_Final33"; - this.hWindow_Final33.Size = new System.Drawing.Size(86, 103); + this.hWindow_Final33.Size = new System.Drawing.Size(86, 107); this.hWindow_Final33.TabIndex = 13; // // tableLayoutPanel4 @@ -2086,10 +2087,10 @@ this.hWindow_Final34.DrawModel = false; this.hWindow_Final34.ForeColor = System.Drawing.Color.White; this.hWindow_Final34.Image = null; - this.hWindow_Final34.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final34.Location = new System.Drawing.Point(3, 17); this.hWindow_Final34.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final34.Name = "hWindow_Final34"; - this.hWindow_Final34.Size = new System.Drawing.Size(182, 245); + this.hWindow_Final34.Size = new System.Drawing.Size(182, 249); this.hWindow_Final34.TabIndex = 13; // // groupBox30 @@ -2112,10 +2113,10 @@ this.hWindow_Final35.DrawModel = false; this.hWindow_Final35.ForeColor = System.Drawing.Color.White; this.hWindow_Final35.Image = null; - this.hWindow_Final35.Location = new System.Drawing.Point(3, 21); + this.hWindow_Final35.Location = new System.Drawing.Point(3, 17); this.hWindow_Final35.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final35.Name = "hWindow_Final35"; - this.hWindow_Final35.Size = new System.Drawing.Size(182, 245); + this.hWindow_Final35.Size = new System.Drawing.Size(182, 249); this.hWindow_Final35.TabIndex = 13; // // FormMain diff --git a/Rs.SkyLine/Rs.SkyLine.csproj b/Rs.SkyLine/Rs.SkyLine.csproj index 70c2d13..f19e74e 100644 --- a/Rs.SkyLine/Rs.SkyLine.csproj +++ b/Rs.SkyLine/Rs.SkyLine.csproj @@ -91,6 +91,7 @@ + Form