diff --git a/INT51DB/Controls/Bottom/ControlBottomSystem.Designer.cs b/INT51DB/Controls/Bottom/ControlBottomSystem.Designer.cs index 91bedba..cec00ed 100644 --- a/INT51DB/Controls/Bottom/ControlBottomSystem.Designer.cs +++ b/INT51DB/Controls/Bottom/ControlBottomSystem.Designer.cs @@ -51,11 +51,13 @@ this.buttonAutoZero.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonAutoZero.DownImage"))); this.buttonAutoZero.GroupID = 0; this.buttonAutoZero.InitVisible = true; - this.buttonAutoZero.Location = new System.Drawing.Point(385, 0); + this.buttonAutoZero.Location = new System.Drawing.Point(314, 0); this.buttonAutoZero.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonAutoZero.Name = "buttonAutoZero"; this.buttonAutoZero.NestedClickEventPrevent = false; + this.buttonAutoZero.OutlinePixel = 1; this.buttonAutoZero.RepeatInterval = 200; + this.buttonAutoZero.RepeatIntervalAccelerate = null; this.buttonAutoZero.SafeInterval = 200; this.buttonAutoZero.Size = new System.Drawing.Size(65, 65); this.buttonAutoZero.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -84,7 +86,9 @@ this.buttonJudgmentSetting.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonJudgmentSetting.Name = "buttonJudgmentSetting"; this.buttonJudgmentSetting.NestedClickEventPrevent = false; + this.buttonJudgmentSetting.OutlinePixel = 1; this.buttonJudgmentSetting.RepeatInterval = 200; + this.buttonJudgmentSetting.RepeatIntervalAccelerate = null; this.buttonJudgmentSetting.SafeInterval = 200; this.buttonJudgmentSetting.Size = new System.Drawing.Size(65, 65); this.buttonJudgmentSetting.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -113,7 +117,9 @@ this.buttonCalibration.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonCalibration.Name = "buttonCalibration"; this.buttonCalibration.NestedClickEventPrevent = false; + this.buttonCalibration.OutlinePixel = 1; this.buttonCalibration.RepeatInterval = 200; + this.buttonCalibration.RepeatIntervalAccelerate = null; this.buttonCalibration.SafeInterval = 200; this.buttonCalibration.Size = new System.Drawing.Size(65, 65); this.buttonCalibration.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -138,11 +144,13 @@ this.buttonIOTest.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonIOTest.DownImage"))); this.buttonIOTest.GroupID = 0; this.buttonIOTest.InitVisible = true; - this.buttonIOTest.Location = new System.Drawing.Point(456, 0); + this.buttonIOTest.Location = new System.Drawing.Point(385, 0); this.buttonIOTest.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonIOTest.Name = "buttonIOTest"; this.buttonIOTest.NestedClickEventPrevent = false; + this.buttonIOTest.OutlinePixel = 1; this.buttonIOTest.RepeatInterval = 200; + this.buttonIOTest.RepeatIntervalAccelerate = null; this.buttonIOTest.SafeInterval = 200; this.buttonIOTest.Size = new System.Drawing.Size(65, 65); this.buttonIOTest.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -171,7 +179,9 @@ this.buttonHelp.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonHelp.Name = "buttonHelp"; this.buttonHelp.NestedClickEventPrevent = false; + this.buttonHelp.OutlinePixel = 1; this.buttonHelp.RepeatInterval = 200; + this.buttonHelp.RepeatIntervalAccelerate = null; this.buttonHelp.SafeInterval = 200; this.buttonHelp.Size = new System.Drawing.Size(65, 65); this.buttonHelp.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -200,7 +210,9 @@ this.buttonSorter.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonSorter.Name = "buttonSorter"; this.buttonSorter.NestedClickEventPrevent = false; + this.buttonSorter.OutlinePixel = 1; this.buttonSorter.RepeatInterval = 200; + this.buttonSorter.RepeatIntervalAccelerate = null; this.buttonSorter.SafeInterval = 200; this.buttonSorter.Size = new System.Drawing.Size(65, 65); this.buttonSorter.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -225,11 +237,13 @@ this.buttonServo.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonServo.DownImage"))); this.buttonServo.GroupID = 0; this.buttonServo.InitVisible = true; - this.buttonServo.Location = new System.Drawing.Point(527, 0); + this.buttonServo.Location = new System.Drawing.Point(456, 0); this.buttonServo.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonServo.Name = "buttonServo"; this.buttonServo.NestedClickEventPrevent = false; + this.buttonServo.OutlinePixel = 1; this.buttonServo.RepeatInterval = 200; + this.buttonServo.RepeatIntervalAccelerate = null; this.buttonServo.SafeInterval = 200; this.buttonServo.Size = new System.Drawing.Size(65, 65); this.buttonServo.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -254,11 +268,13 @@ this.buttonExternalOutput.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonExternalOutput.DownImage"))); this.buttonExternalOutput.GroupID = 0; this.buttonExternalOutput.InitVisible = true; - this.buttonExternalOutput.Location = new System.Drawing.Point(314, 0); + this.buttonExternalOutput.Location = new System.Drawing.Point(527, 3); this.buttonExternalOutput.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonExternalOutput.Name = "buttonExternalOutput"; this.buttonExternalOutput.NestedClickEventPrevent = false; + this.buttonExternalOutput.OutlinePixel = 1; this.buttonExternalOutput.RepeatInterval = 200; + this.buttonExternalOutput.RepeatIntervalAccelerate = null; this.buttonExternalOutput.SafeInterval = 200; this.buttonExternalOutput.Size = new System.Drawing.Size(65, 65); this.buttonExternalOutput.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -269,6 +285,7 @@ this.buttonExternalOutput.TextLocation = new System.Drawing.Point(0, 0); this.buttonExternalOutput.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonExternalOutput.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonExternalOutput.UpImage"))); + this.buttonExternalOutput.Visible = false; this.buttonExternalOutput.Click += new System.EventHandler(this.buttonMenu_Click); // // ControlBottomSystem diff --git a/INT51DB/Controls/CenterConfiguration/ControlCenterConfiCommunication.Designer.cs b/INT51DB/Controls/CenterConfiguration/ControlCenterConfiCommunication.Designer.cs index 3418bff..d3d479d 100644 --- a/INT51DB/Controls/CenterConfiguration/ControlCenterConfiCommunication.Designer.cs +++ b/INT51DB/Controls/CenterConfiguration/ControlCenterConfiCommunication.Designer.cs @@ -67,7 +67,7 @@ // this.buttonSave3.Enabled = false; this.buttonSave3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular); - this.buttonSave3.Location = new System.Drawing.Point(607, 263); + this.buttonSave3.Location = new System.Drawing.Point(607, 166); this.buttonSave3.Name = "buttonSave3"; this.buttonSave3.Size = new System.Drawing.Size(70, 30); this.buttonSave3.TabIndex = 37; @@ -78,7 +78,7 @@ // this.buttonSave2.Enabled = false; this.buttonSave2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular); - this.buttonSave2.Location = new System.Drawing.Point(607, 165); + this.buttonSave2.Location = new System.Drawing.Point(607, 68); this.buttonSave2.Name = "buttonSave2"; this.buttonSave2.Size = new System.Drawing.Size(70, 30); this.buttonSave2.TabIndex = 36; @@ -88,7 +88,7 @@ // comboBoxSerial3BaudRate // this.comboBoxSerial3BaudRate.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); - this.comboBoxSerial3BaudRate.Location = new System.Drawing.Point(216, 263); + this.comboBoxSerial3BaudRate.Location = new System.Drawing.Point(216, 166); this.comboBoxSerial3BaudRate.Name = "comboBoxSerial3BaudRate"; this.comboBoxSerial3BaudRate.Size = new System.Drawing.Size(130, 28); this.comboBoxSerial3BaudRate.TabIndex = 32; @@ -97,7 +97,7 @@ // comboBoxSerial2BaudRate // this.comboBoxSerial2BaudRate.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); - this.comboBoxSerial2BaudRate.Location = new System.Drawing.Point(216, 165); + this.comboBoxSerial2BaudRate.Location = new System.Drawing.Point(216, 68); this.comboBoxSerial2BaudRate.Name = "comboBoxSerial2BaudRate"; this.comboBoxSerial2BaudRate.Size = new System.Drawing.Size(130, 28); this.comboBoxSerial2BaudRate.TabIndex = 33; @@ -106,7 +106,7 @@ // comboBoxSerial2Mode // this.comboBoxSerial2Mode.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); - this.comboBoxSerial2Mode.Location = new System.Drawing.Point(384, 165); + this.comboBoxSerial2Mode.Location = new System.Drawing.Point(384, 68); this.comboBoxSerial2Mode.Name = "comboBoxSerial2Mode"; this.comboBoxSerial2Mode.Size = new System.Drawing.Size(192, 28); this.comboBoxSerial2Mode.TabIndex = 31; @@ -115,7 +115,7 @@ // comboBoxSerial3Mode // this.comboBoxSerial3Mode.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); - this.comboBoxSerial3Mode.Location = new System.Drawing.Point(384, 263); + this.comboBoxSerial3Mode.Location = new System.Drawing.Point(384, 166); this.comboBoxSerial3Mode.Name = "comboBoxSerial3Mode"; this.comboBoxSerial3Mode.Size = new System.Drawing.Size(192, 28); this.comboBoxSerial3Mode.TabIndex = 34; diff --git a/INT51DB/Controls/CenterConfiguration/ControlCenterConfiCommunication.resx b/INT51DB/Controls/CenterConfiguration/ControlCenterConfiCommunication.resx index c48cef5..c7437f3 100644 --- a/INT51DB/Controls/CenterConfiguration/ControlCenterConfiCommunication.resx +++ b/INT51DB/Controls/CenterConfiguration/ControlCenterConfiCommunication.resx @@ -165,247 +165,217 @@ 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 - rkJggg== + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOxAAADsQBlSsOGwAAMQ5JREFUeF7t3d/LtPtd + L3b/hfwDgjnwRMFABE+FBE88UUgOag2lggsttJS6bYoUxFrKAs88CQuhu3Vju121sptN3SZrb6TZTaRx + JU2y88PEpLKp1lBiUJMSQlzr7n7frk/8PJefmXtmnvu+nmvmen3gxT3zva65ZuY73+897+f7XDP39/zk + P/7YXfne7/1eAADYjZ6FBWMAAHarZ2HBGACA3epZWDAGAGC3ehYWjAEA2K2ehQVjAAB2q2dhwRgAgN3q + WVgwBgBgt3oWFowBANitnoUFYwAAdqtnYcEYAIDd6llYMAYAYLd6FhaMAQDYrZ6FBWMAAHarZ2HBGACA + 3epZWDAGAGC3ehYWjAEA2K2ehQVjAAB2q2dhwRgAgN3qWVgwBgBgt3oWFowBANitnoVfSDD+iZ/4ibuf + +Zmf4RG9733vu3v3u98NAHD1fuAHfmDMkE+hZ+FVgvFP/dRP3X3+85+/++Y3v3n3xhtv3CmllFJKKXWs + /vZv//buL/7iL+5++7d/++6HfuiHxoz5GHoWftJgnLT/uc997j4M/6+f/4u7/+rDn7973//w8WceAI8j + NbVzmD7jFhjHsC5zbj3/4T/9o7v/5l9+4e5f/cn/e/ftb3/77gMf+MCYN59Xv88nC8bvete77v76r//6 + 7l984at3/+k/+9Qzd8rjM1HPp8+4BcYxrMucezH+y3/x2bv//f/62t0nPvGJu+/7vu8bs+el+v08STD+ + /u///ru/+qu/uvtfPvv/PHNnPB0T9Xz6jFtgHMO6zLkX573//R/en4HwkY98ZMyfl+r38STB+LOf/ez9 + SnE/Nk/LRD2fPuMWGMewLnPuxfr3f+v/uHv9//763a/8yq+MGfQS/fiPHozzQbucU+z0iXWZqOfTZ9wC + 4xjWZc69eP/1a1+4/0KHxzqloh/70YPxZz7zGavFL4CJej59xi0wjmFd5tw2ZNX4V3/1V8cseq5+3EcP + xt/4xjfuk3w/Lk/PRD2fPuMWGMewLnNuG175w6/cffKTnxyz6Ln6cR81GL/jHe+4/865/+B//KNn7oSn + Z6KeT59xC4xjWJc5tw3/+T//zN1f/uVfjnn0XP24jxqM3/Oe99x95403n7mDc3z6z//qbP/og58ejxW/ + +fq/vffLH/rcuD1yjFT26+1123N84KNfeeYYP/c7nxz3O2Z5jFOlpnYO02cvxvt+6+P3c/LYvOR0xjGs + y5zbhnzHcb7beMqj5+rHfdRg/NJLL939f9/+22fu4BxVX/7aN/9BAD7kWDCuSuCctkeOMe1zSeVY/Rh5 + 4z+3lsc4VWpqLwnpv/YHX/xuAM/ltPV9bjWwZIzkOS2f70N9dg2O1Te+/Z371zqv63TbF6XPi2k759GP + 57mkrvV3Yp9r59StvQc8ttTUzrry7RTf+c53xjx6rn7cTQbjx5qUVZcE48mHvvjV+31TCZbTPl0Pmg+p + Yz92MM5jqOc4Ve63glMeR9XyONfs0Guc6tevUdVX/+Zb98+z5HpV/qE53fZFWWuc1dxa/oPo1jx1P96a + qocWYLK9KuNoOtbW9bk2PcdDji04Yc5txa6CccJaQswpjr3pVeV40/bIL4FUjjVtLznFoVeCx2O+4eb+ + U3k80/aHpJZteXxZNaxKP+R55L7qeacqOK0VWNZ26DVO9evXqGoav/WPrdSlp+g8hbXGWdVDc/vapaZ2 + ZlUPhd0+Th/ad6tu9Xf6i6Y/t2FXwficOvQLK6GwKiF22iceCsZZTf3dz/zZ/T6phMgKm/l5LHDkX905 + /ilqhS+Xp2M9JLVsy7GqpseZ51yV7bf6S7T6YW/BuG/PGJ62vwhrjbMqwZiu6qGw28fpQ/tu1a3+Tn/R + 9Oc2OJXiTD30pQ4dcwpNCbQJih/906/db6tKuEhQzvYE5KqE2mzLfdRpCdF/KWX/3NdDLg0wqX693/ex + YFCV1cV+m2nfa5V+TS37IdWvX6OqQ69x/SPu0LjKPyDzupfH/F+QyHxYHj8/q6bbRJ0XHr19ebxj/+Vb + dWz8P/XzX0NqamdWldd72l6yveqhfbeqP4dpO5fRn9vgVIoDpl9YeXPrpxCkEl57aC1TaKrV26oKjQnL + FWCzX673gJzqAWTNX6ypfr3/N/r0vCfLX6I9nBx6/OcElXiKfft+sdy+12Ccvqha/o9BXrfql2UtQ3Q/ + zrJ/+7beHrnP5TxM9fvt+1ct519tz+OaKsfrY/xQ1bw993hbl5ramVVNvyu6Y+P+Whybn1xOf26DUykO + 1DIQ5A2th9Vsr0r78g2v3qT7cRLCcj0fsOv792NVWySIJwQsH8uav1hT/Xr1wTIMHNMfb/VLrwSWHlBP + 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 + 8cfu/n+0A1d8YkRKvQAAAABJRU5ErkJggg== diff --git a/INT51DB/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.Designer.cs b/INT51DB/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.Designer.cs index aeeeb6c..55c7fc3 100644 --- a/INT51DB/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.Designer.cs +++ b/INT51DB/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.Designer.cs @@ -99,7 +99,7 @@ this.smartLabel1.ForeColor = System.Drawing.Color.White; this.smartLabel1.InitVisible = true; this.smartLabel1.LineSpacing = 0F; - this.smartLabel1.Location = new System.Drawing.Point(206, 126); + this.smartLabel1.Location = new System.Drawing.Point(203, 248); this.smartLabel1.Name = "smartLabel1"; this.smartLabel1.Size = new System.Drawing.Size(215, 30); this.smartLabel1.TabIndex = 139; @@ -120,11 +120,13 @@ this.buttonCommunicationLog.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonCommunicationLog.DownImage"))); this.buttonCommunicationLog.GroupID = 0; this.buttonCommunicationLog.InitVisible = true; - this.buttonCommunicationLog.Location = new System.Drawing.Point(427, 126); + this.buttonCommunicationLog.Location = new System.Drawing.Point(424, 248); this.buttonCommunicationLog.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonCommunicationLog.Name = "buttonCommunicationLog"; this.buttonCommunicationLog.NestedClickEventPrevent = false; + this.buttonCommunicationLog.OutlinePixel = 1; this.buttonCommunicationLog.RepeatInterval = 200; + this.buttonCommunicationLog.RepeatIntervalAccelerate = null; this.buttonCommunicationLog.SafeInterval = 200; this.buttonCommunicationLog.Size = new System.Drawing.Size(80, 28); this.buttonCommunicationLog.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -148,7 +150,7 @@ this.labelPasswordLevel3.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); this.labelPasswordLevel3.InitVisible = true; this.labelPasswordLevel3.LineSpacing = 0F; - this.labelPasswordLevel3.Location = new System.Drawing.Point(597, 330); + this.labelPasswordLevel3.Location = new System.Drawing.Point(598, 424); this.labelPasswordLevel3.Name = "labelPasswordLevel3"; this.labelPasswordLevel3.Size = new System.Drawing.Size(80, 30); this.labelPasswordLevel3.TabIndex = 137; @@ -171,7 +173,7 @@ this.smartLabel6.ForeColor = System.Drawing.Color.White; this.smartLabel6.InitVisible = true; this.smartLabel6.LineSpacing = 0F; - this.smartLabel6.Location = new System.Drawing.Point(376, 330); + this.smartLabel6.Location = new System.Drawing.Point(377, 424); this.smartLabel6.Name = "smartLabel6"; this.smartLabel6.Size = new System.Drawing.Size(215, 30); this.smartLabel6.TabIndex = 136; @@ -192,7 +194,7 @@ this.labelPasswordLevel2.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); this.labelPasswordLevel2.InitVisible = true; this.labelPasswordLevel2.LineSpacing = 0F; - this.labelPasswordLevel2.Location = new System.Drawing.Point(597, 294); + this.labelPasswordLevel2.Location = new System.Drawing.Point(598, 388); this.labelPasswordLevel2.Name = "labelPasswordLevel2"; this.labelPasswordLevel2.Size = new System.Drawing.Size(80, 30); this.labelPasswordLevel2.TabIndex = 135; @@ -215,7 +217,7 @@ this.smartLabel4.ForeColor = System.Drawing.Color.White; this.smartLabel4.InitVisible = true; this.smartLabel4.LineSpacing = 0F; - this.smartLabel4.Location = new System.Drawing.Point(376, 294); + this.smartLabel4.Location = new System.Drawing.Point(377, 388); this.smartLabel4.Name = "smartLabel4"; this.smartLabel4.Size = new System.Drawing.Size(215, 30); this.smartLabel4.TabIndex = 134; @@ -236,7 +238,7 @@ this.labelPasswordLevel1.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); this.labelPasswordLevel1.InitVisible = true; this.labelPasswordLevel1.LineSpacing = 0F; - this.labelPasswordLevel1.Location = new System.Drawing.Point(597, 258); + this.labelPasswordLevel1.Location = new System.Drawing.Point(598, 352); this.labelPasswordLevel1.Name = "labelPasswordLevel1"; this.labelPasswordLevel1.Size = new System.Drawing.Size(80, 30); this.labelPasswordLevel1.TabIndex = 133; @@ -259,7 +261,7 @@ this.smartLabel2.ForeColor = System.Drawing.Color.White; this.smartLabel2.InitVisible = true; this.smartLabel2.LineSpacing = 0F; - this.smartLabel2.Location = new System.Drawing.Point(376, 258); + this.smartLabel2.Location = new System.Drawing.Point(377, 352); this.smartLabel2.Name = "smartLabel2"; this.smartLabel2.Size = new System.Drawing.Size(215, 30); this.smartLabel2.TabIndex = 132; @@ -280,14 +282,13 @@ this.labelChattering.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); this.labelChattering.InitVisible = true; this.labelChattering.LineSpacing = 0F; - this.labelChattering.Location = new System.Drawing.Point(254, 294); + this.labelChattering.Location = new System.Drawing.Point(424, 176); this.labelChattering.Name = "labelChattering"; this.labelChattering.Size = new System.Drawing.Size(80, 30); this.labelChattering.TabIndex = 129; this.labelChattering.Text = "100"; this.labelChattering.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; this.labelChattering.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelChattering.Visible = false; this.labelChattering.Wordwrap = false; this.labelChattering.Click += new System.EventHandler(this.labelChattering_Click); // @@ -302,14 +303,13 @@ this.labelRelayOnTime.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); this.labelRelayOnTime.InitVisible = true; this.labelRelayOnTime.LineSpacing = 0F; - this.labelRelayOnTime.Location = new System.Drawing.Point(254, 366); + this.labelRelayOnTime.Location = new System.Drawing.Point(424, 212); this.labelRelayOnTime.Name = "labelRelayOnTime"; this.labelRelayOnTime.Size = new System.Drawing.Size(80, 30); this.labelRelayOnTime.TabIndex = 130; this.labelRelayOnTime.Text = "100"; this.labelRelayOnTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; this.labelRelayOnTime.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelRelayOnTime.Visible = false; this.labelRelayOnTime.Wordwrap = false; this.labelRelayOnTime.Click += new System.EventHandler(this.labelRelayOnTime_Click); // @@ -324,14 +324,13 @@ this.labelBuzzerOnTime.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); this.labelBuzzerOnTime.InitVisible = true; this.labelBuzzerOnTime.LineSpacing = 0F; - this.labelBuzzerOnTime.Location = new System.Drawing.Point(254, 258); + this.labelBuzzerOnTime.Location = new System.Drawing.Point(424, 140); this.labelBuzzerOnTime.Name = "labelBuzzerOnTime"; this.labelBuzzerOnTime.Size = new System.Drawing.Size(80, 30); this.labelBuzzerOnTime.TabIndex = 131; this.labelBuzzerOnTime.Text = "100"; this.labelBuzzerOnTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; this.labelBuzzerOnTime.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelBuzzerOnTime.Visible = false; this.labelBuzzerOnTime.Wordwrap = false; this.labelBuzzerOnTime.Click += new System.EventHandler(this.labelBuzzerOnTime_Click); // @@ -347,14 +346,13 @@ this.labelStaticChattering.ForeColor = System.Drawing.Color.White; this.labelStaticChattering.InitVisible = true; this.labelStaticChattering.LineSpacing = 0F; - this.labelStaticChattering.Location = new System.Drawing.Point(33, 294); + this.labelStaticChattering.Location = new System.Drawing.Point(203, 176); this.labelStaticChattering.Name = "labelStaticChattering"; this.labelStaticChattering.Size = new System.Drawing.Size(215, 30); this.labelStaticChattering.TabIndex = 127; this.labelStaticChattering.Text = "채터링감지"; this.labelStaticChattering.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelStaticChattering.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelStaticChattering.Visible = false; this.labelStaticChattering.Wordwrap = false; // // labelStaticRelayRunTime @@ -369,14 +367,13 @@ this.labelStaticRelayRunTime.ForeColor = System.Drawing.Color.White; this.labelStaticRelayRunTime.InitVisible = true; this.labelStaticRelayRunTime.LineSpacing = 0F; - this.labelStaticRelayRunTime.Location = new System.Drawing.Point(33, 366); + this.labelStaticRelayRunTime.Location = new System.Drawing.Point(203, 212); this.labelStaticRelayRunTime.Name = "labelStaticRelayRunTime"; this.labelStaticRelayRunTime.Size = new System.Drawing.Size(215, 30); this.labelStaticRelayRunTime.TabIndex = 126; this.labelStaticRelayRunTime.Text = "릴레이 동작 시간"; this.labelStaticRelayRunTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelStaticRelayRunTime.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelStaticRelayRunTime.Visible = false; this.labelStaticRelayRunTime.Wordwrap = false; // // labelStaticBuzzerONTime @@ -391,14 +388,13 @@ this.labelStaticBuzzerONTime.ForeColor = System.Drawing.Color.White; this.labelStaticBuzzerONTime.InitVisible = true; this.labelStaticBuzzerONTime.LineSpacing = 0F; - this.labelStaticBuzzerONTime.Location = new System.Drawing.Point(33, 258); + this.labelStaticBuzzerONTime.Location = new System.Drawing.Point(203, 140); this.labelStaticBuzzerONTime.Name = "labelStaticBuzzerONTime"; this.labelStaticBuzzerONTime.Size = new System.Drawing.Size(215, 30); this.labelStaticBuzzerONTime.TabIndex = 128; this.labelStaticBuzzerONTime.Text = "부저 ON 시간"; this.labelStaticBuzzerONTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelStaticBuzzerONTime.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelStaticBuzzerONTime.Visible = false; this.labelStaticBuzzerONTime.Wordwrap = false; // // comboBoxLanguage @@ -406,7 +402,7 @@ this.comboBoxLanguage.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); this.comboBoxLanguage.Items.Add("한국어"); this.comboBoxLanguage.Items.Add("English"); - this.comboBoxLanguage.Location = new System.Drawing.Point(254, 330); + this.comboBoxLanguage.Location = new System.Drawing.Point(260, 352); this.comboBoxLanguage.Name = "comboBoxLanguage"; this.comboBoxLanguage.Size = new System.Drawing.Size(100, 28); this.comboBoxLanguage.TabIndex = 120; @@ -425,7 +421,7 @@ this.labelStaticLanguage.ForeColor = System.Drawing.Color.White; this.labelStaticLanguage.InitVisible = true; this.labelStaticLanguage.LineSpacing = 0F; - this.labelStaticLanguage.Location = new System.Drawing.Point(33, 330); + this.labelStaticLanguage.Location = new System.Drawing.Point(39, 352); this.labelStaticLanguage.Name = "labelStaticLanguage"; this.labelStaticLanguage.Size = new System.Drawing.Size(215, 30); this.labelStaticLanguage.TabIndex = 117; @@ -447,7 +443,7 @@ this.labelStaticFirstRun.ForeColor = System.Drawing.Color.White; this.labelStaticFirstRun.InitVisible = true; this.labelStaticFirstRun.LineSpacing = 0F; - this.labelStaticFirstRun.Location = new System.Drawing.Point(376, 366); + this.labelStaticFirstRun.Location = new System.Drawing.Point(39, 388); this.labelStaticFirstRun.Name = "labelStaticFirstRun"; this.labelStaticFirstRun.Size = new System.Drawing.Size(215, 30); this.labelStaticFirstRun.TabIndex = 117; @@ -469,11 +465,13 @@ this.buttonInitialDrive.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonInitialDrive.DownImage"))); this.buttonInitialDrive.GroupID = 0; this.buttonInitialDrive.InitVisible = true; - this.buttonInitialDrive.Location = new System.Drawing.Point(597, 366); + this.buttonInitialDrive.Location = new System.Drawing.Point(260, 388); this.buttonInitialDrive.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonInitialDrive.Name = "buttonInitialDrive"; this.buttonInitialDrive.NestedClickEventPrevent = false; + this.buttonInitialDrive.OutlinePixel = 1; this.buttonInitialDrive.RepeatInterval = 200; + this.buttonInitialDrive.RepeatIntervalAccelerate = null; this.buttonInitialDrive.SafeInterval = 200; this.buttonInitialDrive.Size = new System.Drawing.Size(80, 28); this.buttonInitialDrive.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; diff --git a/INT51DB/Controls/CenterSystem/ControlCenterSystemHelp.Designer.cs b/INT51DB/Controls/CenterSystem/ControlCenterSystemHelp.Designer.cs index d1de363..5a858a0 100644 --- a/INT51DB/Controls/CenterSystem/ControlCenterSystemHelp.Designer.cs +++ b/INT51DB/Controls/CenterSystem/ControlCenterSystemHelp.Designer.cs @@ -77,11 +77,13 @@ this.buttonServo.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonServo.DownImage"))); this.buttonServo.GroupID = 0; this.buttonServo.InitVisible = true; - this.buttonServo.Location = new System.Drawing.Point(360, 240); + this.buttonServo.Location = new System.Drawing.Point(194, 240); this.buttonServo.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonServo.Name = "buttonServo"; this.buttonServo.NestedClickEventPrevent = false; + this.buttonServo.OutlinePixel = 1; this.buttonServo.RepeatInterval = 200; + this.buttonServo.RepeatIntervalAccelerate = null; this.buttonServo.SafeInterval = 200; this.buttonServo.Size = new System.Drawing.Size(160, 208); this.buttonServo.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -106,11 +108,13 @@ this.buttonExternalOutput.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonExternalOutput.DownImage"))); this.buttonExternalOutput.GroupID = 0; this.buttonExternalOutput.InitVisible = true; - this.buttonExternalOutput.Location = new System.Drawing.Point(28, 240); + this.buttonExternalOutput.Location = new System.Drawing.Point(360, 240); this.buttonExternalOutput.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonExternalOutput.Name = "buttonExternalOutput"; this.buttonExternalOutput.NestedClickEventPrevent = false; + this.buttonExternalOutput.OutlinePixel = 1; this.buttonExternalOutput.RepeatInterval = 200; + this.buttonExternalOutput.RepeatIntervalAccelerate = null; this.buttonExternalOutput.SafeInterval = 200; this.buttonExternalOutput.Size = new System.Drawing.Size(160, 208); this.buttonExternalOutput.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -121,6 +125,7 @@ this.buttonExternalOutput.TextLocation = new System.Drawing.Point(0, 0); this.buttonExternalOutput.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonExternalOutput.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonExternalOutput.UpImage"))); + this.buttonExternalOutput.Visible = false; this.buttonExternalOutput.Click += new System.EventHandler(this.buttonMenu_Click); // // buttonAutoZero @@ -139,7 +144,9 @@ this.buttonAutoZero.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonAutoZero.Name = "buttonAutoZero"; this.buttonAutoZero.NestedClickEventPrevent = false; + this.buttonAutoZero.OutlinePixel = 1; this.buttonAutoZero.RepeatInterval = 200; + this.buttonAutoZero.RepeatIntervalAccelerate = null; this.buttonAutoZero.SafeInterval = 200; this.buttonAutoZero.Size = new System.Drawing.Size(160, 208); this.buttonAutoZero.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -164,11 +171,13 @@ this.buttonIOTest.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonIOTest.DownImage"))); this.buttonIOTest.GroupID = 0; this.buttonIOTest.InitVisible = true; - this.buttonIOTest.Location = new System.Drawing.Point(194, 240); + this.buttonIOTest.Location = new System.Drawing.Point(28, 240); this.buttonIOTest.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonIOTest.Name = "buttonIOTest"; this.buttonIOTest.NestedClickEventPrevent = false; + this.buttonIOTest.OutlinePixel = 1; this.buttonIOTest.RepeatInterval = 200; + this.buttonIOTest.RepeatIntervalAccelerate = null; this.buttonIOTest.SafeInterval = 200; this.buttonIOTest.Size = new System.Drawing.Size(160, 208); this.buttonIOTest.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -197,7 +206,9 @@ this.buttonSorter.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonSorter.Name = "buttonSorter"; this.buttonSorter.NestedClickEventPrevent = false; + this.buttonSorter.OutlinePixel = 1; this.buttonSorter.RepeatInterval = 200; + this.buttonSorter.RepeatIntervalAccelerate = null; this.buttonSorter.SafeInterval = 200; this.buttonSorter.Size = new System.Drawing.Size(160, 208); this.buttonSorter.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -226,7 +237,9 @@ this.buttonJudgmentSetting.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonJudgmentSetting.Name = "buttonJudgmentSetting"; this.buttonJudgmentSetting.NestedClickEventPrevent = false; + this.buttonJudgmentSetting.OutlinePixel = 1; this.buttonJudgmentSetting.RepeatInterval = 200; + this.buttonJudgmentSetting.RepeatIntervalAccelerate = null; this.buttonJudgmentSetting.SafeInterval = 200; this.buttonJudgmentSetting.Size = new System.Drawing.Size(160, 208); this.buttonJudgmentSetting.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -255,7 +268,9 @@ this.buttonCalibration.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonCalibration.Name = "buttonCalibration"; this.buttonCalibration.NestedClickEventPrevent = false; + this.buttonCalibration.OutlinePixel = 1; this.buttonCalibration.RepeatInterval = 200; + this.buttonCalibration.RepeatIntervalAccelerate = null; this.buttonCalibration.SafeInterval = 200; this.buttonCalibration.Size = new System.Drawing.Size(160, 208); this.buttonCalibration.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; diff --git a/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.Designer.cs b/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.Designer.cs index a383c84..d7cbb3f 100644 --- a/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.Designer.cs +++ b/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.Designer.cs @@ -118,7 +118,7 @@ this.smartLabel10.ForeColor = System.Drawing.Color.White; this.smartLabel10.InitVisible = true; this.smartLabel10.LineSpacing = 0F; - this.smartLabel10.Location = new System.Drawing.Point(108, 248); + this.smartLabel10.Location = new System.Drawing.Point(106, 258); this.smartLabel10.Name = "smartLabel10"; this.smartLabel10.Size = new System.Drawing.Size(80, 35); this.smartLabel10.TabIndex = 462; @@ -137,7 +137,7 @@ this.labelSpeed1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelSpeed1.InitVisible = true; this.labelSpeed1.LineSpacing = 0F; - this.labelSpeed1.Location = new System.Drawing.Point(194, 248); + this.labelSpeed1.Location = new System.Drawing.Point(192, 258); this.labelSpeed1.Name = "labelSpeed1"; this.labelSpeed1.Size = new System.Drawing.Size(80, 35); this.labelSpeed1.TabIndex = 464; @@ -156,7 +156,7 @@ this.smartLabel1.ForeColor = System.Drawing.Color.White; this.smartLabel1.InitVisible = true; this.smartLabel1.LineSpacing = 0F; - this.smartLabel1.Location = new System.Drawing.Point(108, 84); + this.smartLabel1.Location = new System.Drawing.Point(106, 94); this.smartLabel1.Name = "smartLabel1"; this.smartLabel1.Size = new System.Drawing.Size(80, 35); this.smartLabel1.TabIndex = 461; @@ -177,7 +177,7 @@ this.buttonStart.DownImage = null; this.buttonStart.GroupID = 0; this.buttonStart.InitVisible = true; - this.buttonStart.Location = new System.Drawing.Point(527, 247); + this.buttonStart.Location = new System.Drawing.Point(523, 228); this.buttonStart.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonStart.Name = "buttonStart"; this.buttonStart.NestedClickEventPrevent = false; @@ -209,7 +209,7 @@ this.buttonStop.DownImage = null; this.buttonStop.GroupID = 0; this.buttonStop.InitVisible = true; - this.buttonStop.Location = new System.Drawing.Point(441, 247); + this.buttonStop.Location = new System.Drawing.Point(437, 228); this.buttonStop.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonStop.Name = "buttonStop"; this.buttonStop.NestedClickEventPrevent = false; @@ -241,7 +241,7 @@ this.buttonConveyorUp2.DownImage = null; this.buttonConveyorUp2.GroupID = 0; this.buttonConveyorUp2.InitVisible = true; - this.buttonConveyorUp2.Location = new System.Drawing.Point(527, 72); + this.buttonConveyorUp2.Location = new System.Drawing.Point(523, 53); this.buttonConveyorUp2.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonConveyorUp2.Name = "buttonConveyorUp2"; this.buttonConveyorUp2.NestedClickEventPrevent = false; @@ -259,6 +259,7 @@ this.buttonConveyorUp2.TextLocation = new System.Drawing.Point(0, 0); this.buttonConveyorUp2.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonConveyorUp2.UpImage = null; + this.buttonConveyorUp2.Visible = false; this.buttonConveyorUp2.Click += new System.EventHandler(this.buttonConveyorUp2_Click); // // smartLabel2 @@ -270,7 +271,7 @@ this.smartLabel2.ForeColor = System.Drawing.Color.White; this.smartLabel2.InitVisible = true; this.smartLabel2.LineSpacing = 0F; - this.smartLabel2.Location = new System.Drawing.Point(108, 125); + this.smartLabel2.Location = new System.Drawing.Point(106, 135); this.smartLabel2.Name = "smartLabel2"; this.smartLabel2.Size = new System.Drawing.Size(80, 35); this.smartLabel2.TabIndex = 2; @@ -291,7 +292,7 @@ this.buttonOrigin.DownImage = null; this.buttonOrigin.GroupID = 0; this.buttonOrigin.InitVisible = true; - this.buttonOrigin.Location = new System.Drawing.Point(441, 113); + this.buttonOrigin.Location = new System.Drawing.Point(437, 94); this.buttonOrigin.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonOrigin.Name = "buttonOrigin"; this.buttonOrigin.NestedClickEventPrevent = false; @@ -320,7 +321,7 @@ this.smartLabel3.ForeColor = System.Drawing.Color.White; this.smartLabel3.InitVisible = true; this.smartLabel3.LineSpacing = 0F; - this.smartLabel3.Location = new System.Drawing.Point(108, 166); + this.smartLabel3.Location = new System.Drawing.Point(106, 176); this.smartLabel3.Name = "smartLabel3"; this.smartLabel3.Size = new System.Drawing.Size(80, 35); this.smartLabel3.TabIndex = 3; @@ -338,7 +339,7 @@ this.smartLabel4.ForeColor = System.Drawing.Color.White; this.smartLabel4.InitVisible = true; this.smartLabel4.LineSpacing = 0F; - this.smartLabel4.Location = new System.Drawing.Point(108, 207); + this.smartLabel4.Location = new System.Drawing.Point(106, 217); this.smartLabel4.Name = "smartLabel4"; this.smartLabel4.Size = new System.Drawing.Size(80, 35); this.smartLabel4.TabIndex = 4; @@ -356,11 +357,11 @@ this.smartLabel5.ForeColor = System.Drawing.Color.White; this.smartLabel5.InitVisible = true; this.smartLabel5.LineSpacing = 0F; - this.smartLabel5.Location = new System.Drawing.Point(108, 330); + this.smartLabel5.Location = new System.Drawing.Point(106, 299); this.smartLabel5.Name = "smartLabel5"; this.smartLabel5.Size = new System.Drawing.Size(80, 35); this.smartLabel5.TabIndex = 5; - this.smartLabel5.Text = "Up1"; + this.smartLabel5.Text = "Up"; this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.smartLabel5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel5.Wordwrap = false; @@ -374,7 +375,7 @@ this.smartLabel6.ForeColor = System.Drawing.Color.White; this.smartLabel6.InitVisible = true; this.smartLabel6.LineSpacing = 0F; - this.smartLabel6.Location = new System.Drawing.Point(108, 371); + this.smartLabel6.Location = new System.Drawing.Point(106, 340); this.smartLabel6.Name = "smartLabel6"; this.smartLabel6.Size = new System.Drawing.Size(80, 35); this.smartLabel6.TabIndex = 6; @@ -395,7 +396,7 @@ this.buttonConveyorDown.DownImage = null; this.buttonConveyorDown.GroupID = 0; this.buttonConveyorDown.InitVisible = true; - this.buttonConveyorDown.Location = new System.Drawing.Point(527, 154); + this.buttonConveyorDown.Location = new System.Drawing.Point(523, 135); this.buttonConveyorDown.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonConveyorDown.Name = "buttonConveyorDown"; this.buttonConveyorDown.NestedClickEventPrevent = false; @@ -424,13 +425,14 @@ this.smartLabel7.ForeColor = System.Drawing.Color.White; this.smartLabel7.InitVisible = true; this.smartLabel7.LineSpacing = 0F; - this.smartLabel7.Location = new System.Drawing.Point(108, 289); + this.smartLabel7.Location = new System.Drawing.Point(106, 381); this.smartLabel7.Name = "smartLabel7"; this.smartLabel7.Size = new System.Drawing.Size(80, 35); this.smartLabel7.TabIndex = 6; this.smartLabel7.Text = "Up2"; this.smartLabel7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.smartLabel7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel7.Visible = false; this.smartLabel7.Wordwrap = false; // // buttonConveyorUp @@ -445,7 +447,7 @@ this.buttonConveyorUp.DownImage = null; this.buttonConveyorUp.GroupID = 0; this.buttonConveyorUp.InitVisible = true; - this.buttonConveyorUp.Location = new System.Drawing.Point(527, 113); + this.buttonConveyorUp.Location = new System.Drawing.Point(523, 94); this.buttonConveyorUp.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonConveyorUp.Name = "buttonConveyorUp"; this.buttonConveyorUp.NestedClickEventPrevent = false; @@ -456,7 +458,7 @@ this.buttonConveyorUp.Size = new System.Drawing.Size(80, 35); this.buttonConveyorUp.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.buttonConveyorUp.TabIndex = 446; - this.buttonConveyorUp.Text = "Up1"; + this.buttonConveyorUp.Text = "Up"; this.buttonConveyorUp.TextColor = System.Drawing.Color.Black; this.buttonConveyorUp.TextDownColor = System.Drawing.Color.White; this.buttonConveyorUp.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; @@ -477,7 +479,7 @@ this.buttonAlarmRead.DownImage = null; this.buttonAlarmRead.GroupID = 0; this.buttonAlarmRead.InitVisible = true; - this.buttonAlarmRead.Location = new System.Drawing.Point(441, 330); + this.buttonAlarmRead.Location = new System.Drawing.Point(437, 311); this.buttonAlarmRead.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonAlarmRead.Name = "buttonAlarmRead"; this.buttonAlarmRead.NestedClickEventPrevent = false; @@ -509,7 +511,7 @@ this.buttonParameterRead.DownImage = null; this.buttonParameterRead.GroupID = 0; this.buttonParameterRead.InitVisible = true; - this.buttonParameterRead.Location = new System.Drawing.Point(280, 248); + this.buttonParameterRead.Location = new System.Drawing.Point(278, 258); this.buttonParameterRead.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonParameterRead.Name = "buttonParameterRead"; this.buttonParameterRead.NestedClickEventPrevent = false; @@ -541,7 +543,7 @@ this.buttonClose.DownImage = null; this.buttonClose.GroupID = 0; this.buttonClose.InitVisible = true; - this.buttonClose.Location = new System.Drawing.Point(280, 166); + this.buttonClose.Location = new System.Drawing.Point(278, 176); this.buttonClose.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonClose.Name = "buttonClose"; this.buttonClose.NestedClickEventPrevent = false; @@ -573,7 +575,7 @@ this.buttonOpen.DownImage = null; this.buttonOpen.GroupID = 0; this.buttonOpen.InitVisible = true; - this.buttonOpen.Location = new System.Drawing.Point(280, 125); + this.buttonOpen.Location = new System.Drawing.Point(278, 135); this.buttonOpen.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonOpen.Name = "buttonOpen"; this.buttonOpen.NestedClickEventPrevent = false; @@ -605,7 +607,7 @@ this.labelModusStatus.ForeColor = System.Drawing.Color.White; this.labelModusStatus.InitVisible = true; this.labelModusStatus.LineSpacing = 0F; - this.labelModusStatus.Location = new System.Drawing.Point(280, 84); + this.labelModusStatus.Location = new System.Drawing.Point(278, 94); this.labelModusStatus.Name = "labelModusStatus"; this.labelModusStatus.Size = new System.Drawing.Size(80, 35); this.labelModusStatus.TabIndex = 439; @@ -624,7 +626,7 @@ this.labelMotorAlarmRead.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.labelMotorAlarmRead.InitVisible = true; this.labelMotorAlarmRead.LineSpacing = 0F; - this.labelMotorAlarmRead.Location = new System.Drawing.Point(441, 371); + this.labelMotorAlarmRead.Location = new System.Drawing.Point(437, 352); this.labelMotorAlarmRead.Name = "labelMotorAlarmRead"; this.labelMotorAlarmRead.Size = new System.Drawing.Size(166, 25); this.labelMotorAlarmRead.TabIndex = 438; @@ -646,7 +648,7 @@ this.buttonAlarmReset2.DownImage = null; this.buttonAlarmReset2.GroupID = 0; this.buttonAlarmReset2.InitVisible = true; - this.buttonAlarmReset2.Location = new System.Drawing.Point(527, 330); + this.buttonAlarmReset2.Location = new System.Drawing.Point(523, 311); this.buttonAlarmReset2.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonAlarmReset2.Name = "buttonAlarmReset2"; this.buttonAlarmReset2.NestedClickEventPrevent = false; @@ -676,7 +678,7 @@ this.smartLabel23.BorderStyle = System.Windows.Forms.BorderStyle.None; this.smartLabel23.InitVisible = true; this.smartLabel23.LineSpacing = 0F; - this.smartLabel23.Location = new System.Drawing.Point(194, 84); + this.smartLabel23.Location = new System.Drawing.Point(192, 94); this.smartLabel23.Name = "smartLabel23"; this.smartLabel23.Size = new System.Drawing.Size(80, 35); this.smartLabel23.TabIndex = 16; @@ -695,7 +697,7 @@ this.labelOrigin.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOrigin.InitVisible = true; this.labelOrigin.LineSpacing = 0F; - this.labelOrigin.Location = new System.Drawing.Point(194, 125); + this.labelOrigin.Location = new System.Drawing.Point(192, 135); this.labelOrigin.Name = "labelOrigin"; this.labelOrigin.Size = new System.Drawing.Size(80, 35); this.labelOrigin.TabIndex = 17; @@ -715,7 +717,7 @@ this.labelORGSpeed.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelORGSpeed.InitVisible = true; this.labelORGSpeed.LineSpacing = 0F; - this.labelORGSpeed.Location = new System.Drawing.Point(194, 166); + this.labelORGSpeed.Location = new System.Drawing.Point(192, 176); this.labelORGSpeed.Name = "labelORGSpeed"; this.labelORGSpeed.Size = new System.Drawing.Size(80, 35); this.labelORGSpeed.TabIndex = 18; @@ -735,7 +737,7 @@ this.labelSpeed0.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelSpeed0.InitVisible = true; this.labelSpeed0.LineSpacing = 0F; - this.labelSpeed0.Location = new System.Drawing.Point(194, 207); + this.labelSpeed0.Location = new System.Drawing.Point(192, 217); this.labelSpeed0.Name = "labelSpeed0"; this.labelSpeed0.Size = new System.Drawing.Size(80, 35); this.labelSpeed0.TabIndex = 19; @@ -755,7 +757,7 @@ this.labelPosition0.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelPosition0.InitVisible = true; this.labelPosition0.LineSpacing = 0F; - this.labelPosition0.Location = new System.Drawing.Point(194, 330); + this.labelPosition0.Location = new System.Drawing.Point(192, 299); this.labelPosition0.Name = "labelPosition0"; this.labelPosition0.Size = new System.Drawing.Size(80, 35); this.labelPosition0.TabIndex = 20; @@ -775,7 +777,7 @@ this.labelPosition1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelPosition1.InitVisible = true; this.labelPosition1.LineSpacing = 0F; - this.labelPosition1.Location = new System.Drawing.Point(194, 371); + this.labelPosition1.Location = new System.Drawing.Point(192, 340); this.labelPosition1.Name = "labelPosition1"; this.labelPosition1.Size = new System.Drawing.Size(80, 35); this.labelPosition1.TabIndex = 22; @@ -795,13 +797,14 @@ this.labelPosition9.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelPosition9.InitVisible = true; this.labelPosition9.LineSpacing = 0F; - this.labelPosition9.Location = new System.Drawing.Point(194, 289); + this.labelPosition9.Location = new System.Drawing.Point(192, 381); this.labelPosition9.Name = "labelPosition9"; this.labelPosition9.Size = new System.Drawing.Size(80, 35); this.labelPosition9.TabIndex = 21; this.labelPosition9.Text = "0"; this.labelPosition9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelPosition9.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelPosition9.Visible = false; this.labelPosition9.Wordwrap = false; this.labelPosition9.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); // diff --git a/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.cs b/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.cs index 6df90a0..5ab84e2 100644 --- a/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.cs +++ b/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.cs @@ -288,7 +288,7 @@ namespace INT51DB.Controls fValue = Convert.ToSingle(this.labelOrigin.Text); - this.ServoMotorWrite(2, ServoMotorParameterAddress.OriginOffset, fValue); + this.ServoMotorWrite(1, ServoMotorParameterAddress.OriginOffset, fValue); } } #endregion @@ -312,7 +312,7 @@ namespace INT51DB.Controls fValue = Convert.ToSingle(this.labelORGSpeed.Text); - this.ServoMotorWrite(2, ServoMotorParameterAddress.ORGSpeed0, fValue); + this.ServoMotorWrite(1, ServoMotorParameterAddress.ORGSpeed0, fValue); } } #endregion @@ -336,7 +336,7 @@ namespace INT51DB.Controls fValue = Convert.ToSingle(this.labelSpeed0.Text); - this.ServoMotorWrite(2, ServoMotorParameterAddress.GropSpeed0, fValue); + this.ServoMotorWrite(1, ServoMotorParameterAddress.GropSpeed0, fValue); } } #endregion @@ -360,7 +360,7 @@ namespace INT51DB.Controls fValue = Convert.ToSingle(this.labelSpeed1.Text); - this.ServoMotorWrite(2, ServoMotorParameterAddress.GropSpeed1, fValue); + this.ServoMotorWrite(1, ServoMotorParameterAddress.GropSpeed1, fValue); } } #endregion @@ -384,8 +384,7 @@ namespace INT51DB.Controls fValue = Convert.ToSingle(this.labelPosition0.Text); - this.ServoMotorWrite(2, ServoMotorParameterAddress.PositionCMD0, fValue); - this.ServoMotorWrite(2, ServoMotorParameterAddress.PositionCMD8, fValue); + this.ServoMotorWrite(1, ServoMotorParameterAddress.PositionCMD0, fValue); } } #endregion @@ -409,7 +408,7 @@ namespace INT51DB.Controls fValue = Convert.ToSingle(this.labelPosition1.Text); - this.ServoMotorWrite(2, ServoMotorParameterAddress.PositionCMD1, fValue); + this.ServoMotorWrite(1, ServoMotorParameterAddress.PositionCMD1, fValue); } } #endregion @@ -433,7 +432,7 @@ namespace INT51DB.Controls fValue = Convert.ToSingle(this.labelPosition9.Text); - this.ServoMotorWrite(2, ServoMotorParameterAddress.PositionCMD9, fValue); + this.ServoMotorWrite(1, ServoMotorParameterAddress.PositionCMD9, fValue); } } #endregion @@ -513,7 +512,7 @@ namespace INT51DB.Controls } private void buttonOrigin_Click(object sender, EventArgs e) { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.MotorOrigin, CommunicationID.SubBoard1); + this.ParentForm.ParentForm.TransferData(CommunicationCommand.MotorOrigin, CommunicationID.MainBoard); } private void buttonStop_Click(object sender, EventArgs e) { diff --git a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.Designer.cs b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.Designer.cs index 7d0c522..9c5bb93 100644 --- a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.Designer.cs +++ b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.Designer.cs @@ -29,7 +29,6 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlMainDisplayFunction1)); - this.buttonServoUp2 = new SmartX.SmartButton(); this.buttonServoUp1 = new SmartX.SmartButton(); this.buttonServoDown = new SmartX.SmartButton(); this.buttonServoSetup = new SmartX.SmartButton(); @@ -41,37 +40,6 @@ this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); // - // buttonServoUp2 - // - this.buttonServoUp2.BackPictureBox = null; - this.buttonServoUp2.BackPictureBox1 = null; - this.buttonServoUp2.BackPictureBox2 = null; - this.buttonServoUp2.ButtonColor = System.Drawing.Color.Gray; - this.buttonServoUp2.ButtonImageAutoSize = true; - this.buttonServoUp2.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonServoUp2.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonServoUp2.DisableImage"))); - this.buttonServoUp2.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonServoUp2.DownImage"))); - this.buttonServoUp2.GroupID = 0; - this.buttonServoUp2.InitVisible = true; - this.buttonServoUp2.Location = new System.Drawing.Point(34, 55); - this.buttonServoUp2.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.buttonServoUp2.Name = "buttonServoUp2"; - this.buttonServoUp2.NestedClickEventPrevent = false; - this.buttonServoUp2.OutlinePixel = 1; - this.buttonServoUp2.RepeatInterval = 200; - this.buttonServoUp2.RepeatIntervalAccelerate = null; - this.buttonServoUp2.SafeInterval = 200; - this.buttonServoUp2.Size = new System.Drawing.Size(100, 100); - this.buttonServoUp2.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonServoUp2.TabIndex = 2; - this.buttonServoUp2.TextColor = System.Drawing.Color.Black; - this.buttonServoUp2.TextDownColor = System.Drawing.Color.White; - this.buttonServoUp2.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonServoUp2.TextLocation = new System.Drawing.Point(0, 0); - this.buttonServoUp2.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonServoUp2.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonServoUp2.UpImage"))); - this.buttonServoUp2.Click += new System.EventHandler(this.buttonServoUp2_Click); - // // buttonServoUp1 // this.buttonServoUp1.BackPictureBox = null; @@ -84,7 +52,7 @@ this.buttonServoUp1.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonServoUp1.DownImage"))); this.buttonServoUp1.GroupID = 0; this.buttonServoUp1.InitVisible = true; - this.buttonServoUp1.Location = new System.Drawing.Point(140, 55); + this.buttonServoUp1.Location = new System.Drawing.Point(113, 46); this.buttonServoUp1.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonServoUp1.Name = "buttonServoUp1"; this.buttonServoUp1.NestedClickEventPrevent = false; @@ -115,7 +83,7 @@ this.buttonServoDown.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonServoDown.DownImage"))); this.buttonServoDown.GroupID = 0; this.buttonServoDown.InitVisible = true; - this.buttonServoDown.Location = new System.Drawing.Point(246, 55); + this.buttonServoDown.Location = new System.Drawing.Point(219, 46); this.buttonServoDown.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonServoDown.Name = "buttonServoDown"; this.buttonServoDown.NestedClickEventPrevent = false; @@ -146,7 +114,7 @@ this.buttonServoSetup.DownImage = null; this.buttonServoSetup.GroupID = 0; this.buttonServoSetup.InitVisible = true; - this.buttonServoSetup.Location = new System.Drawing.Point(34, 174); + this.buttonServoSetup.Location = new System.Drawing.Point(124, 168); this.buttonServoSetup.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonServoSetup.Name = "buttonServoSetup"; this.buttonServoSetup.NestedClickEventPrevent = false; @@ -177,7 +145,6 @@ this.smartGroupBox1.Controls.Add(this.buttonServoSetup); this.smartGroupBox1.Controls.Add(this.buttonServoDown); this.smartGroupBox1.Controls.Add(this.buttonServoUp1); - this.smartGroupBox1.Controls.Add(this.buttonServoUp2); this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.Black; this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black; this.smartGroupBox1.FrameLineThickness = 1; @@ -204,7 +171,7 @@ this.smartLabel4.ForeColor = System.Drawing.Color.White; this.smartLabel4.InitVisible = true; this.smartLabel4.LineSpacing = 0F; - this.smartLabel4.Location = new System.Drawing.Point(460, 119); + this.smartLabel4.Location = new System.Drawing.Point(406, 116); this.smartLabel4.Name = "smartLabel4"; this.smartLabel4.Size = new System.Drawing.Size(100, 30); this.smartLabel4.TabIndex = 463; @@ -225,7 +192,7 @@ this.smartLabel3.ForeColor = System.Drawing.Color.White; this.smartLabel3.InitVisible = true; this.smartLabel3.LineSpacing = 0F; - this.smartLabel3.Location = new System.Drawing.Point(460, 83); + this.smartLabel3.Location = new System.Drawing.Point(406, 80); this.smartLabel3.Name = "smartLabel3"; this.smartLabel3.Size = new System.Drawing.Size(100, 30); this.smartLabel3.TabIndex = 462; @@ -245,7 +212,7 @@ this.labelDownDelayTime.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); this.labelDownDelayTime.InitVisible = true; this.labelDownDelayTime.LineSpacing = 0F; - this.labelDownDelayTime.Location = new System.Drawing.Point(566, 119); + this.labelDownDelayTime.Location = new System.Drawing.Point(512, 116); this.labelDownDelayTime.Name = "labelDownDelayTime"; this.labelDownDelayTime.Size = new System.Drawing.Size(100, 30); this.labelDownDelayTime.TabIndex = 461; @@ -266,7 +233,7 @@ this.labelUpDelayTime.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); this.labelUpDelayTime.InitVisible = true; this.labelUpDelayTime.LineSpacing = 0F; - this.labelUpDelayTime.Location = new System.Drawing.Point(566, 83); + this.labelUpDelayTime.Location = new System.Drawing.Point(512, 80); this.labelUpDelayTime.Name = "labelUpDelayTime"; this.labelUpDelayTime.Size = new System.Drawing.Size(100, 30); this.labelUpDelayTime.TabIndex = 460; @@ -290,7 +257,6 @@ #endregion - private SmartX.SmartButton buttonServoUp2; private SmartX.SmartButton buttonServoUp1; private SmartX.SmartButton buttonServoDown; private SmartX.SmartButton buttonServoSetup; diff --git a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.cs b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.cs index ab487e4..67b758f 100644 --- a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.cs +++ b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.cs @@ -83,13 +83,11 @@ namespace INT51DB.Controls { this.buttonServoDown.Enabled = false; this.buttonServoUp1.Enabled = false; - this.buttonServoUp2.Enabled = false; } else { this.buttonServoDown.Enabled = true; this.buttonServoUp1.Enabled = true; - this.buttonServoUp2.Enabled = true; } this.UpdateControl(this.ParentForm.ParentForm.CurrentJudgmentSetItem); @@ -106,15 +104,6 @@ namespace INT51DB.Controls this.ParentForm.VisibleMenuButton(true); } } - private void buttonServoUp2_Click(object sender, EventArgs e) - { - DialogFormYesNo msg = new DialogFormYesNo(this.ParentForm.ParentForm.SystemConfig.Language, 15); - if (msg.ShowDialog() == DialogResult.Yes) - { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.MotorUp2, CommunicationID.MainBoard); - this.ParentForm.VisibleMenuButton(false); - } - } private void buttonServoDown_Click(object sender, EventArgs e) { DialogFormYesNo msg = new DialogFormYesNo(this.ParentForm.ParentForm.SystemConfig.Language, 13); diff --git a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.resx b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.resx index b83360a..0744e93 100644 --- a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.resx +++ b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.resx @@ -118,249 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 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 - B9pcctTZ4iVEAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAIAAAD/gAIDAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH - DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp - bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE - sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs - AIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4 - JUuQLrbPipgalyxmGCVmvihBEcuJOWGRDT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR - 3xKxRoowlSviN+LYVA4zAwAUSWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQd - li7d1NqaQffkZKVwBALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtF - ehn4uWcQrf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX - wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGceA6fwxNF - hImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR+8Vd/6NvvvgwIH55 - 4SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd6ABDYAasgC1wBG7AG/iDEBAJ - VgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB - 5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50GaoGCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyC - qbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+AdcCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiE - j6xHipAKpAFpRbqRPuQmMorMIG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I - 1kfboL3QEegEdBa6EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9 - rB3WH8vECrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG - fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemRXEjRJCFp - B+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSReUlPSSXK1ZK5kheQJ - yeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJaMm4ybJkCmYMyF2TGKQhFneJC - YVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sielh2lITQtmhcthVZKO04bpr1borTEaQln - yfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bfJd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48v - vacIK+opBimuVTyo2K84p6Ss5KGUrlSldEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0Cvp - vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L - Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA - bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z - llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW - ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s - xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6 - eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw - YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR - XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm - WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl - xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2 - dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8 - V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za - Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v - Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb - PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/ - 0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h - /HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr - XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS - fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ - tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOwwAADsMBx2+oZAAAC1JJREFUeF7tXPlTU1kW - dt9QcQEFQSFATFgie0BAdkRB2RQQEFG2JCABEhIhBGi7xQUBy41ttG2bFnvKsqqLGae0s7EI/Fvz0Zd6 - nb4gZnshwDv1/ZC8PJNzzr33O9vDLZxwwgknnHDCCSeccMIJJ5xw4jqydevW7du37dixfefOHQBe4C0u - Ln3MCSPwy+7dO93c9hw6tP/o0YMAXuAtLuKjpZs4gWzbthVOgXd8fDz4fN+wMB6AF3iLi/gINyzduskF - B23Xrh1wCo/nHRMjyM6OvXIlGcCL2FhBQID34cMH4C/uPC56Ctx08OA+f3+vxMSw8vIMtfpaqrHmrLEG - LyoqMpOSRPgIN+C2ze4vuADE5OvrGRcXfOPG+QcP6spmZP46tb/uTtGs5OHDOlzER7gBt+HmpX+2CQXM - vW/fbi+vI5GR/NLStPv3aztmlTydEp4C8EL9VYmL+Ag3HD9+eO/e3ZuU7MHZe/bs8vQ8BC7Pz0/s7r4x - 8qeWr5MTTxHg7fAXrVZ7PS8vITTU38PDfTOSPQl/R44cEAhOXrggVqlKxz9ow4w4gH97ikBklL5/r1Uo - is+fj0F8RBxANNhE5MWEP0S69PTIpqbCX365kzBTT7mJQcps/evXKpksLzn5DMj+wIFNQ/Yk/MHgU6eO - IfzV1uYOD7fmzUkpB1GoWGh89qypqiobZI/kC2S/KciLkPqJE0eRUiEzGBxskC20+OtUlHcogOy182qQ - fXFxSkRE0KYge5gHI48dOxQeHoi086efqvtmNAG6Vso1K+K0vunV526Q/eXLZ0NC/FAPbWSyJ6QOI2Hq - pUtnOzrK3/y3S6BvpJyyCsJN0okJbWvr1ays6I1M9jAJnkLhAiMR12AwzI4wSSh3fBdps5JXr9okksvn - zon8/I5vQLKHMTt37nB3d0P4S02NaGjIR3RLm/1m+FsV6sqF20+f3kZmLxYLQfZgwA1FXlj8/fv3njx5 - 7OzZkFu3Lrx4IS+db1jmBUsRoFN0z6l7e2tA9uA+MCB4cIOQFwl/3t5Ho6NPl5Wl9/VJVPOoadooF1gF - gf72m0/dGk0FuC84eKOQPQxATYPFP3MmoKjo3A8/VD01dQbqminjbUCkSfLuXWdLy5XMzOigIJ91T/ZM - +BMKT+XkxN25U/b2j65gwwo1jW3I+ioZG1NuBLKH0qSmwbJnZEQ1N18ZH+8QT1kd/laFunqh6cmTxsrK - rNhYARLddUn28BQWmbT0sOxYfGyBC18d66lFIKG9P9t+71711aspOOnrkuzhKfOWHiI9tgBp6TkcSGuR - 3CLFzc2Nx3lfZ2RPwh9p6ZWUpD54UNcztxjvKSMdiJip+t9+0+Ck47wHBp7A2Udatw7Ii4Q/T89DoaH+ - +fmJXV2VI39qUdZR5jkc579KRkcVdXW5iYlhp04dI2S/pJNrCgl/TEuvra1k/INWZPxO+8VBUNUvNA8O - NlRUZMbECJDWuTTZY9tj81MtvcRvt/QcDpB934zmxx9vIaEjZI897orkRcIf1dIrmHdYSmUhgg0N45Pd - 7e1lSOtcl+wJqTMtvYEB2W0LWnpsAKkcEjq5vAi7G3vc5cgeniItPWx+s5YenEVb4hzkzklHRlqxu12O - 7AmpUy09oTUtveUIMTWHmOwJoCrZQgt2t2uRPbY3PEW19KJNdpG60IiMbDF9DTZZ1G5eEYG6loEpVyJ7 - Ev7c3d14vL9behn21TR8Q5v5RBpvmY+sBSp21O2o3i9eFIPskdBgXdeMvEAEVEuvbB6nz/aaJkCvpro3 - eIuL5lesQvx0/du37Uhi0tIiQPZY17UhexL+lrX0ljaFDeChyjPcpi4CwpUuWo68OSmSmJqanISEUKwr - VtfZZI/Dz7T0CguTSEuPekzBWqzC6PaQPU/XJl9offxYihXFujqb7JnwZ97SCzXYVdOEmL6TZwhNttfh - OMtYy56eqoKCpLAwHupWJ5E9Dvzyll78tF2kLjDi8H5/Im0P2YcaZO8+dqlUpahYUbc6g+zx7aSm8fM7 - zrT0cubs8lSQQWXhRDpIbxfZJ8zUo1ZtbCxA4HYG2cNTbm57fHw8/tnSs72m4enVfGu6N0KjXWRfOC97 - +bIZgRvh29fXk0WyJwcQGxhUlZsbj0y93dhq4ab4FoKtNz7EZHsYAdm3zLSQpyXIAI2tgRC+FLzo5XUk - KoqPyNLxr3qB3q51ttVs9V8pPnXRUiBkt7+VMGUQSlpWnIXwgaBL2upVVdkig11UJbSjlAnQKewh+zCD - 9KY0h5xEsAorYRG5CZlBiMXCOP0tSgOrcHqxprFrIs3Xy8F31EXLIdbfwpKTHJWVnAsrQPow4CxUD9jJ - SmVJb28NaH5oqGVkpHVFIFz+/LP699+7dLrHJtMg8L+px7F2JPoMbprayBcCk5O9yGBevWobHVVQChAg - iYee0BY6V1ZmpadHgrNgC84KKzsLZxu5CSIuomFoqH9iYhgKVNT0166lw3Er4vr1rJs3L0illxEN4FC9 - vl9vGrhkcNiY5/60Fp76+PEuii2Fori2NhcxmtKBAfSEttA5KUkE/XFEkC2ylW3hSxFosbnwG6B5f3+v - 06d98asiUQCKnhURGckHNSAPrK6++OhR/efPjxqnbD87yxGgU49P35uY0GIxSkpSkUCBtsPDAyk1CKAn - tIXO0Bz6wwrYAotYcRaE+AvhFj8D/kJ2evDgPuy15YAqSDIQbqBccvIZ1LHPnjX1TXdR1tqPcJ3y/ae7 - 3d03sGsQppEto5rBr1P6EEBb6AzNoT+sYNFTVgmIADvcw8OdtE81moqhT53YCJSpDkGGQTE01komhuvv - 8RAoCk+Zt0/HPnSI7At/q0MypWKayOvp8RB4CjUXNjyP552SEi6T5Q2/USbrWZzdE/Qa/9FExkFjJcw5 - UAipmbdPnz5vKl1sKtC2ORxBOvXIfzqpiaFLH0bz9ilCNSKgerqdsoo9gOzHJu40NRW66MTQXJisFQeh - sDCpp6dqQNdJ2cM2cgyKl39NDBMSQpmJocv5i4Q/8/bp6GQnjgZljBMgm1L190sJ2Tu7iWyJYOnM26dy - eRGOQ6Qjahrb0GfovHv3pqtMDM2FkDrTPq2vv4SsJ8txNY0NWCT7SY1afc0lJoaMEE+R9qlYLERpNjjY - UG1iMaWyEDEg+3fqtZ8YmgsJf+SJyOLiFJT1d00dlN5rBVTsz4eaUZaaTwzXzF8gAtABeSIyLy9Bq73+ - /LOWpZrGNjRPqddsYmguWCIQAehAIDiZnR2rVJaMfuwIWYsHslZHv24tJobmAk+BAkAEoIPU1IjGxoKR - X1UJ+jULf6tAoFON/aFx6sTQXPBLJPwh6wMd1NTkgBoK7BgisI1YnXJ0XOW8iaG5kPDHPBEJUpBP0fq5 - GvKNiucv5dTEkHV/gSBJTUP+yBmF/kODhtLMNdE23Y5aFRVrVBTfGWTP1DTME5FDn9amprENT3Sd3d03 - 8vMTEb5ZJ3uGqsjD2wOvm1HoUwq5MkD2g7+2UH9yt2SbY4VEwMOHF3MFlBFKzbVzXxzwN5ZOhvhLi6qr - nPS8EBlZHN/jDGL3kv9nJ/PftZQe6wXpH+oKipJEogDYwlYawTgLBz71/mVKg/WF1Id5WHLSkGDLWaQP - w+N5x8UFFxWda2jIB1/290tfvJAPD9NDYNcBdIOGAwMypPLItqB5fHwIaaWyeAxBh8hQsCB8vm9srCAj - IwrnsaQktbw8g0x9XRbQsLQ0bZE9MqPFYiH0hxXsZltITHASEUQ8PNxRxwcF+QQH+2E/k5GviwN6Qlvo - DM1BJrACtrCYamER8O1YDfwMkjr83rcm0q4JMpGG5tAfkR22sLWtOOGEE0444YQTTjjhhBNOOOGEE06s - kS1b/g8CECfPzHsF1QAAAABJRU5ErkJggg== - - - - - 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 - QmCC - - iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAIAAAD/gAIDAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH diff --git a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction2.Designer.cs b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction2.Designer.cs index 805e514..d65c620 100644 --- a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction2.Designer.cs +++ b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction2.Designer.cs @@ -39,10 +39,6 @@ this.labelPosition10 = new SmartX.SmartLabel(); this.labelPosition11 = new SmartX.SmartLabel(); this.smartLabel32 = new SmartX.SmartLabel(); - this.labelSpeed20 = new SmartX.SmartLabel(); - this.smartLabel31 = new SmartX.SmartLabel(); - this.labelPosition20 = new SmartX.SmartLabel(); - this.labelPosition21 = new SmartX.SmartLabel(); this.buttonClose = new SmartX.SmartButton(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.SuspendLayout(); @@ -59,11 +55,13 @@ this.buttonParameterRead.DownImage = null; this.buttonParameterRead.GroupID = 0; this.buttonParameterRead.InitVisible = true; - this.buttonParameterRead.Location = new System.Drawing.Point(439, 146); + this.buttonParameterRead.Location = new System.Drawing.Point(332, 146); this.buttonParameterRead.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonParameterRead.Name = "buttonParameterRead"; this.buttonParameterRead.NestedClickEventPrevent = false; + this.buttonParameterRead.OutlinePixel = 1; this.buttonParameterRead.RepeatInterval = 200; + this.buttonParameterRead.RepeatIntervalAccelerate = null; this.buttonParameterRead.SafeInterval = 200; this.buttonParameterRead.Size = new System.Drawing.Size(80, 25); this.buttonParameterRead.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -89,11 +87,13 @@ this.buttonOpen.DownImage = null; this.buttonOpen.GroupID = 0; this.buttonOpen.InitVisible = true; - this.buttonOpen.Location = new System.Drawing.Point(439, 115); + this.buttonOpen.Location = new System.Drawing.Point(332, 115); this.buttonOpen.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonOpen.Name = "buttonOpen"; this.buttonOpen.NestedClickEventPrevent = false; + this.buttonOpen.OutlinePixel = 1; this.buttonOpen.RepeatInterval = 200; + this.buttonOpen.RepeatIntervalAccelerate = null; this.buttonOpen.SafeInterval = 200; this.buttonOpen.Size = new System.Drawing.Size(80, 25); this.buttonOpen.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -120,7 +120,7 @@ this.labelModusStatus.ForeColor = System.Drawing.Color.White; this.labelModusStatus.InitVisible = true; this.labelModusStatus.LineSpacing = 0F; - this.labelModusStatus.Location = new System.Drawing.Point(160, 53); + this.labelModusStatus.Location = new System.Drawing.Point(332, 84); this.labelModusStatus.Name = "labelModusStatus"; this.labelModusStatus.Size = new System.Drawing.Size(80, 25); this.labelModusStatus.TabIndex = 443; @@ -144,7 +144,7 @@ this.smartLabel4.Name = "smartLabel4"; this.smartLabel4.Size = new System.Drawing.Size(80, 25); this.smartLabel4.TabIndex = 447; - this.smartLabel4.Text = "속도0"; + this.smartLabel4.Text = "속도"; this.smartLabel4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.smartLabel4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel4.Wordwrap = false; @@ -164,7 +164,7 @@ this.smartLabel5.Name = "smartLabel5"; this.smartLabel5.Size = new System.Drawing.Size(80, 25); this.smartLabel5.TabIndex = 448; - this.smartLabel5.Text = "위치0"; + this.smartLabel5.Text = "Up"; this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.smartLabel5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel5.Wordwrap = false; @@ -184,9 +184,10 @@ this.smartLabel6.Name = "smartLabel6"; this.smartLabel6.Size = new System.Drawing.Size(80, 25); this.smartLabel6.TabIndex = 449; - this.smartLabel6.Text = "위치1"; + this.smartLabel6.Text = "Down"; this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel6.Visible = false; this.smartLabel6.Wordwrap = false; // // labelSpeed10 @@ -246,6 +247,7 @@ this.labelPosition11.Text = "0"; this.labelPosition11.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelPosition11.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelPosition11.Visible = false; this.labelPosition11.Wordwrap = false; this.labelPosition11.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); // @@ -260,95 +262,15 @@ this.smartLabel32.ForeColor = System.Drawing.Color.White; this.smartLabel32.InitVisible = true; this.smartLabel32.LineSpacing = 0F; - this.smartLabel32.Location = new System.Drawing.Point(246, 53); + this.smartLabel32.Location = new System.Drawing.Point(160, 53); this.smartLabel32.Name = "smartLabel32"; - this.smartLabel32.Size = new System.Drawing.Size(80, 25); + this.smartLabel32.Size = new System.Drawing.Size(252, 25); this.smartLabel32.TabIndex = 457; - this.smartLabel32.Text = "Conveyor"; + this.smartLabel32.Text = "서보 모터 설정"; this.smartLabel32.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.smartLabel32.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel32.Wordwrap = false; // - // labelSpeed20 - // - this.labelSpeed20.BackColor = System.Drawing.Color.White; - this.labelSpeed20.BackPictureBox = null; - this.labelSpeed20.BackPictureBox1 = null; - this.labelSpeed20.BackPictureBox2 = null; - this.labelSpeed20.BorderColor = System.Drawing.Color.Black; - this.labelSpeed20.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelSpeed20.InitVisible = true; - this.labelSpeed20.LineSpacing = 0F; - this.labelSpeed20.Location = new System.Drawing.Point(332, 84); - this.labelSpeed20.Name = "labelSpeed20"; - this.labelSpeed20.Size = new System.Drawing.Size(80, 25); - this.labelSpeed20.TabIndex = 453; - this.labelSpeed20.Text = "0"; - this.labelSpeed20.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelSpeed20.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelSpeed20.Wordwrap = false; - this.labelSpeed20.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); - // - // smartLabel31 - // - this.smartLabel31.BackColor = System.Drawing.Color.Black; - this.smartLabel31.BackPictureBox = null; - this.smartLabel31.BackPictureBox1 = null; - this.smartLabel31.BackPictureBox2 = null; - this.smartLabel31.BorderColor = System.Drawing.Color.Black; - this.smartLabel31.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel31.ForeColor = System.Drawing.Color.White; - this.smartLabel31.InitVisible = true; - this.smartLabel31.LineSpacing = 0F; - this.smartLabel31.Location = new System.Drawing.Point(332, 53); - this.smartLabel31.Name = "smartLabel31"; - this.smartLabel31.Size = new System.Drawing.Size(80, 25); - this.smartLabel31.TabIndex = 456; - this.smartLabel31.Text = "UpDown"; - this.smartLabel31.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel31.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel31.Wordwrap = false; - // - // labelPosition20 - // - this.labelPosition20.BackColor = System.Drawing.Color.White; - this.labelPosition20.BackPictureBox = null; - this.labelPosition20.BackPictureBox1 = null; - this.labelPosition20.BackPictureBox2 = null; - this.labelPosition20.BorderColor = System.Drawing.Color.Black; - this.labelPosition20.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelPosition20.InitVisible = true; - this.labelPosition20.LineSpacing = 0F; - this.labelPosition20.Location = new System.Drawing.Point(332, 115); - this.labelPosition20.Name = "labelPosition20"; - this.labelPosition20.Size = new System.Drawing.Size(80, 25); - this.labelPosition20.TabIndex = 454; - this.labelPosition20.Text = "0"; - this.labelPosition20.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelPosition20.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelPosition20.Wordwrap = false; - this.labelPosition20.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); - // - // labelPosition21 - // - this.labelPosition21.BackColor = System.Drawing.Color.White; - this.labelPosition21.BackPictureBox = null; - this.labelPosition21.BackPictureBox1 = null; - this.labelPosition21.BackPictureBox2 = null; - this.labelPosition21.BorderColor = System.Drawing.Color.Black; - this.labelPosition21.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelPosition21.InitVisible = true; - this.labelPosition21.LineSpacing = 0F; - this.labelPosition21.Location = new System.Drawing.Point(332, 146); - this.labelPosition21.Name = "labelPosition21"; - this.labelPosition21.Size = new System.Drawing.Size(80, 25); - this.labelPosition21.TabIndex = 455; - this.labelPosition21.Text = "0"; - this.labelPosition21.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelPosition21.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelPosition21.Wordwrap = false; - this.labelPosition21.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); - // // buttonClose // this.buttonClose.BackPictureBox = null; @@ -365,7 +287,9 @@ this.buttonClose.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonClose.Name = "buttonClose"; this.buttonClose.NestedClickEventPrevent = false; + this.buttonClose.OutlinePixel = 1; this.buttonClose.RepeatInterval = 200; + this.buttonClose.RepeatIntervalAccelerate = null; this.buttonClose.SafeInterval = 200; this.buttonClose.Size = new System.Drawing.Size(80, 25); this.buttonClose.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -399,10 +323,6 @@ this.Controls.Add(this.labelPosition10); this.Controls.Add(this.labelPosition11); this.Controls.Add(this.smartLabel32); - this.Controls.Add(this.labelSpeed20); - this.Controls.Add(this.smartLabel31); - this.Controls.Add(this.labelPosition20); - this.Controls.Add(this.labelPosition21); this.Controls.Add(this.buttonParameterRead); this.Controls.Add(this.buttonOpen); this.Controls.Add(this.labelModusStatus); @@ -425,10 +345,6 @@ private SmartX.SmartLabel labelPosition10; private SmartX.SmartLabel labelPosition11; private SmartX.SmartLabel smartLabel32; - private SmartX.SmartLabel labelSpeed20; - private SmartX.SmartLabel smartLabel31; - private SmartX.SmartLabel labelPosition20; - private SmartX.SmartLabel labelPosition21; private SmartX.SmartButton buttonClose; private System.Windows.Forms.PictureBox pictureBox1; } diff --git a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction2.cs b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction2.cs index cf74d9c..56a366a 100644 --- a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction2.cs +++ b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction2.cs @@ -165,11 +165,6 @@ namespace INT51DB.Controls this.labelPosition10.Text = this.ServoMotorRead(1, ServoMotorParameterAddress.PositionCMD0); this.labelPosition11.Text = this.ServoMotorRead(1, ServoMotorParameterAddress.PositionCMD1); - // ServoMotor 2 - this.labelSpeed20.Text = this.ServoMotorRead(2, ServoMotorParameterAddress.GropSpeed0); - this.labelPosition20.Text = this.ServoMotorRead(2, ServoMotorParameterAddress.PositionCMD0); - this.labelPosition21.Text = this.ServoMotorRead(2, ServoMotorParameterAddress.PositionCMD1); - splash.Finish(); this.Enabled = true; @@ -218,7 +213,7 @@ namespace INT51DB.Controls } else if (label == this.labelPosition10) { - #region Conveyor Motor Position 0 + #region Motor Position 0 - Up DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelPosition10.Text, 4, 0, true, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -236,14 +231,13 @@ namespace INT51DB.Controls fValue = Convert.ToSingle(this.labelPosition10.Text); this.ServoMotorWrite(1, ServoMotorParameterAddress.PositionCMD0, fValue); - this.ServoMotorWrite(1, ServoMotorParameterAddress.PositionCMD8, fValue); } } #endregion } else if (label == this.labelPosition11) { - #region Conveyor Motor Position 1 + #region Motor Position 1 - Down DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelPosition11.Text, 4, 0, true, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -265,79 +259,6 @@ namespace INT51DB.Controls } #endregion } - else if (label == this.labelSpeed20) - { - #region UpDown Motor Speed 0 - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelSpeed20.Text, 4, 0, false, this.ParentForm.ParentForm.SystemConfig.Language); - - if (myKeyPad.ShowDialog() == DialogResult.OK) - { - if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 9999) - { - // 입력범위를 확인하세요 - DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.ParentForm.SystemConfig.Language); - myMsg.ShowDialog(); - } - else - { - this.labelSpeed20.Text = myKeyPad.StringValue; - - fValue = Convert.ToSingle(this.labelSpeed20.Text); - - this.ServoMotorWrite(2, ServoMotorParameterAddress.GropSpeed0, fValue); - } - } - #endregion - } - else if (label == this.labelPosition20) - { - #region UpDown Motor Position 0 - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelPosition20.Text, 4, 0, true, this.ParentForm.ParentForm.SystemConfig.Language); - - if (myKeyPad.ShowDialog() == DialogResult.OK) - { - if (myKeyPad.doubleValue < -9999 || myKeyPad.doubleValue > 9999) - { - // 입력범위를 확인하세요 - DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.ParentForm.SystemConfig.Language); - myMsg.ShowDialog(); - } - else - { - this.labelPosition20.Text = myKeyPad.StringValue; - - fValue = Convert.ToSingle(this.labelPosition20.Text); - - this.ServoMotorWrite(2, ServoMotorParameterAddress.PositionCMD0, fValue); - this.ServoMotorWrite(2, ServoMotorParameterAddress.PositionCMD8, fValue); - } - } - #endregion - } - else if (label == this.labelPosition21) - { - #region UpDown Motor Position 1 - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelPosition21.Text, 4, 0, true, this.ParentForm.ParentForm.SystemConfig.Language); - - if (myKeyPad.ShowDialog() == DialogResult.OK) - { - if (myKeyPad.doubleValue < -9999 || myKeyPad.doubleValue > 9999) - { - // 입력범위를 확인하세요 - DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.ParentForm.SystemConfig.Language); - myMsg.ShowDialog(); - } - else - { - this.labelPosition21.Text = myKeyPad.StringValue; - - fValue = Convert.ToSingle(this.labelPosition21.Text); - - this.ServoMotorWrite(2, ServoMotorParameterAddress.PositionCMD1, fValue); - } - } - #endregion - } } private void buttonClose_Click(object sender, EventArgs e) diff --git a/INT51DB/DataStore.cs b/INT51DB/DataStore.cs index 8287045..68133e5 100644 --- a/INT51DB/DataStore.cs +++ b/INT51DB/DataStore.cs @@ -1127,12 +1127,8 @@ namespace INT51DB private bool m_IsLoadCellError; private bool m_IsEntrySensorError; private bool m_IsInverterError; - private bool m_IsEntrySensor1Error; - private bool m_IsDrainSensorError; - private bool m_IsEntrySensor2Error; private bool m_IsServoTorqueError; - private bool m_IsPressureSensingError; - private bool m_IsMetalError; + private bool m_IsEmpegencyStop; private DateTime m_StartTime; private DateTime m_StopTime; @@ -1197,36 +1193,16 @@ namespace INT51DB get { return this.m_IsInverterError; } set { this.m_IsInverterError = value; } } - public bool IsEntrySensor1Error - { - get { return this.m_IsEntrySensor1Error; } - set { this.m_IsEntrySensor1Error = value; } - } - public bool IsDrainSensorError - { - get { return this.m_IsDrainSensorError; } - set { this.m_IsDrainSensorError = value; } - } - public bool IsEntrySensor2Error - { - get { return this.m_IsEntrySensor2Error; } - set { this.m_IsEntrySensor2Error = value; } - } public bool IsServoTorqueError { get { return this.m_IsServoTorqueError; } set { this.m_IsServoTorqueError = value; } } - public bool IsPressureSensingError + public bool IsEmpegencyStop { - get { return this.m_IsPressureSensingError; } - set { this.m_IsPressureSensingError = value; } + get { return this.m_IsEmpegencyStop; } + set { this.m_IsEmpegencyStop = value; } } - public bool IsMetalError - { - get { return this.m_IsMetalError; } - set { this.m_IsMetalError = value; } - } public DateTime StartTime { @@ -1524,12 +1500,8 @@ namespace INT51DB this.IsLoadCellError = false; this.IsEntrySensorError = false; this.IsInverterError = false; - this.IsEntrySensor1Error = false; - this.IsDrainSensorError = false; - this.IsEntrySensor2Error = false; this.IsServoTorqueError = false; - this.IsPressureSensingError = false; - this.IsMetalError = false; + this.IsEmpegencyStop = false; this.StartTime = new DateTime(1111, 11, 11, 11, 11, 11); this.StopTime = new DateTime(1111, 11, 11, 11, 11, 11); this.UnderCount = 0; diff --git a/INT51DB/DialogForms/DialogFormYesNo.cs b/INT51DB/DialogForms/DialogFormYesNo.cs index 18dffd7..eefb2ba 100644 --- a/INT51DB/DialogForms/DialogFormYesNo.cs +++ b/INT51DB/DialogForms/DialogFormYesNo.cs @@ -83,7 +83,7 @@ namespace INT51DB.DialogForms break; case 14: this.labelErrorCode.Text = "컨베어"; - this.labelMessage.Text = "컨베어 UP1 위치로 이동 하시겠습니까?"; + this.labelMessage.Text = "컨베어 UP 위치로 이동 하시겠습니까?"; break; case 15: this.labelErrorCode.Text = "컨베어"; @@ -151,7 +151,7 @@ namespace INT51DB.DialogForms break; case 14: this.labelErrorCode.Text = "Conveyor"; - this.labelMessage.Text = "Move to conveyor UP1 position?"; + this.labelMessage.Text = "Move to conveyor UP position?"; break; case 15: this.labelErrorCode.Text = "Conveyor"; diff --git a/INT51DB/Forms/FormMain.cs b/INT51DB/Forms/FormMain.cs index a722d87..77e731b 100644 --- a/INT51DB/Forms/FormMain.cs +++ b/INT51DB/Forms/FormMain.cs @@ -207,56 +207,68 @@ namespace INT51DB.Forms sValue2 = Convert.ToString(Convert.ToInt16(alarm.Substring(1, 1), 16), 2).PadLeft((4 <= 1) ? 1 : 4, '0'); sValue3 = Convert.ToString(Convert.ToInt16(alarm.Substring(2, 1), 16), 2).PadLeft((4 <= 1) ? 1 : 4, '0'); - // 휠 끼임 에러(Torque) + // A12_ + if (sValue3[0] == '0') + { } + else + { } + // A11_비상 정지 + if (sValue3[1] == '0') + data.IsEmpegencyStop = false; + else + data.IsEmpegencyStop = true; + // A10_ + if (sValue3[2] == '0') + { } + else + { } + // A9_인버터 에러 if (sValue3[3] == '0') - data.IsServoTorqueError = false; - else - data.IsServoTorqueError = true; - - // 진입센서2 넘어짐 감지 에러 - if (sValue2[0] == '0') - data.IsEntrySensor2Error = false; - else - data.IsEntrySensor2Error = true; - // 배출센서 Full 에러 - if (sValue2[1] == '0') - data.IsDrainSensorError = false; - else - data.IsDrainSensorError = true; - // 진입센서1 Empt 에러 - if (sValue2[2] == '0') - data.IsEntrySensor1Error = false; - else - data.IsEntrySensor1Error = true; - // 인버터 에러 - if (sValue2[3] == '0') data.IsInverterError = false; else data.IsInverterError = true; - // 입력센서 에러 - if (sValue1[3] == '0') - data.IsEntrySensorError = false; + // A8_ + if (sValue2[0] == '0') + { } else - data.IsEntrySensorError = true; - - // 셀 에러 - if (sValue1[2] == '0') - data.IsLoadCellError = false; + { } + // A7_ + if (sValue2[1] == '0') + { } else - data.IsLoadCellError = true; + { } + // A6_ + if (sValue2[2] == '0') + { } + else + { } + // A5_ + if (sValue2[3] == '0') + { } + else + { } - // 서보 알람 - if (sValue1[1] == '0') - data.IsServoAlarm = false; - else - data.IsServoAlarm = true; - - // 서보온 + // A4_서보온 if (sValue1[0] == '0') data.IsServoOff = false; else data.IsServoOff = true; + // A3_서보 알람 + if (sValue1[1] == '0') + data.IsServoAlarm = false; + else + data.IsServoAlarm = true; + // A2_셀 에러 + if (sValue1[2] == '0') + data.IsLoadCellError = false; + else + data.IsLoadCellError = true; + // A1_입력센서 에러 + if (sValue1[3] == '0') + data.IsEntrySensorError = false; + else + data.IsEntrySensorError = true; } /// @@ -328,8 +340,8 @@ namespace INT51DB.Forms #region Test 용 통신 로그 fullPath = this.PathDataBackupFolder + "Communicationlog.txt"; this.smartFileCommunicationLog.FilePathName = fullPath; - this.smartFileCommunicationLog.Open(); - this.IsCommunicationLogOpen = true; + //this.smartFileCommunicationLog.Open(); + //this.IsCommunicationLogOpen = true; #endregion #region Error Check 용 통신 로그 diff --git a/INT51DB/Forms/FormMainDisplay.Designer.cs b/INT51DB/Forms/FormMainDisplay.Designer.cs index 3296046..ae99fc6 100644 --- a/INT51DB/Forms/FormMainDisplay.Designer.cs +++ b/INT51DB/Forms/FormMainDisplay.Designer.cs @@ -40,8 +40,6 @@ this.pictureBoxCommunicationStatus = new System.Windows.Forms.PictureBox(); this.pictureBoxIconUsbDesable = new System.Windows.Forms.PictureBox(); this.pictureBoxIconUsbEnable = new System.Windows.Forms.PictureBox(); - this.pictureBoxEntrySensorStatus = new System.Windows.Forms.PictureBox(); - this.pictureBoxDrainSensorStatus = new System.Windows.Forms.PictureBox(); this.labelUserLevel = new SmartX.SmartLabel(); this.pictureBoxCh3 = new System.Windows.Forms.PictureBox(); this.pictureBoxCh2 = new System.Windows.Forms.PictureBox(); @@ -223,22 +221,6 @@ this.pictureBoxIconUsbEnable.Name = "pictureBoxIconUsbEnable"; this.pictureBoxIconUsbEnable.Size = new System.Drawing.Size(30, 25); // - // pictureBoxEntrySensorStatus - // - this.pictureBoxEntrySensorStatus.BackColor = System.Drawing.Color.Red; - this.pictureBoxEntrySensorStatus.Location = new System.Drawing.Point(654, 112); - this.pictureBoxEntrySensorStatus.Name = "pictureBoxEntrySensorStatus"; - this.pictureBoxEntrySensorStatus.Size = new System.Drawing.Size(15, 15); - this.pictureBoxEntrySensorStatus.Visible = false; - // - // pictureBoxDrainSensorStatus - // - this.pictureBoxDrainSensorStatus.BackColor = System.Drawing.Color.Yellow; - this.pictureBoxDrainSensorStatus.Location = new System.Drawing.Point(675, 112); - this.pictureBoxDrainSensorStatus.Name = "pictureBoxDrainSensorStatus"; - this.pictureBoxDrainSensorStatus.Size = new System.Drawing.Size(15, 15); - this.pictureBoxDrainSensorStatus.Visible = false; - // // labelUserLevel // this.labelUserLevel.BackPictureBox = this.smartForm1; @@ -748,8 +730,6 @@ this.Controls.Add(this.pictureBoxCh3); this.Controls.Add(this.labelUserLevel); this.Controls.Add(this.labelIconNET); - this.Controls.Add(this.pictureBoxDrainSensorStatus); - this.Controls.Add(this.pictureBoxEntrySensorStatus); this.Controls.Add(this.pictureBoxIconUsbEnable); this.Controls.Add(this.pictureBoxIconUsbDesable); this.Controls.Add(this.labelWeight); @@ -782,8 +762,6 @@ public System.Windows.Forms.PictureBox pictureBoxCommunicationStatus; private System.Windows.Forms.PictureBox pictureBoxIconUsbDesable; private System.Windows.Forms.PictureBox pictureBoxIconUsbEnable; - public System.Windows.Forms.PictureBox pictureBoxEntrySensorStatus; - public System.Windows.Forms.PictureBox pictureBoxDrainSensorStatus; private SmartX.SmartLabel labelUserLevel; private System.Windows.Forms.PictureBox pictureBoxCh3; private System.Windows.Forms.PictureBox pictureBoxCh2; diff --git a/INT51DB/Forms/FormMainDisplay.cs b/INT51DB/Forms/FormMainDisplay.cs index 561f126..3d94c19 100644 --- a/INT51DB/Forms/FormMainDisplay.cs +++ b/INT51DB/Forms/FormMainDisplay.cs @@ -169,20 +169,8 @@ namespace INT51DB.Forms private void UpdateDisplayAlarmView(WeightData data) { - // 입력 센서 에러 - if (data.IsEntrySensor1Error == true || data.IsEntrySensor2Error == true) - this.pictureBoxEntrySensorStatus.Visible = true; - else - this.pictureBoxEntrySensorStatus.Visible = false; - - // 배출 센서 에러 - if (data.IsDrainSensorError == true) - this.pictureBoxDrainSensorStatus.Visible = true; - else - this.pictureBoxDrainSensorStatus.Visible = false; - if (data.IsServoOff == true || data.IsServoAlarm == true || data.IsLoadCellError == true || data.IsInverterError == true - || data.IsServoTorqueError == true) + || data.IsServoTorqueError == true || data.IsEmpegencyStop == true) { if (this.pictureBoxIconAlarm.Visible == false) this.pictureBoxIconAlarm.Visible = true; @@ -206,6 +194,8 @@ namespace INT51DB.Forms this.MainDisplayAlarm.listBoxMessage.Items.Add("LoadCell Error"); if (data.IsInverterError == true) this.MainDisplayAlarm.listBoxMessage.Items.Add("Inverter Error"); + if(data.IsEmpegencyStop == true) + this.MainDisplayAlarm.listBoxMessage.Items.Add("Emergency Stop"); } private void ProductChange(int productNumber) { diff --git a/INT51DB/Forms/FormMenu.Designer.cs b/INT51DB/Forms/FormMenu.Designer.cs index a57749b..c208005 100644 --- a/INT51DB/Forms/FormMenu.Designer.cs +++ b/INT51DB/Forms/FormMenu.Designer.cs @@ -59,7 +59,9 @@ this.buttonMain.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonMain.Name = "buttonMain"; this.buttonMain.NestedClickEventPrevent = false; + this.buttonMain.OutlinePixel = 1; this.buttonMain.RepeatInterval = 200; + this.buttonMain.RepeatIntervalAccelerate = null; this.buttonMain.SafeInterval = 200; this.buttonMain.Size = new System.Drawing.Size(90, 65); this.buttonMain.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -132,7 +134,9 @@ this.buttonConfiguration.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonConfiguration.Name = "buttonConfiguration"; this.buttonConfiguration.NestedClickEventPrevent = false; + this.buttonConfiguration.OutlinePixel = 1; this.buttonConfiguration.RepeatInterval = 200; + this.buttonConfiguration.RepeatIntervalAccelerate = null; this.buttonConfiguration.SafeInterval = 200; this.buttonConfiguration.Size = new System.Drawing.Size(90, 57); this.buttonConfiguration.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -161,7 +165,9 @@ this.buttonBasic.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonBasic.Name = "buttonBasic"; this.buttonBasic.NestedClickEventPrevent = false; + this.buttonBasic.OutlinePixel = 1; this.buttonBasic.RepeatInterval = 200; + this.buttonBasic.RepeatIntervalAccelerate = null; this.buttonBasic.SafeInterval = 200; this.buttonBasic.Size = new System.Drawing.Size(90, 57); this.buttonBasic.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -190,7 +196,9 @@ this.buttonSystem.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonSystem.Name = "buttonSystem"; this.buttonSystem.NestedClickEventPrevent = false; + this.buttonSystem.OutlinePixel = 1; this.buttonSystem.RepeatInterval = 200; + this.buttonSystem.RepeatIntervalAccelerate = null; this.buttonSystem.SafeInterval = 200; this.buttonSystem.Size = new System.Drawing.Size(90, 57); this.buttonSystem.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -219,7 +227,9 @@ this.buttonEquipment.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonEquipment.Name = "buttonEquipment"; this.buttonEquipment.NestedClickEventPrevent = false; + this.buttonEquipment.OutlinePixel = 1; this.buttonEquipment.RepeatInterval = 200; + this.buttonEquipment.RepeatIntervalAccelerate = null; this.buttonEquipment.SafeInterval = 200; this.buttonEquipment.Size = new System.Drawing.Size(90, 57); this.buttonEquipment.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -248,7 +258,9 @@ this.buttonInformation.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonInformation.Name = "buttonInformation"; this.buttonInformation.NestedClickEventPrevent = false; + this.buttonInformation.OutlinePixel = 1; this.buttonInformation.RepeatInterval = 200; + this.buttonInformation.RepeatIntervalAccelerate = null; this.buttonInformation.SafeInterval = 200; this.buttonInformation.Size = new System.Drawing.Size(90, 57); this.buttonInformation.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -277,7 +289,7 @@ this.labelTitleRoot.BackPictureBox2 = null; this.labelTitleRoot.BorderColor = System.Drawing.Color.Black; this.labelTitleRoot.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleRoot.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold); + this.labelTitleRoot.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold); this.labelTitleRoot.ForeColor = System.Drawing.Color.White; this.labelTitleRoot.InitVisible = true; this.labelTitleRoot.LineSpacing = 0F; diff --git a/INT51DB/Forms/FormMenu.cs b/INT51DB/Forms/FormMenu.cs index 20f2d3f..d4ce827 100644 --- a/INT51DB/Forms/FormMenu.cs +++ b/INT51DB/Forms/FormMenu.cs @@ -562,6 +562,9 @@ namespace INT51DB.Forms { if (status == DataStore.EquipmentStatus.Start) { + this.pictureBoxStop.Visible = false; + this.pictureBoxStart.Visible = true; + this.buttonBasic.Enabled = false; this.buttonConfiguration.Enabled = false; this.buttonSystem.Enabled = false; @@ -582,6 +585,9 @@ namespace INT51DB.Forms } else { + this.pictureBoxStop.Visible = true; + this.pictureBoxStart.Visible = false; + this.buttonBasic.Enabled = true; this.buttonConfiguration.Enabled = true; this.buttonSystem.Enabled = true; diff --git a/INT51DB/obj/Release/INT51DB.exe b/INT51DB/obj/Release/INT51DB.exe index a4314bf..3ad7137 100644 Binary files a/INT51DB/obj/Release/INT51DB.exe and b/INT51DB/obj/Release/INT51DB.exe differ