diff --git a/INT51DB/Controls/CenterConfiguration/ControlCenterConfiCommunication.Designer.cs b/INT51DB/Controls/CenterConfiguration/ControlCenterConfiCommunication.Designer.cs index 18cf179..3418bff 100644 --- a/INT51DB/Controls/CenterConfiguration/ControlCenterConfiCommunication.Designer.cs +++ b/INT51DB/Controls/CenterConfiguration/ControlCenterConfiCommunication.Designer.cs @@ -31,14 +31,11 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlCenterConfiCommunication)); this.smartGroupBox1 = new SmartX.SmartGroupBox(); this.buttonSave3 = new System.Windows.Forms.Button(); - this.buttonSave1 = new System.Windows.Forms.Button(); this.buttonSave2 = new System.Windows.Forms.Button(); this.comboBoxSerial3BaudRate = new System.Windows.Forms.ComboBox(); this.comboBoxSerial2BaudRate = new System.Windows.Forms.ComboBox(); - this.comboBoxSerial1BaudRate = new System.Windows.Forms.ComboBox(); this.comboBoxSerial2Mode = new System.Windows.Forms.ComboBox(); this.comboBoxSerial3Mode = new System.Windows.Forms.ComboBox(); - this.comboBoxSerial1Mode = new System.Windows.Forms.ComboBox(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -48,14 +45,11 @@ this.smartGroupBox1.BackPictureBox = null; this.smartGroupBox1.BackPictureBox1 = null; this.smartGroupBox1.Controls.Add(this.buttonSave3); - this.smartGroupBox1.Controls.Add(this.buttonSave1); this.smartGroupBox1.Controls.Add(this.buttonSave2); this.smartGroupBox1.Controls.Add(this.comboBoxSerial3BaudRate); this.smartGroupBox1.Controls.Add(this.comboBoxSerial2BaudRate); - this.smartGroupBox1.Controls.Add(this.comboBoxSerial1BaudRate); this.smartGroupBox1.Controls.Add(this.comboBoxSerial2Mode); this.smartGroupBox1.Controls.Add(this.comboBoxSerial3Mode); - this.smartGroupBox1.Controls.Add(this.comboBoxSerial1Mode); this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black; this.smartGroupBox1.FrameLineThickness = 2; @@ -80,17 +74,6 @@ this.buttonSave3.Text = "SAVE"; this.buttonSave3.Click += new System.EventHandler(this.buttonSave3_Click); // - // buttonSave1 - // - this.buttonSave1.Enabled = false; - this.buttonSave1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular); - this.buttonSave1.Location = new System.Drawing.Point(607, 67); - this.buttonSave1.Name = "buttonSave1"; - this.buttonSave1.Size = new System.Drawing.Size(70, 30); - this.buttonSave1.TabIndex = 35; - this.buttonSave1.Text = "SAVE"; - this.buttonSave1.Click += new System.EventHandler(this.buttonSave1_Click); - // // buttonSave2 // this.buttonSave2.Enabled = false; @@ -120,15 +103,6 @@ this.comboBoxSerial2BaudRate.TabIndex = 33; this.comboBoxSerial2BaudRate.SelectedIndexChanged += new System.EventHandler(this.comboBoxSerial2_SelectedIndexChanged); // - // comboBoxSerial1BaudRate - // - this.comboBoxSerial1BaudRate.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); - this.comboBoxSerial1BaudRate.Location = new System.Drawing.Point(216, 67); - this.comboBoxSerial1BaudRate.Name = "comboBoxSerial1BaudRate"; - this.comboBoxSerial1BaudRate.Size = new System.Drawing.Size(130, 28); - this.comboBoxSerial1BaudRate.TabIndex = 33; - this.comboBoxSerial1BaudRate.SelectedIndexChanged += new System.EventHandler(this.comboBoxSerial1_SelectedIndexChanged); - // // comboBoxSerial2Mode // this.comboBoxSerial2Mode.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); @@ -147,15 +121,6 @@ this.comboBoxSerial3Mode.TabIndex = 34; this.comboBoxSerial3Mode.SelectedIndexChanged += new System.EventHandler(this.comboBoxSerial3_SelectedIndexChanged); // - // comboBoxSerial1Mode - // - this.comboBoxSerial1Mode.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); - this.comboBoxSerial1Mode.Location = new System.Drawing.Point(384, 67); - this.comboBoxSerial1Mode.Name = "comboBoxSerial1Mode"; - this.comboBoxSerial1Mode.Size = new System.Drawing.Size(192, 28); - this.comboBoxSerial1Mode.TabIndex = 31; - this.comboBoxSerial1Mode.SelectedIndexChanged += new System.EventHandler(this.comboBoxSerial1_SelectedIndexChanged); - // // ControlCenterConfiCommunication // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -171,12 +136,9 @@ #endregion private SmartX.SmartGroupBox smartGroupBox1; - private System.Windows.Forms.Button buttonSave1; private System.Windows.Forms.Button buttonSave2; private System.Windows.Forms.ComboBox comboBoxSerial3BaudRate; - private System.Windows.Forms.ComboBox comboBoxSerial1BaudRate; private System.Windows.Forms.ComboBox comboBoxSerial3Mode; - private System.Windows.Forms.ComboBox comboBoxSerial1Mode; private System.Windows.Forms.ComboBox comboBoxSerial2BaudRate; private System.Windows.Forms.ComboBox comboBoxSerial2Mode; private System.Windows.Forms.Button buttonSave3; diff --git a/INT51DB/Controls/CenterConfiguration/ControlCenterConfiCommunication.cs b/INT51DB/Controls/CenterConfiguration/ControlCenterConfiCommunication.cs index de6cb61..a4b84e8 100644 --- a/INT51DB/Controls/CenterConfiguration/ControlCenterConfiCommunication.cs +++ b/INT51DB/Controls/CenterConfiguration/ControlCenterConfiCommunication.cs @@ -58,25 +58,6 @@ namespace INT51DB.Controls } private void DefaultSetting() { - this.comboBoxSerial1BaudRate.Items.Clear(); - this.comboBoxSerial1BaudRate.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial1_SelectedIndexChanged); - this.comboBoxSerial1BaudRate.Items.Add(9600); - this.comboBoxSerial1BaudRate.Items.Add(19200); - this.comboBoxSerial1BaudRate.Items.Add(38400); - this.comboBoxSerial1BaudRate.Items.Add(115200); - this.comboBoxSerial1BaudRate.SelectedIndex = 0; - this.comboBoxSerial1BaudRate.SelectedIndexChanged += new EventHandler(this.comboBoxSerial1_SelectedIndexChanged); - - this.comboBoxSerial1Mode.Items.Clear(); - this.comboBoxSerial1Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial1_SelectedIndexChanged); - this.comboBoxSerial1Mode.Items.Add("None"); - this.comboBoxSerial1Mode.Items.Add("STD1"); - //this.comboBoxSerial1Mode.Items.Add("Remote"); - //this.comboBoxSerial1Mode.Items.Add("Printer"); - //this.comboBoxSerial1Mode.Items.Add("STD2"); - this.comboBoxSerial1Mode.SelectedIndex = 0; - this.comboBoxSerial1Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial1_SelectedIndexChanged); - this.comboBoxSerial2BaudRate.Items.Clear(); this.comboBoxSerial2BaudRate.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial2_SelectedIndexChanged); this.comboBoxSerial2BaudRate.Items.Add(9600); @@ -90,9 +71,6 @@ namespace INT51DB.Controls this.comboBoxSerial2Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial2_SelectedIndexChanged); this.comboBoxSerial2Mode.Items.Add("None"); this.comboBoxSerial2Mode.Items.Add("STD1"); - //this.comboBoxSerial2Mode.Items.Add("Remote"); - //this.comboBoxSerial2Mode.Items.Add("Printer"); - //this.comboBoxSerial2Mode.Items.Add("STD2"); this.comboBoxSerial2Mode.SelectedIndex = 0; this.comboBoxSerial2Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial2_SelectedIndexChanged); @@ -109,9 +87,6 @@ namespace INT51DB.Controls this.comboBoxSerial3Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial3_SelectedIndexChanged); this.comboBoxSerial3Mode.Items.Add("None"); this.comboBoxSerial3Mode.Items.Add("STD1"); - //this.comboBoxSerial3Mode.Items.Add("Remote"); - //this.comboBoxSerial3Mode.Items.Add("Printer"); - //this.comboBoxSerial3Mode.Items.Add("STD2"); this.comboBoxSerial3Mode.SelectedIndex = 0; this.comboBoxSerial3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial3_SelectedIndexChanged); } @@ -121,48 +96,33 @@ namespace INT51DB.Controls int index = 0; string value = ""; - // CH1. BaudRate - if (this.comboBoxSerial1BaudRate.SelectedIndex != item.SerialCOM1BaudRate) - { - this.comboBoxSerial1BaudRate.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial1_SelectedIndexChanged); - this.comboBoxSerial1BaudRate.SelectedIndex = item.SerialCOM1BaudRate; - this.comboBoxSerial1BaudRate.SelectedIndexChanged += new EventHandler(this.comboBoxSerial1_SelectedIndexChanged); - } - // CH1. Mode - if (this.comboBoxSerial1Mode.SelectedIndex != item.SerialCOM1Mode) - { - this.comboBoxSerial1Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial1_SelectedIndexChanged); - this.comboBoxSerial1Mode.SelectedIndex = item.SerialCOM1Mode; - this.comboBoxSerial1Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial1_SelectedIndexChanged); - } - // CH2. BaudRate - if (this.comboBoxSerial2BaudRate.SelectedIndex != item.SerialCOM3BaudRate) + if (this.comboBoxSerial2BaudRate.SelectedIndex != item.COM3BaudRate) { this.comboBoxSerial2BaudRate.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial2_SelectedIndexChanged); - this.comboBoxSerial2BaudRate.SelectedIndex = item.SerialCOM3BaudRate; + this.comboBoxSerial2BaudRate.SelectedIndex = item.COM3BaudRate; this.comboBoxSerial2BaudRate.SelectedIndexChanged += new EventHandler(this.comboBoxSerial2_SelectedIndexChanged); } // CH2. Mode - if (this.comboBoxSerial2Mode.SelectedIndex != item.SerialCOM3Mode) + if (this.comboBoxSerial2Mode.SelectedIndex != item.COM3Mode) { this.comboBoxSerial2Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial2_SelectedIndexChanged); - this.comboBoxSerial2Mode.SelectedIndex = item.SerialCOM3Mode; + this.comboBoxSerial2Mode.SelectedIndex = item.COM3Mode; this.comboBoxSerial2Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial2_SelectedIndexChanged); } // CH3. BaudRate - if (this.comboBoxSerial3BaudRate.SelectedIndex != item.SerialCOM4BaudRate) + if (this.comboBoxSerial3BaudRate.SelectedIndex != item.COM4BaudRate) { this.comboBoxSerial3BaudRate.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial3_SelectedIndexChanged); - this.comboBoxSerial3BaudRate.SelectedIndex = item.SerialCOM4BaudRate; + this.comboBoxSerial3BaudRate.SelectedIndex = item.COM4BaudRate; this.comboBoxSerial3BaudRate.SelectedIndexChanged += new EventHandler(this.comboBoxSerial3_SelectedIndexChanged); } // CH3. Mode - if (this.comboBoxSerial3Mode.SelectedIndex != item.SerialCOM4Mode) + if (this.comboBoxSerial3Mode.SelectedIndex != item.COM4Mode) { this.comboBoxSerial3Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial3_SelectedIndexChanged); - this.comboBoxSerial3Mode.SelectedIndex = item.SerialCOM4Mode; + this.comboBoxSerial3Mode.SelectedIndex = item.COM4Mode; this.comboBoxSerial3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial3_SelectedIndexChanged); } } @@ -175,17 +135,12 @@ namespace INT51DB.Controls this.UpdateSerialParameterDisplay(this.ParentForm.ParentForm.SystemConfig, this.ParentForm.ParentForm.CurrentSystemParameter1); - this.buttonSave1.Enabled = false; this.buttonSave2.Enabled = false; this.buttonSave3.Enabled = false; } #endregion #region Event Handler - private void comboBoxSerial1_SelectedIndexChanged(object sender, EventArgs e) - { - this.buttonSave1.Enabled = true; - } private void comboBoxSerial2_SelectedIndexChanged(object sender, EventArgs e) { this.buttonSave2.Enabled = true; @@ -195,21 +150,10 @@ namespace INT51DB.Controls this.buttonSave3.Enabled = true; } - private void buttonSave1_Click(object sender, EventArgs e) - { - this.ParentForm.ParentForm.SystemConfig.SerialCOM1BaudRate = this.comboBoxSerial1BaudRate.SelectedIndex; - this.ParentForm.ParentForm.SystemConfig.SerialCOM1Mode = this.comboBoxSerial1Mode.SelectedIndex; - - this.ParentForm.ParentForm.SaveSystemConfigurationFile(this.ParentForm.ParentForm.SystemConfig); - - this.ParentForm.ParentForm.OpenSerialCOM1(); - - this.buttonSave1.Enabled = false; - } private void buttonSave2_Click(object sender, EventArgs e) { - this.ParentForm.ParentForm.SystemConfig.SerialCOM3BaudRate = this.comboBoxSerial2BaudRate.SelectedIndex; - this.ParentForm.ParentForm.SystemConfig.SerialCOM3Mode = this.comboBoxSerial2Mode.SelectedIndex; + this.ParentForm.ParentForm.SystemConfig.COM3BaudRate = this.comboBoxSerial2BaudRate.SelectedIndex; + this.ParentForm.ParentForm.SystemConfig.COM3Mode = this.comboBoxSerial2Mode.SelectedIndex; this.ParentForm.ParentForm.SaveSystemConfigurationFile(this.ParentForm.ParentForm.SystemConfig); @@ -219,8 +163,8 @@ namespace INT51DB.Controls } private void buttonSave3_Click(object sender, EventArgs e) { - this.ParentForm.ParentForm.SystemConfig.SerialCOM4BaudRate = this.comboBoxSerial3BaudRate.SelectedIndex; - this.ParentForm.ParentForm.SystemConfig.SerialCOM4Mode = this.comboBoxSerial3Mode.SelectedIndex; + this.ParentForm.ParentForm.SystemConfig.COM4BaudRate = this.comboBoxSerial3BaudRate.SelectedIndex; + this.ParentForm.ParentForm.SystemConfig.COM4Mode = this.comboBoxSerial3Mode.SelectedIndex; this.ParentForm.ParentForm.SaveSystemConfigurationFile(this.ParentForm.ParentForm.SystemConfig); diff --git a/INT51DB/Controls/CenterEquipment/ControlCenterEquipInitialize.cs b/INT51DB/Controls/CenterEquipment/ControlCenterEquipInitialize.cs index 6e2fbfe..f371096 100644 --- a/INT51DB/Controls/CenterEquipment/ControlCenterEquipInitialize.cs +++ b/INT51DB/Controls/CenterEquipment/ControlCenterEquipInitialize.cs @@ -125,8 +125,9 @@ namespace INT51DB.Controls for (int i = 0; i < 1000; i++) { structItem.Filter = this.ParentForm.ParentForm.CurrentJudgmentSetItem.Filter; + structItem.DownDelayTime = this.ParentForm.ParentForm.CurrentJudgmentSetItem.DownDelayTime; structItem.JudgmentDelayTime = this.ParentForm.ParentForm.CurrentJudgmentSetItem.JudgmentDelayTime; - structItem.DoubleDelayTime = this.ParentForm.ParentForm.CurrentJudgmentSetItem.DoubleDelayTime; + structItem.UpDelayTime = this.ParentForm.ParentForm.CurrentJudgmentSetItem.UpDelayTime; structItem.JudgmentCount = this.ParentForm.ParentForm.CurrentJudgmentSetItem.JudgmentCount; structItem.FeedSpeed = this.ParentForm.ParentForm.CurrentJudgmentSetItem.FeedSpeed; structItem.DynamicCorrection = this.ParentForm.ParentForm.CurrentJudgmentSetItem.DynamicCorrection; @@ -137,7 +138,6 @@ namespace INT51DB.Controls structItem.Sorter2Mode = this.ParentForm.ParentForm.CurrentJudgmentSetItem.Sorter2Mode; structItem.Sorter2DelayTime = this.ParentForm.ParentForm.CurrentJudgmentSetItem.Sorter2DelayTime; structItem.Sorter2RunTime = this.ParentForm.ParentForm.CurrentJudgmentSetItem.Sorter2RunTime; - structItem.DummyInt1 = 0; structItem.DummyInt2 = 0; structItem.DummyInt3 = 0; diff --git a/INT51DB/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.Designer.cs b/INT51DB/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.Designer.cs index 0e9dc5c..bf93d72 100644 --- a/INT51DB/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.Designer.cs +++ b/INT51DB/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.Designer.cs @@ -30,6 +30,9 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlCenterSystemJudgmentSetting)); this.smartGroupBox1 = new SmartX.SmartGroupBox(); + this.buttonPasteAll = new SmartX.SmartButton(); + this.buttonPaste = new SmartX.SmartButton(); + this.buttonCopy = new SmartX.SmartButton(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.buttonWeightReference = new SmartX.SmartButton(); @@ -44,10 +47,10 @@ this.labelProductNo = new SmartX.SmartLabel(); this.labelDynamicCorrection = new SmartX.SmartLabel(); this.labelJudgmentCount = new SmartX.SmartLabel(); - this.labelDoubleDelayTime = new SmartX.SmartLabel(); - this.buttonPasteAll = new SmartX.SmartButton(); - this.buttonPaste = new SmartX.SmartButton(); - this.buttonCopy = new SmartX.SmartButton(); + this.labelUpDelayTime = new SmartX.SmartLabel(); + this.labelDownDelayTime = new SmartX.SmartLabel(); + this.buttonConveyorDown = new SmartX.SmartButton(); + this.buttonConveyorUp = new SmartX.SmartButton(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -56,6 +59,9 @@ this.smartGroupBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(46)))), ((int)(((byte)(46)))), ((int)(((byte)(46))))); this.smartGroupBox1.BackPictureBox = null; this.smartGroupBox1.BackPictureBox1 = null; + this.smartGroupBox1.Controls.Add(this.buttonConveyorDown); + this.smartGroupBox1.Controls.Add(this.buttonConveyorUp); + this.smartGroupBox1.Controls.Add(this.labelDownDelayTime); this.smartGroupBox1.Controls.Add(this.buttonPasteAll); this.smartGroupBox1.Controls.Add(this.buttonPaste); this.smartGroupBox1.Controls.Add(this.buttonCopy); @@ -73,7 +79,7 @@ this.smartGroupBox1.Controls.Add(this.labelProductNo); this.smartGroupBox1.Controls.Add(this.labelDynamicCorrection); this.smartGroupBox1.Controls.Add(this.labelJudgmentCount); - this.smartGroupBox1.Controls.Add(this.labelDoubleDelayTime); + this.smartGroupBox1.Controls.Add(this.labelUpDelayTime); this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black; this.smartGroupBox1.FrameLineThickness = 2; @@ -87,10 +93,106 @@ this.smartGroupBox1.TabIndex = 174; this.smartGroupBox1.TextColor = System.Drawing.Color.Black; // + // buttonPasteAll + // + this.buttonPasteAll.BackPictureBox = null; + this.buttonPasteAll.BackPictureBox1 = null; + this.buttonPasteAll.BackPictureBox2 = null; + this.buttonPasteAll.ButtonColor = System.Drawing.Color.Gray; + this.buttonPasteAll.ButtonImageAutoSize = true; + this.buttonPasteAll.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonPasteAll.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonPasteAll.DisableImage"))); + this.buttonPasteAll.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonPasteAll.DownImage"))); + this.buttonPasteAll.GroupID = 0; + this.buttonPasteAll.InitVisible = true; + this.buttonPasteAll.Location = new System.Drawing.Point(652, 5); + this.buttonPasteAll.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.buttonPasteAll.Name = "buttonPasteAll"; + this.buttonPasteAll.NestedClickEventPrevent = false; + this.buttonPasteAll.OutlinePixel = 1; + this.buttonPasteAll.RepeatInterval = 200; + this.buttonPasteAll.RepeatIntervalAccelerate = null; + this.buttonPasteAll.SafeInterval = 200; + this.buttonPasteAll.Size = new System.Drawing.Size(50, 50); + this.buttonPasteAll.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonPasteAll.TabIndex = 133; + this.buttonPasteAll.TextColor = System.Drawing.Color.Black; + this.buttonPasteAll.TextDownColor = System.Drawing.Color.White; + this.buttonPasteAll.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonPasteAll.TextLocation = new System.Drawing.Point(0, 0); + this.buttonPasteAll.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonPasteAll.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonPasteAll.UpImage"))); + this.buttonPasteAll.Click += new System.EventHandler(this.buttonPasteAll_Click); + // + // buttonPaste + // + this.buttonPaste.BackPictureBox = null; + this.buttonPaste.BackPictureBox1 = null; + this.buttonPaste.BackPictureBox2 = null; + this.buttonPaste.ButtonColor = System.Drawing.Color.Gray; + this.buttonPaste.ButtonImageAutoSize = true; + this.buttonPaste.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonPaste.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonPaste.DisableImage"))); + this.buttonPaste.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonPaste.DownImage"))); + this.buttonPaste.GroupID = 0; + this.buttonPaste.InitVisible = true; + this.buttonPaste.Location = new System.Drawing.Point(596, 5); + this.buttonPaste.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.buttonPaste.Name = "buttonPaste"; + this.buttonPaste.NestedClickEventPrevent = false; + this.buttonPaste.OutlinePixel = 1; + this.buttonPaste.RepeatInterval = 200; + this.buttonPaste.RepeatIntervalAccelerate = null; + this.buttonPaste.SafeInterval = 200; + this.buttonPaste.Size = new System.Drawing.Size(50, 50); + this.buttonPaste.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonPaste.TabIndex = 132; + this.buttonPaste.TextColor = System.Drawing.Color.Black; + this.buttonPaste.TextDownColor = System.Drawing.Color.White; + this.buttonPaste.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonPaste.TextLocation = new System.Drawing.Point(0, 0); + this.buttonPaste.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonPaste.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonPaste.UpImage"))); + this.buttonPaste.Click += new System.EventHandler(this.buttonPaste_Click); + // + // buttonCopy + // + this.buttonCopy.BackPictureBox = null; + this.buttonCopy.BackPictureBox1 = null; + this.buttonCopy.BackPictureBox2 = null; + this.buttonCopy.ButtonColor = System.Drawing.Color.Gray; + this.buttonCopy.ButtonImageAutoSize = true; + this.buttonCopy.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonCopy.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonCopy.DisableImage"))); + this.buttonCopy.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonCopy.DownImage"))); + this.buttonCopy.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); + this.buttonCopy.ForeColor = System.Drawing.Color.White; + this.buttonCopy.GroupID = 0; + this.buttonCopy.InitVisible = true; + this.buttonCopy.Location = new System.Drawing.Point(490, 5); + this.buttonCopy.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.buttonCopy.Name = "buttonCopy"; + this.buttonCopy.NestedClickEventPrevent = false; + this.buttonCopy.OutlinePixel = 1; + this.buttonCopy.RepeatInterval = 200; + this.buttonCopy.RepeatIntervalAccelerate = null; + this.buttonCopy.SafeInterval = 200; + this.buttonCopy.Size = new System.Drawing.Size(100, 50); + this.buttonCopy.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonCopy.TabIndex = 131; + this.buttonCopy.Text = "0000"; + this.buttonCopy.TextColor = System.Drawing.Color.White; + this.buttonCopy.TextDownColor = System.Drawing.Color.White; + this.buttonCopy.TextHAlign = SmartX.SmartButton.TextHorAlign.Right; + this.buttonCopy.TextLocation = new System.Drawing.Point(-10, 0); + this.buttonCopy.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonCopy.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonCopy.UpImage"))); + this.buttonCopy.Click += new System.EventHandler(this.buttonCopy_Click); + // // label1 // this.label1.BackColor = System.Drawing.Color.White; - this.label1.Location = new System.Drawing.Point(230, 12); + this.label1.Location = new System.Drawing.Point(110, 5); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(100, 20); this.label1.Text = "label1"; @@ -99,7 +201,7 @@ // label2 // this.label2.BackColor = System.Drawing.Color.White; - this.label2.Location = new System.Drawing.Point(336, 12); + this.label2.Location = new System.Drawing.Point(110, 28); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(100, 20); this.label2.Text = "label2"; @@ -123,7 +225,9 @@ this.buttonWeightReference.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonWeightReference.Name = "buttonWeightReference"; this.buttonWeightReference.NestedClickEventPrevent = false; + this.buttonWeightReference.OutlinePixel = 1; this.buttonWeightReference.RepeatInterval = 200; + this.buttonWeightReference.RepeatIntervalAccelerate = null; this.buttonWeightReference.SafeInterval = 200; this.buttonWeightReference.Size = new System.Drawing.Size(99, 100); this.buttonWeightReference.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -168,7 +272,7 @@ this.labelFeedSpeed.ForeColor = System.Drawing.Color.White; this.labelFeedSpeed.InitVisible = true; this.labelFeedSpeed.LineSpacing = 0F; - this.labelFeedSpeed.Location = new System.Drawing.Point(110, 284); + this.labelFeedSpeed.Location = new System.Drawing.Point(110, 327); this.labelFeedSpeed.Name = "labelFeedSpeed"; this.labelFeedSpeed.Size = new System.Drawing.Size(110, 39); this.labelFeedSpeed.TabIndex = 124; @@ -288,7 +392,7 @@ this.labelJudgmentDelayTime.ForeColor = System.Drawing.Color.White; this.labelJudgmentDelayTime.InitVisible = true; this.labelJudgmentDelayTime.LineSpacing = 0F; - this.labelJudgmentDelayTime.Location = new System.Drawing.Point(110, 152); + this.labelJudgmentDelayTime.Location = new System.Drawing.Point(110, 195); this.labelJudgmentDelayTime.Name = "labelJudgmentDelayTime"; this.labelJudgmentDelayTime.Size = new System.Drawing.Size(110, 39); this.labelJudgmentDelayTime.TabIndex = 91; @@ -330,7 +434,7 @@ this.labelDynamicCorrection.ForeColor = System.Drawing.Color.White; this.labelDynamicCorrection.InitVisible = true; this.labelDynamicCorrection.LineSpacing = 0F; - this.labelDynamicCorrection.Location = new System.Drawing.Point(110, 328); + this.labelDynamicCorrection.Location = new System.Drawing.Point(110, 371); this.labelDynamicCorrection.Name = "labelDynamicCorrection"; this.labelDynamicCorrection.Size = new System.Drawing.Size(110, 39); this.labelDynamicCorrection.TabIndex = 92; @@ -351,7 +455,7 @@ this.labelJudgmentCount.ForeColor = System.Drawing.Color.White; this.labelJudgmentCount.InitVisible = true; this.labelJudgmentCount.LineSpacing = 0F; - this.labelJudgmentCount.Location = new System.Drawing.Point(110, 240); + this.labelJudgmentCount.Location = new System.Drawing.Point(110, 283); this.labelJudgmentCount.Name = "labelJudgmentCount"; this.labelJudgmentCount.Size = new System.Drawing.Size(110, 39); this.labelJudgmentCount.TabIndex = 92; @@ -361,116 +465,109 @@ this.labelJudgmentCount.Wordwrap = false; this.labelJudgmentCount.Click += new System.EventHandler(this.labelJudgmentCount_Click); // - // labelDoubleDelayTime + // labelUpDelayTime // - this.labelDoubleDelayTime.BackColor = System.Drawing.Color.White; - this.labelDoubleDelayTime.BackPictureBox1 = null; - this.labelDoubleDelayTime.BackPictureBox2 = this.smartGroupBox1; - this.labelDoubleDelayTime.BorderColor = System.Drawing.Color.Black; - this.labelDoubleDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.labelDoubleDelayTime.Font = new System.Drawing.Font("Arial", 17F, System.Drawing.FontStyle.Bold); - this.labelDoubleDelayTime.ForeColor = System.Drawing.Color.White; - this.labelDoubleDelayTime.InitVisible = true; - this.labelDoubleDelayTime.LineSpacing = 0F; - this.labelDoubleDelayTime.Location = new System.Drawing.Point(110, 196); - this.labelDoubleDelayTime.Name = "labelDoubleDelayTime"; - this.labelDoubleDelayTime.Size = new System.Drawing.Size(110, 39); - this.labelDoubleDelayTime.TabIndex = 92; - this.labelDoubleDelayTime.Text = "900"; - this.labelDoubleDelayTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; - this.labelDoubleDelayTime.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelDoubleDelayTime.Wordwrap = false; - this.labelDoubleDelayTime.Click += new System.EventHandler(this.labelDoubleDelayTime_Click); + this.labelUpDelayTime.BackColor = System.Drawing.Color.White; + this.labelUpDelayTime.BackPictureBox1 = null; + this.labelUpDelayTime.BackPictureBox2 = this.smartGroupBox1; + this.labelUpDelayTime.BorderColor = System.Drawing.Color.Black; + this.labelUpDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelUpDelayTime.Font = new System.Drawing.Font("Arial", 17F, System.Drawing.FontStyle.Bold); + this.labelUpDelayTime.ForeColor = System.Drawing.Color.White; + this.labelUpDelayTime.InitVisible = true; + this.labelUpDelayTime.LineSpacing = 0F; + this.labelUpDelayTime.Location = new System.Drawing.Point(110, 239); + this.labelUpDelayTime.Name = "labelUpDelayTime"; + this.labelUpDelayTime.Size = new System.Drawing.Size(110, 39); + this.labelUpDelayTime.TabIndex = 92; + this.labelUpDelayTime.Text = "900"; + this.labelUpDelayTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; + this.labelUpDelayTime.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelUpDelayTime.Wordwrap = false; + this.labelUpDelayTime.Click += new System.EventHandler(this.labelUpDelayTime_Click); // - // buttonPasteAll + // labelDownDelayTime // - this.buttonPasteAll.BackPictureBox = null; - this.buttonPasteAll.BackPictureBox1 = null; - this.buttonPasteAll.BackPictureBox2 = null; - this.buttonPasteAll.ButtonColor = System.Drawing.Color.Gray; - this.buttonPasteAll.ButtonImageAutoSize = true; - this.buttonPasteAll.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonPasteAll.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonPasteAll.DisableImage"))); - this.buttonPasteAll.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonPasteAll.DownImage"))); - this.buttonPasteAll.GroupID = 0; - this.buttonPasteAll.InitVisible = true; - this.buttonPasteAll.Location = new System.Drawing.Point(652, 5); - this.buttonPasteAll.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.buttonPasteAll.Name = "buttonPasteAll"; - this.buttonPasteAll.NestedClickEventPrevent = false; - this.buttonPasteAll.RepeatInterval = 200; - this.buttonPasteAll.SafeInterval = 200; - this.buttonPasteAll.Size = new System.Drawing.Size(50, 50); - this.buttonPasteAll.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonPasteAll.TabIndex = 133; - this.buttonPasteAll.TextColor = System.Drawing.Color.Black; - this.buttonPasteAll.TextDownColor = System.Drawing.Color.White; - this.buttonPasteAll.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonPasteAll.TextLocation = new System.Drawing.Point(0, 0); - this.buttonPasteAll.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonPasteAll.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonPasteAll.UpImage"))); - this.buttonPasteAll.Click += new System.EventHandler(this.buttonPasteAll_Click); + this.labelDownDelayTime.BackColor = System.Drawing.Color.White; + this.labelDownDelayTime.BackPictureBox1 = null; + this.labelDownDelayTime.BackPictureBox2 = this.smartGroupBox1; + this.labelDownDelayTime.BorderColor = System.Drawing.Color.Black; + this.labelDownDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelDownDelayTime.Font = new System.Drawing.Font("Arial", 17F, System.Drawing.FontStyle.Bold); + this.labelDownDelayTime.ForeColor = System.Drawing.Color.White; + this.labelDownDelayTime.InitVisible = true; + this.labelDownDelayTime.LineSpacing = 0F; + this.labelDownDelayTime.Location = new System.Drawing.Point(110, 152); + this.labelDownDelayTime.Name = "labelDownDelayTime"; + this.labelDownDelayTime.Size = new System.Drawing.Size(110, 39); + this.labelDownDelayTime.TabIndex = 136; + this.labelDownDelayTime.Text = "8"; + this.labelDownDelayTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; + this.labelDownDelayTime.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelDownDelayTime.Wordwrap = false; + this.labelDownDelayTime.Click += new System.EventHandler(this.labelDownDelayTime_Click); // - // buttonPaste + // buttonConveyorDown // - this.buttonPaste.BackPictureBox = null; - this.buttonPaste.BackPictureBox1 = null; - this.buttonPaste.BackPictureBox2 = null; - this.buttonPaste.ButtonColor = System.Drawing.Color.Gray; - this.buttonPaste.ButtonImageAutoSize = true; - this.buttonPaste.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonPaste.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonPaste.DisableImage"))); - this.buttonPaste.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonPaste.DownImage"))); - this.buttonPaste.GroupID = 0; - this.buttonPaste.InitVisible = true; - this.buttonPaste.Location = new System.Drawing.Point(596, 5); - this.buttonPaste.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.buttonPaste.Name = "buttonPaste"; - this.buttonPaste.NestedClickEventPrevent = false; - this.buttonPaste.RepeatInterval = 200; - this.buttonPaste.SafeInterval = 200; - this.buttonPaste.Size = new System.Drawing.Size(50, 50); - this.buttonPaste.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonPaste.TabIndex = 132; - this.buttonPaste.TextColor = System.Drawing.Color.Black; - this.buttonPaste.TextDownColor = System.Drawing.Color.White; - this.buttonPaste.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonPaste.TextLocation = new System.Drawing.Point(0, 0); - this.buttonPaste.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonPaste.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonPaste.UpImage"))); - this.buttonPaste.Click += new System.EventHandler(this.buttonPaste_Click); + this.buttonConveyorDown.BackPictureBox = null; + this.buttonConveyorDown.BackPictureBox1 = null; + this.buttonConveyorDown.BackPictureBox2 = null; + this.buttonConveyorDown.ButtonColor = System.Drawing.Color.LightGray; + this.buttonConveyorDown.ButtonImageAutoSize = true; + this.buttonConveyorDown.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonConveyorDown.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonConveyorDown.DisableImage"))); + this.buttonConveyorDown.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonConveyorDown.DownImage"))); + this.buttonConveyorDown.GroupID = 0; + this.buttonConveyorDown.InitVisible = true; + this.buttonConveyorDown.Location = new System.Drawing.Point(335, 6); + this.buttonConveyorDown.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.buttonConveyorDown.Name = "buttonConveyorDown"; + this.buttonConveyorDown.NestedClickEventPrevent = false; + this.buttonConveyorDown.OutlinePixel = 1; + this.buttonConveyorDown.RepeatInterval = 200; + this.buttonConveyorDown.RepeatIntervalAccelerate = null; + this.buttonConveyorDown.SafeInterval = 200; + this.buttonConveyorDown.Size = new System.Drawing.Size(49, 49); + this.buttonConveyorDown.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonConveyorDown.TabIndex = 451; + this.buttonConveyorDown.TextColor = System.Drawing.Color.Black; + this.buttonConveyorDown.TextDownColor = System.Drawing.Color.White; + this.buttonConveyorDown.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonConveyorDown.TextLocation = new System.Drawing.Point(0, 0); + this.buttonConveyorDown.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonConveyorDown.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonConveyorDown.UpImage"))); + this.buttonConveyorDown.Click += new System.EventHandler(this.buttonConveyorDown_Click); // - // buttonCopy + // buttonConveyorUp // - this.buttonCopy.BackPictureBox = null; - this.buttonCopy.BackPictureBox1 = null; - this.buttonCopy.BackPictureBox2 = null; - this.buttonCopy.ButtonColor = System.Drawing.Color.Gray; - this.buttonCopy.ButtonImageAutoSize = true; - this.buttonCopy.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonCopy.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonCopy.DisableImage"))); - this.buttonCopy.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonCopy.DownImage"))); - this.buttonCopy.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); - this.buttonCopy.ForeColor = System.Drawing.Color.White; - this.buttonCopy.GroupID = 0; - this.buttonCopy.InitVisible = true; - this.buttonCopy.Location = new System.Drawing.Point(490, 5); - this.buttonCopy.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.buttonCopy.Name = "buttonCopy"; - this.buttonCopy.NestedClickEventPrevent = false; - this.buttonCopy.RepeatInterval = 200; - this.buttonCopy.SafeInterval = 200; - this.buttonCopy.Size = new System.Drawing.Size(100, 50); - this.buttonCopy.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonCopy.TabIndex = 131; - this.buttonCopy.Text = "0000"; - this.buttonCopy.TextColor = System.Drawing.Color.White; - this.buttonCopy.TextDownColor = System.Drawing.Color.White; - this.buttonCopy.TextHAlign = SmartX.SmartButton.TextHorAlign.Right; - this.buttonCopy.TextLocation = new System.Drawing.Point(-10, 0); - this.buttonCopy.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonCopy.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonCopy.UpImage"))); - this.buttonCopy.Click += new System.EventHandler(this.buttonCopy_Click); + this.buttonConveyorUp.BackPictureBox = null; + this.buttonConveyorUp.BackPictureBox1 = null; + this.buttonConveyorUp.BackPictureBox2 = null; + this.buttonConveyorUp.ButtonColor = System.Drawing.Color.LightGray; + this.buttonConveyorUp.ButtonImageAutoSize = true; + this.buttonConveyorUp.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonConveyorUp.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonConveyorUp.DisableImage"))); + this.buttonConveyorUp.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonConveyorUp.DownImage"))); + this.buttonConveyorUp.GroupID = 0; + this.buttonConveyorUp.InitVisible = true; + this.buttonConveyorUp.Location = new System.Drawing.Point(280, 6); + this.buttonConveyorUp.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.buttonConveyorUp.Name = "buttonConveyorUp"; + this.buttonConveyorUp.NestedClickEventPrevent = false; + this.buttonConveyorUp.OutlinePixel = 1; + this.buttonConveyorUp.RepeatInterval = 200; + this.buttonConveyorUp.RepeatIntervalAccelerate = null; + this.buttonConveyorUp.SafeInterval = 200; + this.buttonConveyorUp.Size = new System.Drawing.Size(49, 49); + this.buttonConveyorUp.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonConveyorUp.TabIndex = 450; + this.buttonConveyorUp.TextColor = System.Drawing.Color.Black; + this.buttonConveyorUp.TextDownColor = System.Drawing.Color.White; + this.buttonConveyorUp.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonConveyorUp.TextLocation = new System.Drawing.Point(0, 0); + this.buttonConveyorUp.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonConveyorUp.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonConveyorUp.UpImage"))); + this.buttonConveyorUp.Click += new System.EventHandler(this.buttonConveyorUp_Click); // // ControlCenterSystemJudgmentSetting // @@ -489,7 +586,7 @@ private SmartX.SmartGroupBox smartGroupBox1; public SmartX.SmartLabel labelJudgmentDelayTime; - public SmartX.SmartLabel labelDoubleDelayTime; + public SmartX.SmartLabel labelUpDelayTime; public SmartX.SmartLabel labelProductNo; public SmartX.SmartLabel labelFilter; private SmartX.SmartLabel labelWeightValue; @@ -506,5 +603,8 @@ private SmartX.SmartButton buttonPasteAll; private SmartX.SmartButton buttonPaste; private SmartX.SmartButton buttonCopy; + public SmartX.SmartLabel labelDownDelayTime; + private SmartX.SmartButton buttonConveyorDown; + private SmartX.SmartButton buttonConveyorUp; } } diff --git a/INT51DB/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.cs b/INT51DB/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.cs index 9a38af3..1f95494 100644 --- a/INT51DB/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.cs +++ b/INT51DB/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.cs @@ -78,7 +78,7 @@ namespace INT51DB.Controls private void ControlInitialize() { - this.labelDoubleDelayTime.Text = " -"; + this.labelUpDelayTime.Text = " -"; this.labelJudgmentDelayTime.Text = " -"; this.labelFilter.Text = " -"; this.labelJudgmentDelayTime.Text = " -"; @@ -140,13 +140,17 @@ namespace INT51DB.Controls if (this.labelFilter.Text != value) this.labelFilter.Text = value; + value = item.DownDelayTime.ToString(); + if (this.labelDownDelayTime.Text != value) + this.labelDownDelayTime.Text = value; + value = item.JudgmentDelayTime.ToString(); if (this.labelJudgmentDelayTime.Text != value) this.labelJudgmentDelayTime.Text = value; - value = item.DoubleDelayTime.ToString(); - if (this.labelDoubleDelayTime.Text != value) - this.labelDoubleDelayTime.Text = value; + value = item.UpDelayTime.ToString(); + if (this.labelUpDelayTime.Text != value) + this.labelUpDelayTime.Text = value; value = item.JudgmentCount.ToString(); if (this.labelJudgmentCount.Text != value) @@ -325,6 +329,34 @@ namespace INT51DB.Controls } } + private void labelDownDelayTime_Click(object sender, EventArgs e) + { + string value = "", message = ""; + + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelDownDelayTime.Text, 4, 0, false, this.ParentForm.ParentForm.SystemConfig.Language); + + if (myKeyPad.ShowDialog() == DialogResult.OK) + { + if (myKeyPad.IntValue < 0 || myKeyPad.IntValue > 9999) + { + // 입력범위를 확인하세요 + message = "0~9999"; + DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.ParentForm.SystemConfig.Language, message); + myMsg.ShowDialog(); + } + else + { + this.labelDownDelayTime.Text = myKeyPad.StringValue; + this.SelectedJudgmentSetItem.DownDelayTime = myKeyPad.IntValue; + + value = Helper.StringZeroFillDigits4(myKeyPad.StringValue); + this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.DownDelayTime, value); + + this.ParentForm.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + } + } + } + private void labelJudgmentDelayTime_Click(object sender, EventArgs e) { string value = "", message = ""; @@ -354,15 +386,15 @@ namespace INT51DB.Controls } } - private void labelDoubleDelayTime_Click(object sender, EventArgs e) + private void labelUpDelayTime_Click(object sender, EventArgs e) { string value = "", message = ""; - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelDoubleDelayTime.Text, 4, 0, false, this.ParentForm.ParentForm.SystemConfig.Language); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelUpDelayTime.Text, 4, 0, false, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) { - if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 9999) + if (myKeyPad.IntValue < 0 || myKeyPad.IntValue > 9999) { // 입력범위를 확인하세요 message = "0~9999"; @@ -371,11 +403,12 @@ namespace INT51DB.Controls } else { - this.labelDoubleDelayTime.Text = myKeyPad.StringValue; - this.SelectedJudgmentSetItem.DoubleDelayTime = myKeyPad.IntValue; + this.labelUpDelayTime.Text = myKeyPad.StringValue; + this.SelectedJudgmentSetItem.UpDelayTime = myKeyPad.IntValue; + value = Helper.StringZeroFillDigits4(myKeyPad.StringValue); - this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.DoubleDelayTime, value); + this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.UpDelayTime, value); this.ParentForm.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); } @@ -475,8 +508,9 @@ namespace INT51DB.Controls this.buttonCopy.Text = this.labelProductNo.Text; this.CaptureJudgmentSetItem.Filter = this.SelectedJudgmentSetItem.Filter; + this.CaptureJudgmentSetItem.DownDelayTime = this.SelectedJudgmentSetItem.DownDelayTime; this.CaptureJudgmentSetItem.JudgmentDelayTime = this.SelectedJudgmentSetItem.JudgmentDelayTime; - this.CaptureJudgmentSetItem.DoubleDelayTime = this.SelectedJudgmentSetItem.DoubleDelayTime; + this.CaptureJudgmentSetItem.UpDelayTime = this.SelectedJudgmentSetItem.UpDelayTime; this.CaptureJudgmentSetItem.JudgmentCount = this.SelectedJudgmentSetItem.JudgmentCount; this.CaptureJudgmentSetItem.FeedSpeed = this.SelectedJudgmentSetItem.FeedSpeed; this.CaptureJudgmentSetItem.DynamicCorrection = this.SelectedJudgmentSetItem.DynamicCorrection; @@ -495,8 +529,9 @@ namespace INT51DB.Controls return; this.SelectedJudgmentSetItem.Filter = this.CaptureJudgmentSetItem.Filter; + this.SelectedJudgmentSetItem.DownDelayTime = this.CaptureJudgmentSetItem.DownDelayTime; this.SelectedJudgmentSetItem.JudgmentDelayTime = this.CaptureJudgmentSetItem.JudgmentDelayTime; - this.SelectedJudgmentSetItem.DoubleDelayTime = this.CaptureJudgmentSetItem.DoubleDelayTime; + this.SelectedJudgmentSetItem.UpDelayTime = this.CaptureJudgmentSetItem.UpDelayTime; this.SelectedJudgmentSetItem.JudgmentCount = this.CaptureJudgmentSetItem.JudgmentCount; this.SelectedJudgmentSetItem.FeedSpeed = this.CaptureJudgmentSetItem.FeedSpeed; this.SelectedJudgmentSetItem.DynamicCorrection = this.CaptureJudgmentSetItem.DynamicCorrection; @@ -531,8 +566,9 @@ namespace INT51DB.Controls this.ParentForm.Enabled = false; this.SelectedJudgmentSetItem.Filter = this.CaptureJudgmentSetItem.Filter; + this.SelectedJudgmentSetItem.DownDelayTime = this.CaptureJudgmentSetItem.DownDelayTime; this.SelectedJudgmentSetItem.JudgmentDelayTime = this.CaptureJudgmentSetItem.JudgmentDelayTime; - this.SelectedJudgmentSetItem.DoubleDelayTime = this.CaptureJudgmentSetItem.DoubleDelayTime; + this.SelectedJudgmentSetItem.UpDelayTime = this.CaptureJudgmentSetItem.UpDelayTime; this.SelectedJudgmentSetItem.JudgmentCount = this.CaptureJudgmentSetItem.JudgmentCount; this.SelectedJudgmentSetItem.FeedSpeed = this.CaptureJudgmentSetItem.FeedSpeed; this.SelectedJudgmentSetItem.DynamicCorrection = this.CaptureJudgmentSetItem.DynamicCorrection; @@ -552,13 +588,13 @@ namespace INT51DB.Controls for (int i = 0; i < 1000; i++) { structItem.Filter = this.SelectedJudgmentSetItem.Filter; + structItem.DownDelayTime = this.SelectedJudgmentSetItem.DownDelayTime; structItem.JudgmentDelayTime = this.SelectedJudgmentSetItem.JudgmentDelayTime; - structItem.DoubleDelayTime = this.SelectedJudgmentSetItem.DoubleDelayTime; + structItem.UpDelayTime = this.SelectedJudgmentSetItem.UpDelayTime; structItem.JudgmentCount = this.SelectedJudgmentSetItem.JudgmentCount; structItem.FeedSpeed = this.SelectedJudgmentSetItem.FeedSpeed; structItem.DynamicCorrection = this.SelectedJudgmentSetItem.DynamicCorrection; - structItem.Sorter1Mode = this.SelectedJudgmentSetItem.Sorter1Mode; structItem.Sorter1DelayTime = this.SelectedJudgmentSetItem.Sorter1DelayTime; structItem.Sorter1RunTime = this.SelectedJudgmentSetItem.Sorter1RunTime; @@ -600,6 +636,16 @@ namespace INT51DB.Controls this.RefrenceADC = this.labelADCValue.Text; } + + private void buttonConveyorDown_Click(object sender, EventArgs e) + { + this.ParentForm.ParentForm.TransferData(CommunicationCommand.MotorDown, CommunicationID.MainBoard); + } + + private void buttonConveyorUp_Click(object sender, EventArgs e) + { + this.ParentForm.ParentForm.TransferData(CommunicationCommand.MotorUp, CommunicationID.MainBoard); + } #endregion } } diff --git a/INT51DB/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.resx b/INT51DB/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.resx index d0c2a87..519d45e 100644 --- a/INT51DB/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.resx +++ b/INT51DB/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.resx @@ -118,6 +118,454 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + vCkVvwHLDgFzDEwe5AAAAABJRU5ErkJggg== + + + + + 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 + TkSuQmCC + + + + + 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 + g/8CK1ir1km0pigAAAAASUVORK5CYII= + + + + + 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 + aN98FgAAAABJRU5ErkJggg== + + iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH diff --git a/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.Designer.cs b/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.Designer.cs index 6d6b844..a383c84 100644 --- a/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.Designer.cs +++ b/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.Designer.cs @@ -31,52 +31,34 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlCenterSystemServoMotor)); this.smartGroupBox1 = new SmartX.SmartGroupBox(); this.smartLabel10 = new SmartX.SmartLabel(); - this.labelSpeed11 = new SmartX.SmartLabel(); - this.labelSpeed21 = new SmartX.SmartLabel(); + this.labelSpeed1 = new SmartX.SmartLabel(); this.smartLabel1 = new SmartX.SmartLabel(); this.buttonStart = new SmartX.SmartButton(); this.buttonStop = new SmartX.SmartButton(); this.buttonConveyorUp2 = new SmartX.SmartButton(); - this.buttonStep = new SmartX.SmartButton(); this.smartLabel2 = new SmartX.SmartLabel(); - this.buttonOrigin2 = new SmartX.SmartButton(); + this.buttonOrigin = new SmartX.SmartButton(); this.smartLabel3 = new SmartX.SmartLabel(); - this.buttonOrigin1 = new SmartX.SmartButton(); this.smartLabel4 = new SmartX.SmartLabel(); - this.buttonConveyorReverse = new SmartX.SmartButton(); this.smartLabel5 = new SmartX.SmartLabel(); - this.buttonConveyorForward = new SmartX.SmartButton(); this.smartLabel6 = new SmartX.SmartLabel(); this.buttonConveyorDown = new SmartX.SmartButton(); this.smartLabel7 = new SmartX.SmartLabel(); this.buttonConveyorUp = new SmartX.SmartButton(); - this.smartLabel8 = new SmartX.SmartLabel(); this.buttonAlarmRead = new SmartX.SmartButton(); - this.smartLabel9 = new SmartX.SmartLabel(); this.buttonParameterRead = new SmartX.SmartButton(); - this.smartLabel16 = new SmartX.SmartLabel(); this.buttonClose = new SmartX.SmartButton(); - this.labelOrigin1 = new SmartX.SmartLabel(); this.buttonOpen = new SmartX.SmartButton(); - this.labelORGSpeed1 = new SmartX.SmartLabel(); this.labelModusStatus = new SmartX.SmartLabel(); - this.labelSpeed10 = new SmartX.SmartLabel(); this.labelMotorAlarmRead = new SmartX.SmartLabel(); - this.labelPosition10 = new SmartX.SmartLabel(); - this.comboBoxAlarmRead = new System.Windows.Forms.ComboBox(); - this.labelPosition11 = new SmartX.SmartLabel(); - this.labelPosition19 = new SmartX.SmartLabel(); this.buttonAlarmReset2 = new SmartX.SmartButton(); this.smartLabel23 = new SmartX.SmartLabel(); - this.buttonAlarmReset1 = new SmartX.SmartButton(); - this.labelOrigin2 = new SmartX.SmartLabel(); - this.labelORGSpeed2 = 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.labelPosition29 = new SmartX.SmartLabel(); + this.labelOrigin = new SmartX.SmartLabel(); + this.labelORGSpeed = new SmartX.SmartLabel(); + this.labelSpeed0 = new SmartX.SmartLabel(); + this.labelPosition0 = new SmartX.SmartLabel(); + this.labelPosition1 = new SmartX.SmartLabel(); + this.labelPosition9 = new SmartX.SmartLabel(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -86,52 +68,34 @@ this.smartGroupBox1.BackPictureBox = null; this.smartGroupBox1.BackPictureBox1 = null; this.smartGroupBox1.Controls.Add(this.smartLabel10); - this.smartGroupBox1.Controls.Add(this.labelSpeed11); - this.smartGroupBox1.Controls.Add(this.labelSpeed21); + this.smartGroupBox1.Controls.Add(this.labelSpeed1); this.smartGroupBox1.Controls.Add(this.smartLabel1); this.smartGroupBox1.Controls.Add(this.buttonStart); this.smartGroupBox1.Controls.Add(this.buttonStop); this.smartGroupBox1.Controls.Add(this.buttonConveyorUp2); - this.smartGroupBox1.Controls.Add(this.buttonStep); this.smartGroupBox1.Controls.Add(this.smartLabel2); - this.smartGroupBox1.Controls.Add(this.buttonOrigin2); + this.smartGroupBox1.Controls.Add(this.buttonOrigin); this.smartGroupBox1.Controls.Add(this.smartLabel3); - this.smartGroupBox1.Controls.Add(this.buttonOrigin1); this.smartGroupBox1.Controls.Add(this.smartLabel4); - this.smartGroupBox1.Controls.Add(this.buttonConveyorReverse); this.smartGroupBox1.Controls.Add(this.smartLabel5); - this.smartGroupBox1.Controls.Add(this.buttonConveyorForward); this.smartGroupBox1.Controls.Add(this.smartLabel6); this.smartGroupBox1.Controls.Add(this.buttonConveyorDown); this.smartGroupBox1.Controls.Add(this.smartLabel7); this.smartGroupBox1.Controls.Add(this.buttonConveyorUp); - this.smartGroupBox1.Controls.Add(this.smartLabel8); this.smartGroupBox1.Controls.Add(this.buttonAlarmRead); - this.smartGroupBox1.Controls.Add(this.smartLabel9); this.smartGroupBox1.Controls.Add(this.buttonParameterRead); - this.smartGroupBox1.Controls.Add(this.smartLabel16); this.smartGroupBox1.Controls.Add(this.buttonClose); - this.smartGroupBox1.Controls.Add(this.labelOrigin1); this.smartGroupBox1.Controls.Add(this.buttonOpen); - this.smartGroupBox1.Controls.Add(this.labelORGSpeed1); this.smartGroupBox1.Controls.Add(this.labelModusStatus); - this.smartGroupBox1.Controls.Add(this.labelSpeed10); this.smartGroupBox1.Controls.Add(this.labelMotorAlarmRead); - this.smartGroupBox1.Controls.Add(this.labelPosition10); - this.smartGroupBox1.Controls.Add(this.comboBoxAlarmRead); - this.smartGroupBox1.Controls.Add(this.labelPosition11); - this.smartGroupBox1.Controls.Add(this.labelPosition19); this.smartGroupBox1.Controls.Add(this.buttonAlarmReset2); this.smartGroupBox1.Controls.Add(this.smartLabel23); - this.smartGroupBox1.Controls.Add(this.buttonAlarmReset1); - this.smartGroupBox1.Controls.Add(this.labelOrigin2); - this.smartGroupBox1.Controls.Add(this.labelORGSpeed2); - this.smartGroupBox1.Controls.Add(this.smartLabel32); - this.smartGroupBox1.Controls.Add(this.labelSpeed20); - this.smartGroupBox1.Controls.Add(this.smartLabel31); - this.smartGroupBox1.Controls.Add(this.labelPosition20); - this.smartGroupBox1.Controls.Add(this.labelPosition21); - this.smartGroupBox1.Controls.Add(this.labelPosition29); + this.smartGroupBox1.Controls.Add(this.labelOrigin); + this.smartGroupBox1.Controls.Add(this.labelORGSpeed); + this.smartGroupBox1.Controls.Add(this.labelSpeed0); + this.smartGroupBox1.Controls.Add(this.labelPosition0); + this.smartGroupBox1.Controls.Add(this.labelPosition1); + this.smartGroupBox1.Controls.Add(this.labelPosition9); this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black; this.smartGroupBox1.FrameLineThickness = 2; @@ -154,55 +118,34 @@ this.smartLabel10.ForeColor = System.Drawing.Color.White; this.smartLabel10.InitVisible = true; this.smartLabel10.LineSpacing = 0F; - this.smartLabel10.Location = new System.Drawing.Point(22, 208); + this.smartLabel10.Location = new System.Drawing.Point(108, 248); this.smartLabel10.Name = "smartLabel10"; - this.smartLabel10.Size = new System.Drawing.Size(80, 25); + this.smartLabel10.Size = new System.Drawing.Size(80, 35); this.smartLabel10.TabIndex = 462; this.smartLabel10.Text = "속도1"; this.smartLabel10.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.smartLabel10.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel10.Wordwrap = false; // - // labelSpeed11 + // labelSpeed1 // - this.labelSpeed11.BackColor = System.Drawing.Color.White; - this.labelSpeed11.BackPictureBox = null; - this.labelSpeed11.BackPictureBox1 = null; - this.labelSpeed11.BackPictureBox2 = null; - this.labelSpeed11.BorderColor = System.Drawing.Color.Black; - this.labelSpeed11.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelSpeed11.InitVisible = true; - this.labelSpeed11.LineSpacing = 0F; - this.labelSpeed11.Location = new System.Drawing.Point(108, 208); - this.labelSpeed11.Name = "labelSpeed11"; - this.labelSpeed11.Size = new System.Drawing.Size(80, 25); - this.labelSpeed11.TabIndex = 463; - this.labelSpeed11.Text = "0"; - this.labelSpeed11.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelSpeed11.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelSpeed11.Visible = false; - this.labelSpeed11.Wordwrap = false; - this.labelSpeed11.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); - // - // labelSpeed21 - // - this.labelSpeed21.BackColor = System.Drawing.Color.White; - this.labelSpeed21.BackPictureBox = null; - this.labelSpeed21.BackPictureBox1 = null; - this.labelSpeed21.BackPictureBox2 = null; - this.labelSpeed21.BorderColor = System.Drawing.Color.Black; - this.labelSpeed21.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelSpeed21.InitVisible = true; - this.labelSpeed21.LineSpacing = 0F; - this.labelSpeed21.Location = new System.Drawing.Point(194, 208); - this.labelSpeed21.Name = "labelSpeed21"; - this.labelSpeed21.Size = new System.Drawing.Size(80, 25); - this.labelSpeed21.TabIndex = 464; - this.labelSpeed21.Text = "0"; - this.labelSpeed21.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelSpeed21.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelSpeed21.Wordwrap = false; - this.labelSpeed21.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); + this.labelSpeed1.BackColor = System.Drawing.Color.White; + this.labelSpeed1.BackPictureBox = null; + this.labelSpeed1.BackPictureBox1 = null; + this.labelSpeed1.BackPictureBox2 = null; + this.labelSpeed1.BorderColor = System.Drawing.Color.Black; + 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.Name = "labelSpeed1"; + this.labelSpeed1.Size = new System.Drawing.Size(80, 35); + this.labelSpeed1.TabIndex = 464; + this.labelSpeed1.Text = "0"; + this.labelSpeed1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelSpeed1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelSpeed1.Wordwrap = false; + this.labelSpeed1.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); // // smartLabel1 // @@ -213,9 +156,9 @@ this.smartLabel1.ForeColor = System.Drawing.Color.White; this.smartLabel1.InitVisible = true; this.smartLabel1.LineSpacing = 0F; - this.smartLabel1.Location = new System.Drawing.Point(22, 84); + this.smartLabel1.Location = new System.Drawing.Point(108, 84); this.smartLabel1.Name = "smartLabel1"; - this.smartLabel1.Size = new System.Drawing.Size(80, 25); + this.smartLabel1.Size = new System.Drawing.Size(80, 35); this.smartLabel1.TabIndex = 461; this.smartLabel1.Text = "ID"; this.smartLabel1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -234,13 +177,15 @@ this.buttonStart.DownImage = null; this.buttonStart.GroupID = 0; this.buttonStart.InitVisible = true; - this.buttonStart.Location = new System.Drawing.Point(579, 248); + this.buttonStart.Location = new System.Drawing.Point(527, 247); this.buttonStart.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonStart.Name = "buttonStart"; this.buttonStart.NestedClickEventPrevent = false; + this.buttonStart.OutlinePixel = 1; this.buttonStart.RepeatInterval = 200; + this.buttonStart.RepeatIntervalAccelerate = null; this.buttonStart.SafeInterval = 200; - this.buttonStart.Size = new System.Drawing.Size(80, 25); + this.buttonStart.Size = new System.Drawing.Size(80, 35); this.buttonStart.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.buttonStart.TabIndex = 460; this.buttonStart.Text = "Start"; @@ -264,13 +209,15 @@ this.buttonStop.DownImage = null; this.buttonStop.GroupID = 0; this.buttonStop.InitVisible = true; - this.buttonStop.Location = new System.Drawing.Point(493, 248); + this.buttonStop.Location = new System.Drawing.Point(441, 247); this.buttonStop.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonStop.Name = "buttonStop"; this.buttonStop.NestedClickEventPrevent = false; + this.buttonStop.OutlinePixel = 1; this.buttonStop.RepeatInterval = 200; + this.buttonStop.RepeatIntervalAccelerate = null; this.buttonStop.SafeInterval = 200; - this.buttonStop.Size = new System.Drawing.Size(80, 25); + this.buttonStop.Size = new System.Drawing.Size(80, 35); this.buttonStop.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.buttonStop.TabIndex = 459; this.buttonStop.Text = "Stop"; @@ -294,13 +241,15 @@ this.buttonConveyorUp2.DownImage = null; this.buttonConveyorUp2.GroupID = 0; this.buttonConveyorUp2.InitVisible = true; - this.buttonConveyorUp2.Location = new System.Drawing.Point(493, 62); + this.buttonConveyorUp2.Location = new System.Drawing.Point(527, 72); this.buttonConveyorUp2.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonConveyorUp2.Name = "buttonConveyorUp2"; this.buttonConveyorUp2.NestedClickEventPrevent = false; + this.buttonConveyorUp2.OutlinePixel = 1; this.buttonConveyorUp2.RepeatInterval = 200; + this.buttonConveyorUp2.RepeatIntervalAccelerate = null; this.buttonConveyorUp2.SafeInterval = 200; - this.buttonConveyorUp2.Size = new System.Drawing.Size(80, 25); + this.buttonConveyorUp2.Size = new System.Drawing.Size(80, 35); this.buttonConveyorUp2.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.buttonConveyorUp2.TabIndex = 458; this.buttonConveyorUp2.Text = "Up2"; @@ -312,36 +261,6 @@ this.buttonConveyorUp2.UpImage = null; this.buttonConveyorUp2.Click += new System.EventHandler(this.buttonConveyorUp2_Click); // - // buttonStep - // - this.buttonStep.BackPictureBox = null; - this.buttonStep.BackPictureBox1 = null; - this.buttonStep.BackPictureBox2 = null; - this.buttonStep.ButtonColor = System.Drawing.Color.LightGray; - this.buttonStep.ButtonImageAutoSize = true; - this.buttonStep.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonStep.DisableImage = null; - this.buttonStep.DownImage = null; - this.buttonStep.GroupID = 0; - this.buttonStep.InitVisible = true; - this.buttonStep.Location = new System.Drawing.Point(493, 186); - this.buttonStep.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.buttonStep.Name = "buttonStep"; - this.buttonStep.NestedClickEventPrevent = false; - this.buttonStep.RepeatInterval = 200; - this.buttonStep.SafeInterval = 200; - this.buttonStep.Size = new System.Drawing.Size(80, 25); - this.buttonStep.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonStep.TabIndex = 456; - this.buttonStep.Text = "Step"; - this.buttonStep.TextColor = System.Drawing.Color.Black; - this.buttonStep.TextDownColor = System.Drawing.Color.White; - this.buttonStep.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonStep.TextLocation = new System.Drawing.Point(0, 0); - this.buttonStep.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonStep.UpImage = null; - this.buttonStep.Click += new System.EventHandler(this.buttonStep_Click); - // // smartLabel2 // this.smartLabel2.BackPictureBox1 = null; @@ -351,44 +270,46 @@ this.smartLabel2.ForeColor = System.Drawing.Color.White; this.smartLabel2.InitVisible = true; this.smartLabel2.LineSpacing = 0F; - this.smartLabel2.Location = new System.Drawing.Point(22, 115); + this.smartLabel2.Location = new System.Drawing.Point(108, 125); this.smartLabel2.Name = "smartLabel2"; - this.smartLabel2.Size = new System.Drawing.Size(80, 25); + this.smartLabel2.Size = new System.Drawing.Size(80, 35); this.smartLabel2.TabIndex = 2; this.smartLabel2.Text = "원점옵셋"; this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel2.Wordwrap = false; // - // buttonOrigin2 + // buttonOrigin // - this.buttonOrigin2.BackPictureBox = null; - this.buttonOrigin2.BackPictureBox1 = null; - this.buttonOrigin2.BackPictureBox2 = null; - this.buttonOrigin2.ButtonColor = System.Drawing.Color.LightGray; - this.buttonOrigin2.ButtonImageAutoSize = true; - this.buttonOrigin2.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonOrigin2.DisableImage = null; - this.buttonOrigin2.DownImage = null; - this.buttonOrigin2.GroupID = 0; - this.buttonOrigin2.InitVisible = true; - this.buttonOrigin2.Location = new System.Drawing.Point(194, 332); - this.buttonOrigin2.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.buttonOrigin2.Name = "buttonOrigin2"; - this.buttonOrigin2.NestedClickEventPrevent = false; - this.buttonOrigin2.RepeatInterval = 200; - this.buttonOrigin2.SafeInterval = 200; - this.buttonOrigin2.Size = new System.Drawing.Size(80, 25); - this.buttonOrigin2.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonOrigin2.TabIndex = 453; - this.buttonOrigin2.Text = "Origin"; - this.buttonOrigin2.TextColor = System.Drawing.Color.Black; - this.buttonOrigin2.TextDownColor = System.Drawing.Color.White; - this.buttonOrigin2.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonOrigin2.TextLocation = new System.Drawing.Point(0, 0); - this.buttonOrigin2.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonOrigin2.UpImage = null; - this.buttonOrigin2.Click += new System.EventHandler(this.buttonOrigin2_Click); + this.buttonOrigin.BackPictureBox = null; + this.buttonOrigin.BackPictureBox1 = null; + this.buttonOrigin.BackPictureBox2 = null; + this.buttonOrigin.ButtonColor = System.Drawing.Color.LightGray; + this.buttonOrigin.ButtonImageAutoSize = true; + this.buttonOrigin.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonOrigin.DisableImage = null; + this.buttonOrigin.DownImage = null; + this.buttonOrigin.GroupID = 0; + this.buttonOrigin.InitVisible = true; + this.buttonOrigin.Location = new System.Drawing.Point(441, 113); + this.buttonOrigin.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.buttonOrigin.Name = "buttonOrigin"; + this.buttonOrigin.NestedClickEventPrevent = false; + this.buttonOrigin.OutlinePixel = 1; + this.buttonOrigin.RepeatInterval = 200; + this.buttonOrigin.RepeatIntervalAccelerate = null; + this.buttonOrigin.SafeInterval = 200; + this.buttonOrigin.Size = new System.Drawing.Size(80, 35); + this.buttonOrigin.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonOrigin.TabIndex = 453; + this.buttonOrigin.Text = "Origin"; + this.buttonOrigin.TextColor = System.Drawing.Color.Black; + this.buttonOrigin.TextDownColor = System.Drawing.Color.White; + this.buttonOrigin.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonOrigin.TextLocation = new System.Drawing.Point(0, 0); + this.buttonOrigin.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonOrigin.UpImage = null; + this.buttonOrigin.Click += new System.EventHandler(this.buttonOrigin_Click); // // smartLabel3 // @@ -399,46 +320,15 @@ this.smartLabel3.ForeColor = System.Drawing.Color.White; this.smartLabel3.InitVisible = true; this.smartLabel3.LineSpacing = 0F; - this.smartLabel3.Location = new System.Drawing.Point(22, 146); + this.smartLabel3.Location = new System.Drawing.Point(108, 166); this.smartLabel3.Name = "smartLabel3"; - this.smartLabel3.Size = new System.Drawing.Size(80, 25); + this.smartLabel3.Size = new System.Drawing.Size(80, 35); this.smartLabel3.TabIndex = 3; this.smartLabel3.Text = "원점속도"; this.smartLabel3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.smartLabel3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel3.Wordwrap = false; // - // buttonOrigin1 - // - this.buttonOrigin1.BackPictureBox = null; - this.buttonOrigin1.BackPictureBox1 = null; - this.buttonOrigin1.BackPictureBox2 = null; - this.buttonOrigin1.ButtonColor = System.Drawing.Color.LightGray; - this.buttonOrigin1.ButtonImageAutoSize = true; - this.buttonOrigin1.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonOrigin1.DisableImage = null; - this.buttonOrigin1.DownImage = null; - this.buttonOrigin1.GroupID = 0; - this.buttonOrigin1.InitVisible = true; - this.buttonOrigin1.Location = new System.Drawing.Point(108, 332); - this.buttonOrigin1.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.buttonOrigin1.Name = "buttonOrigin1"; - this.buttonOrigin1.NestedClickEventPrevent = false; - this.buttonOrigin1.RepeatInterval = 200; - this.buttonOrigin1.SafeInterval = 200; - this.buttonOrigin1.Size = new System.Drawing.Size(80, 25); - this.buttonOrigin1.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonOrigin1.TabIndex = 452; - this.buttonOrigin1.Text = "Origin"; - this.buttonOrigin1.TextColor = System.Drawing.Color.Black; - this.buttonOrigin1.TextDownColor = System.Drawing.Color.White; - this.buttonOrigin1.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonOrigin1.TextLocation = new System.Drawing.Point(0, 0); - this.buttonOrigin1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonOrigin1.UpImage = null; - this.buttonOrigin1.Visible = false; - this.buttonOrigin1.Click += new System.EventHandler(this.buttonOrigin1_Click); - // // smartLabel4 // this.smartLabel4.BackPictureBox1 = null; @@ -448,45 +338,15 @@ this.smartLabel4.ForeColor = System.Drawing.Color.White; this.smartLabel4.InitVisible = true; this.smartLabel4.LineSpacing = 0F; - this.smartLabel4.Location = new System.Drawing.Point(22, 177); + this.smartLabel4.Location = new System.Drawing.Point(108, 207); this.smartLabel4.Name = "smartLabel4"; - this.smartLabel4.Size = new System.Drawing.Size(80, 25); + this.smartLabel4.Size = new System.Drawing.Size(80, 35); this.smartLabel4.TabIndex = 4; this.smartLabel4.Text = "속도0"; this.smartLabel4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.smartLabel4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel4.Wordwrap = false; // - // buttonConveyorReverse - // - this.buttonConveyorReverse.BackPictureBox = null; - this.buttonConveyorReverse.BackPictureBox1 = null; - this.buttonConveyorReverse.BackPictureBox2 = null; - this.buttonConveyorReverse.ButtonColor = System.Drawing.Color.LightGray; - this.buttonConveyorReverse.ButtonImageAutoSize = true; - this.buttonConveyorReverse.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonConveyorReverse.DisableImage = null; - this.buttonConveyorReverse.DownImage = null; - this.buttonConveyorReverse.GroupID = 0; - this.buttonConveyorReverse.InitVisible = true; - this.buttonConveyorReverse.Location = new System.Drawing.Point(579, 93); - this.buttonConveyorReverse.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.buttonConveyorReverse.Name = "buttonConveyorReverse"; - this.buttonConveyorReverse.NestedClickEventPrevent = false; - this.buttonConveyorReverse.RepeatInterval = 200; - this.buttonConveyorReverse.SafeInterval = 200; - this.buttonConveyorReverse.Size = new System.Drawing.Size(80, 25); - this.buttonConveyorReverse.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonConveyorReverse.TabIndex = 449; - this.buttonConveyorReverse.Text = "Reverse"; - this.buttonConveyorReverse.TextColor = System.Drawing.Color.Black; - this.buttonConveyorReverse.TextDownColor = System.Drawing.Color.White; - this.buttonConveyorReverse.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonConveyorReverse.TextLocation = new System.Drawing.Point(0, 0); - this.buttonConveyorReverse.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonConveyorReverse.UpImage = null; - this.buttonConveyorReverse.Click += new System.EventHandler(this.buttonConveyorReverse_Click); - // // smartLabel5 // this.smartLabel5.BackPictureBox1 = null; @@ -496,45 +356,15 @@ this.smartLabel5.ForeColor = System.Drawing.Color.White; this.smartLabel5.InitVisible = true; this.smartLabel5.LineSpacing = 0F; - this.smartLabel5.Location = new System.Drawing.Point(22, 239); + this.smartLabel5.Location = new System.Drawing.Point(108, 330); this.smartLabel5.Name = "smartLabel5"; - this.smartLabel5.Size = new System.Drawing.Size(80, 25); + this.smartLabel5.Size = new System.Drawing.Size(80, 35); this.smartLabel5.TabIndex = 5; - this.smartLabel5.Text = "위치0"; + this.smartLabel5.Text = "Up1"; this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.smartLabel5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel5.Wordwrap = false; // - // buttonConveyorForward - // - this.buttonConveyorForward.BackPictureBox = null; - this.buttonConveyorForward.BackPictureBox1 = null; - this.buttonConveyorForward.BackPictureBox2 = null; - this.buttonConveyorForward.ButtonColor = System.Drawing.Color.LightGray; - this.buttonConveyorForward.ButtonImageAutoSize = true; - this.buttonConveyorForward.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonConveyorForward.DisableImage = null; - this.buttonConveyorForward.DownImage = null; - this.buttonConveyorForward.GroupID = 0; - this.buttonConveyorForward.InitVisible = true; - this.buttonConveyorForward.Location = new System.Drawing.Point(579, 62); - this.buttonConveyorForward.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.buttonConveyorForward.Name = "buttonConveyorForward"; - this.buttonConveyorForward.NestedClickEventPrevent = false; - this.buttonConveyorForward.RepeatInterval = 200; - this.buttonConveyorForward.SafeInterval = 200; - this.buttonConveyorForward.Size = new System.Drawing.Size(80, 25); - this.buttonConveyorForward.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonConveyorForward.TabIndex = 448; - this.buttonConveyorForward.Text = "Forward"; - this.buttonConveyorForward.TextColor = System.Drawing.Color.Black; - this.buttonConveyorForward.TextDownColor = System.Drawing.Color.White; - this.buttonConveyorForward.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonConveyorForward.TextLocation = new System.Drawing.Point(0, 0); - this.buttonConveyorForward.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonConveyorForward.UpImage = null; - this.buttonConveyorForward.Click += new System.EventHandler(this.buttonConveyorForward_Click); - // // smartLabel6 // this.smartLabel6.BackPictureBox1 = null; @@ -544,11 +374,11 @@ this.smartLabel6.ForeColor = System.Drawing.Color.White; this.smartLabel6.InitVisible = true; this.smartLabel6.LineSpacing = 0F; - this.smartLabel6.Location = new System.Drawing.Point(22, 270); + this.smartLabel6.Location = new System.Drawing.Point(108, 371); this.smartLabel6.Name = "smartLabel6"; - this.smartLabel6.Size = new System.Drawing.Size(80, 25); + this.smartLabel6.Size = new System.Drawing.Size(80, 35); this.smartLabel6.TabIndex = 6; - this.smartLabel6.Text = "위치1"; + this.smartLabel6.Text = "Down"; this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel6.Wordwrap = false; @@ -565,13 +395,15 @@ this.buttonConveyorDown.DownImage = null; this.buttonConveyorDown.GroupID = 0; this.buttonConveyorDown.InitVisible = true; - this.buttonConveyorDown.Location = new System.Drawing.Point(493, 124); + this.buttonConveyorDown.Location = new System.Drawing.Point(527, 154); this.buttonConveyorDown.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonConveyorDown.Name = "buttonConveyorDown"; this.buttonConveyorDown.NestedClickEventPrevent = false; + this.buttonConveyorDown.OutlinePixel = 1; this.buttonConveyorDown.RepeatInterval = 200; + this.buttonConveyorDown.RepeatIntervalAccelerate = null; this.buttonConveyorDown.SafeInterval = 200; - this.buttonConveyorDown.Size = new System.Drawing.Size(80, 25); + this.buttonConveyorDown.Size = new System.Drawing.Size(80, 35); this.buttonConveyorDown.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.buttonConveyorDown.TabIndex = 447; this.buttonConveyorDown.Text = "Down"; @@ -592,11 +424,11 @@ this.smartLabel7.ForeColor = System.Drawing.Color.White; this.smartLabel7.InitVisible = true; this.smartLabel7.LineSpacing = 0F; - this.smartLabel7.Location = new System.Drawing.Point(22, 301); + this.smartLabel7.Location = new System.Drawing.Point(108, 289); this.smartLabel7.Name = "smartLabel7"; - this.smartLabel7.Size = new System.Drawing.Size(80, 25); + this.smartLabel7.Size = new System.Drawing.Size(80, 35); this.smartLabel7.TabIndex = 6; - this.smartLabel7.Text = "위치9"; + this.smartLabel7.Text = "Up2"; this.smartLabel7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.smartLabel7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel7.Wordwrap = false; @@ -613,13 +445,15 @@ this.buttonConveyorUp.DownImage = null; this.buttonConveyorUp.GroupID = 0; this.buttonConveyorUp.InitVisible = true; - this.buttonConveyorUp.Location = new System.Drawing.Point(493, 93); + this.buttonConveyorUp.Location = new System.Drawing.Point(527, 113); this.buttonConveyorUp.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonConveyorUp.Name = "buttonConveyorUp"; this.buttonConveyorUp.NestedClickEventPrevent = false; + this.buttonConveyorUp.OutlinePixel = 1; this.buttonConveyorUp.RepeatInterval = 200; + this.buttonConveyorUp.RepeatIntervalAccelerate = null; this.buttonConveyorUp.SafeInterval = 200; - this.buttonConveyorUp.Size = new System.Drawing.Size(80, 25); + this.buttonConveyorUp.Size = new System.Drawing.Size(80, 35); this.buttonConveyorUp.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.buttonConveyorUp.TabIndex = 446; this.buttonConveyorUp.Text = "Up1"; @@ -631,24 +465,6 @@ this.buttonConveyorUp.UpImage = null; this.buttonConveyorUp.Click += new System.EventHandler(this.buttonConveyorUp_Click); // - // smartLabel8 - // - this.smartLabel8.BackPictureBox1 = null; - this.smartLabel8.BackPictureBox2 = this.smartGroupBox1; - this.smartLabel8.BorderColor = System.Drawing.Color.Black; - this.smartLabel8.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel8.ForeColor = System.Drawing.Color.White; - this.smartLabel8.InitVisible = true; - this.smartLabel8.LineSpacing = 0F; - this.smartLabel8.Location = new System.Drawing.Point(22, 363); - this.smartLabel8.Name = "smartLabel8"; - this.smartLabel8.Size = new System.Drawing.Size(80, 25); - this.smartLabel8.TabIndex = 7; - this.smartLabel8.Text = "알람Reset"; - this.smartLabel8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel8.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel8.Wordwrap = false; - // // buttonAlarmRead // this.buttonAlarmRead.BackPictureBox = null; @@ -661,13 +477,15 @@ this.buttonAlarmRead.DownImage = null; this.buttonAlarmRead.GroupID = 0; this.buttonAlarmRead.InitVisible = true; - this.buttonAlarmRead.Location = new System.Drawing.Point(611, 363); + this.buttonAlarmRead.Location = new System.Drawing.Point(441, 330); this.buttonAlarmRead.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonAlarmRead.Name = "buttonAlarmRead"; this.buttonAlarmRead.NestedClickEventPrevent = false; + this.buttonAlarmRead.OutlinePixel = 1; this.buttonAlarmRead.RepeatInterval = 200; + this.buttonAlarmRead.RepeatIntervalAccelerate = null; this.buttonAlarmRead.SafeInterval = 200; - this.buttonAlarmRead.Size = new System.Drawing.Size(80, 25); + this.buttonAlarmRead.Size = new System.Drawing.Size(80, 35); this.buttonAlarmRead.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.buttonAlarmRead.TabIndex = 444; this.buttonAlarmRead.Text = "Alarm Read"; @@ -679,24 +497,6 @@ this.buttonAlarmRead.UpImage = null; this.buttonAlarmRead.Click += new System.EventHandler(this.buttonAlarmRead_Click); // - // smartLabel9 - // - this.smartLabel9.BackPictureBox1 = null; - this.smartLabel9.BackPictureBox2 = this.smartGroupBox1; - this.smartLabel9.BorderColor = System.Drawing.Color.Black; - this.smartLabel9.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel9.ForeColor = System.Drawing.Color.White; - this.smartLabel9.InitVisible = true; - this.smartLabel9.LineSpacing = 0F; - this.smartLabel9.Location = new System.Drawing.Point(439, 332); - this.smartLabel9.Name = "smartLabel9"; - this.smartLabel9.Size = new System.Drawing.Size(80, 25); - this.smartLabel9.TabIndex = 8; - this.smartLabel9.Text = "알람Read"; - this.smartLabel9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel9.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel9.Wordwrap = false; - // // buttonParameterRead // this.buttonParameterRead.BackPictureBox = null; @@ -709,13 +509,15 @@ this.buttonParameterRead.DownImage = null; this.buttonParameterRead.GroupID = 0; this.buttonParameterRead.InitVisible = true; - this.buttonParameterRead.Location = new System.Drawing.Point(280, 208); + this.buttonParameterRead.Location = new System.Drawing.Point(280, 248); 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.Size = new System.Drawing.Size(80, 35); this.buttonParameterRead.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.buttonParameterRead.TabIndex = 442; this.buttonParameterRead.Text = "All Read"; @@ -727,25 +529,6 @@ this.buttonParameterRead.UpImage = null; this.buttonParameterRead.Click += new System.EventHandler(this.buttonParameterRead_Click); // - // smartLabel16 - // - this.smartLabel16.BackColor = System.Drawing.Color.White; - this.smartLabel16.BackPictureBox = null; - this.smartLabel16.BackPictureBox1 = null; - this.smartLabel16.BackPictureBox2 = null; - this.smartLabel16.BorderColor = System.Drawing.Color.Black; - this.smartLabel16.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel16.InitVisible = true; - this.smartLabel16.LineSpacing = 0F; - this.smartLabel16.Location = new System.Drawing.Point(108, 84); - this.smartLabel16.Name = "smartLabel16"; - this.smartLabel16.Size = new System.Drawing.Size(80, 25); - this.smartLabel16.TabIndex = 9; - this.smartLabel16.Text = "1"; - this.smartLabel16.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel16.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel16.Wordwrap = false; - // // buttonClose // this.buttonClose.BackPictureBox = null; @@ -758,13 +541,15 @@ this.buttonClose.DownImage = null; this.buttonClose.GroupID = 0; this.buttonClose.InitVisible = true; - this.buttonClose.Location = new System.Drawing.Point(280, 146); + this.buttonClose.Location = new System.Drawing.Point(280, 166); 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.Size = new System.Drawing.Size(80, 35); this.buttonClose.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.buttonClose.TabIndex = 441; this.buttonClose.Text = "Close"; @@ -776,27 +561,6 @@ this.buttonClose.UpImage = null; this.buttonClose.Click += new System.EventHandler(this.buttonClose_Click); // - // labelOrigin1 - // - this.labelOrigin1.BackColor = System.Drawing.Color.White; - this.labelOrigin1.BackPictureBox = null; - this.labelOrigin1.BackPictureBox1 = null; - this.labelOrigin1.BackPictureBox2 = null; - this.labelOrigin1.BorderColor = System.Drawing.Color.Black; - this.labelOrigin1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelOrigin1.InitVisible = true; - this.labelOrigin1.LineSpacing = 0F; - this.labelOrigin1.Location = new System.Drawing.Point(108, 115); - this.labelOrigin1.Name = "labelOrigin1"; - this.labelOrigin1.Size = new System.Drawing.Size(80, 25); - this.labelOrigin1.TabIndex = 10; - this.labelOrigin1.Text = "0"; - this.labelOrigin1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelOrigin1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelOrigin1.Visible = false; - this.labelOrigin1.Wordwrap = false; - this.labelOrigin1.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); - // // buttonOpen // this.buttonOpen.BackPictureBox = null; @@ -809,13 +573,15 @@ this.buttonOpen.DownImage = null; this.buttonOpen.GroupID = 0; this.buttonOpen.InitVisible = true; - this.buttonOpen.Location = new System.Drawing.Point(280, 115); + this.buttonOpen.Location = new System.Drawing.Point(280, 125); 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.Size = new System.Drawing.Size(80, 35); this.buttonOpen.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.buttonOpen.TabIndex = 440; this.buttonOpen.Text = "Open"; @@ -827,27 +593,6 @@ this.buttonOpen.UpImage = null; this.buttonOpen.Click += new System.EventHandler(this.buttonOpen_Click); // - // labelORGSpeed1 - // - this.labelORGSpeed1.BackColor = System.Drawing.Color.White; - this.labelORGSpeed1.BackPictureBox = null; - this.labelORGSpeed1.BackPictureBox1 = null; - this.labelORGSpeed1.BackPictureBox2 = null; - this.labelORGSpeed1.BorderColor = System.Drawing.Color.Black; - this.labelORGSpeed1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelORGSpeed1.InitVisible = true; - this.labelORGSpeed1.LineSpacing = 0F; - this.labelORGSpeed1.Location = new System.Drawing.Point(108, 146); - this.labelORGSpeed1.Name = "labelORGSpeed1"; - this.labelORGSpeed1.Size = new System.Drawing.Size(80, 25); - this.labelORGSpeed1.TabIndex = 11; - this.labelORGSpeed1.Text = "0"; - this.labelORGSpeed1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelORGSpeed1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelORGSpeed1.Visible = false; - this.labelORGSpeed1.Wordwrap = false; - this.labelORGSpeed1.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); - // // labelModusStatus // this.labelModusStatus.BackColor = System.Drawing.Color.DarkGreen; @@ -862,33 +607,13 @@ this.labelModusStatus.LineSpacing = 0F; this.labelModusStatus.Location = new System.Drawing.Point(280, 84); this.labelModusStatus.Name = "labelModusStatus"; - this.labelModusStatus.Size = new System.Drawing.Size(80, 25); + this.labelModusStatus.Size = new System.Drawing.Size(80, 35); this.labelModusStatus.TabIndex = 439; this.labelModusStatus.Text = "OPEN"; this.labelModusStatus.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelModusStatus.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelModusStatus.Wordwrap = false; // - // labelSpeed10 - // - this.labelSpeed10.BackColor = System.Drawing.Color.White; - this.labelSpeed10.BackPictureBox = null; - this.labelSpeed10.BackPictureBox1 = null; - this.labelSpeed10.BackPictureBox2 = null; - this.labelSpeed10.BorderColor = System.Drawing.Color.Black; - this.labelSpeed10.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelSpeed10.InitVisible = true; - this.labelSpeed10.LineSpacing = 0F; - this.labelSpeed10.Location = new System.Drawing.Point(108, 177); - this.labelSpeed10.Name = "labelSpeed10"; - this.labelSpeed10.Size = new System.Drawing.Size(80, 25); - this.labelSpeed10.TabIndex = 12; - this.labelSpeed10.Text = "0"; - this.labelSpeed10.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelSpeed10.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelSpeed10.Wordwrap = false; - this.labelSpeed10.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); - // // labelMotorAlarmRead // this.labelMotorAlarmRead.BackPictureBox = null; @@ -899,7 +624,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(439, 363); + this.labelMotorAlarmRead.Location = new System.Drawing.Point(441, 371); this.labelMotorAlarmRead.Name = "labelMotorAlarmRead"; this.labelMotorAlarmRead.Size = new System.Drawing.Size(166, 25); this.labelMotorAlarmRead.TabIndex = 438; @@ -909,75 +634,6 @@ this.labelMotorAlarmRead.Wordwrap = false; this.labelMotorAlarmRead.Click += new System.EventHandler(this.labelMotorAlarmRead_Click); // - // labelPosition10 - // - this.labelPosition10.BackColor = System.Drawing.Color.White; - this.labelPosition10.BackPictureBox = null; - this.labelPosition10.BackPictureBox1 = null; - this.labelPosition10.BackPictureBox2 = null; - this.labelPosition10.BorderColor = System.Drawing.Color.Black; - this.labelPosition10.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelPosition10.InitVisible = true; - this.labelPosition10.LineSpacing = 0F; - this.labelPosition10.Location = new System.Drawing.Point(108, 239); - this.labelPosition10.Name = "labelPosition10"; - this.labelPosition10.Size = new System.Drawing.Size(80, 25); - this.labelPosition10.TabIndex = 13; - this.labelPosition10.Text = "0"; - this.labelPosition10.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelPosition10.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelPosition10.Wordwrap = false; - this.labelPosition10.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); - // - // comboBoxAlarmRead - // - this.comboBoxAlarmRead.Location = new System.Drawing.Point(525, 334); - this.comboBoxAlarmRead.Name = "comboBoxAlarmRead"; - this.comboBoxAlarmRead.Size = new System.Drawing.Size(80, 23); - this.comboBoxAlarmRead.TabIndex = 34; - this.comboBoxAlarmRead.SelectedIndexChanged += new System.EventHandler(this.comboBoxAlarmRead_SelectedIndexChanged); - // - // labelPosition11 - // - this.labelPosition11.BackColor = System.Drawing.Color.White; - this.labelPosition11.BackPictureBox = null; - this.labelPosition11.BackPictureBox1 = null; - this.labelPosition11.BackPictureBox2 = null; - this.labelPosition11.BorderColor = System.Drawing.Color.Black; - this.labelPosition11.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelPosition11.InitVisible = true; - this.labelPosition11.LineSpacing = 0F; - this.labelPosition11.Location = new System.Drawing.Point(108, 270); - this.labelPosition11.Name = "labelPosition11"; - this.labelPosition11.Size = new System.Drawing.Size(80, 25); - this.labelPosition11.TabIndex = 15; - this.labelPosition11.Text = "0"; - this.labelPosition11.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelPosition11.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelPosition11.Wordwrap = false; - this.labelPosition11.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); - // - // labelPosition19 - // - this.labelPosition19.BackColor = System.Drawing.Color.White; - this.labelPosition19.BackPictureBox = null; - this.labelPosition19.BackPictureBox1 = null; - this.labelPosition19.BackPictureBox2 = null; - this.labelPosition19.BorderColor = System.Drawing.Color.Black; - this.labelPosition19.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelPosition19.InitVisible = true; - this.labelPosition19.LineSpacing = 0F; - this.labelPosition19.Location = new System.Drawing.Point(108, 301); - this.labelPosition19.Name = "labelPosition19"; - this.labelPosition19.Size = new System.Drawing.Size(80, 25); - this.labelPosition19.TabIndex = 14; - this.labelPosition19.Text = "0"; - this.labelPosition19.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelPosition19.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelPosition19.Visible = false; - this.labelPosition19.Wordwrap = false; - this.labelPosition19.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); - // // buttonAlarmReset2 // this.buttonAlarmReset2.BackPictureBox = null; @@ -990,13 +646,15 @@ this.buttonAlarmReset2.DownImage = null; this.buttonAlarmReset2.GroupID = 0; this.buttonAlarmReset2.InitVisible = true; - this.buttonAlarmReset2.Location = new System.Drawing.Point(194, 363); + this.buttonAlarmReset2.Location = new System.Drawing.Point(527, 330); this.buttonAlarmReset2.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonAlarmReset2.Name = "buttonAlarmReset2"; this.buttonAlarmReset2.NestedClickEventPrevent = false; + this.buttonAlarmReset2.OutlinePixel = 1; this.buttonAlarmReset2.RepeatInterval = 200; + this.buttonAlarmReset2.RepeatIntervalAccelerate = null; this.buttonAlarmReset2.SafeInterval = 200; - this.buttonAlarmReset2.Size = new System.Drawing.Size(80, 25); + this.buttonAlarmReset2.Size = new System.Drawing.Size(80, 35); this.buttonAlarmReset2.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.buttonAlarmReset2.TabIndex = 33; this.buttonAlarmReset2.Text = "Reset"; @@ -1020,198 +678,132 @@ this.smartLabel23.LineSpacing = 0F; this.smartLabel23.Location = new System.Drawing.Point(194, 84); this.smartLabel23.Name = "smartLabel23"; - this.smartLabel23.Size = new System.Drawing.Size(80, 25); + this.smartLabel23.Size = new System.Drawing.Size(80, 35); this.smartLabel23.TabIndex = 16; - this.smartLabel23.Text = "2"; + this.smartLabel23.Text = "1"; this.smartLabel23.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.smartLabel23.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel23.Wordwrap = false; // - // buttonAlarmReset1 + // labelOrigin // - this.buttonAlarmReset1.BackPictureBox = null; - this.buttonAlarmReset1.BackPictureBox1 = null; - this.buttonAlarmReset1.BackPictureBox2 = null; - this.buttonAlarmReset1.ButtonColor = System.Drawing.Color.LightGray; - this.buttonAlarmReset1.ButtonImageAutoSize = true; - this.buttonAlarmReset1.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonAlarmReset1.DisableImage = null; - this.buttonAlarmReset1.DownImage = null; - this.buttonAlarmReset1.GroupID = 0; - this.buttonAlarmReset1.InitVisible = true; - this.buttonAlarmReset1.Location = new System.Drawing.Point(108, 363); - this.buttonAlarmReset1.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.buttonAlarmReset1.Name = "buttonAlarmReset1"; - this.buttonAlarmReset1.NestedClickEventPrevent = false; - this.buttonAlarmReset1.RepeatInterval = 200; - this.buttonAlarmReset1.SafeInterval = 200; - this.buttonAlarmReset1.Size = new System.Drawing.Size(80, 25); - this.buttonAlarmReset1.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonAlarmReset1.TabIndex = 33; - this.buttonAlarmReset1.Text = "Reset"; - this.buttonAlarmReset1.TextColor = System.Drawing.Color.Black; - this.buttonAlarmReset1.TextDownColor = System.Drawing.Color.White; - this.buttonAlarmReset1.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonAlarmReset1.TextLocation = new System.Drawing.Point(0, 0); - this.buttonAlarmReset1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonAlarmReset1.UpImage = null; - this.buttonAlarmReset1.Click += new System.EventHandler(this.buttonAlarmReset_Click); + this.labelOrigin.BackColor = System.Drawing.Color.White; + this.labelOrigin.BackPictureBox = null; + this.labelOrigin.BackPictureBox1 = null; + this.labelOrigin.BackPictureBox2 = null; + this.labelOrigin.BorderColor = System.Drawing.Color.Black; + 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.Name = "labelOrigin"; + this.labelOrigin.Size = new System.Drawing.Size(80, 35); + this.labelOrigin.TabIndex = 17; + this.labelOrigin.Text = "0"; + this.labelOrigin.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelOrigin.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelOrigin.Wordwrap = false; + this.labelOrigin.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); // - // labelOrigin2 + // labelORGSpeed // - this.labelOrigin2.BackColor = System.Drawing.Color.White; - this.labelOrigin2.BackPictureBox = null; - this.labelOrigin2.BackPictureBox1 = null; - this.labelOrigin2.BackPictureBox2 = null; - this.labelOrigin2.BorderColor = System.Drawing.Color.Black; - this.labelOrigin2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelOrigin2.InitVisible = true; - this.labelOrigin2.LineSpacing = 0F; - this.labelOrigin2.Location = new System.Drawing.Point(194, 115); - this.labelOrigin2.Name = "labelOrigin2"; - this.labelOrigin2.Size = new System.Drawing.Size(80, 25); - this.labelOrigin2.TabIndex = 17; - this.labelOrigin2.Text = "0"; - this.labelOrigin2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelOrigin2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelOrigin2.Wordwrap = false; - this.labelOrigin2.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); + this.labelORGSpeed.BackColor = System.Drawing.Color.White; + this.labelORGSpeed.BackPictureBox = null; + this.labelORGSpeed.BackPictureBox1 = null; + this.labelORGSpeed.BackPictureBox2 = null; + this.labelORGSpeed.BorderColor = System.Drawing.Color.Black; + 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.Name = "labelORGSpeed"; + this.labelORGSpeed.Size = new System.Drawing.Size(80, 35); + this.labelORGSpeed.TabIndex = 18; + this.labelORGSpeed.Text = "0"; + this.labelORGSpeed.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelORGSpeed.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelORGSpeed.Wordwrap = false; + this.labelORGSpeed.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); // - // labelORGSpeed2 + // labelSpeed0 // - this.labelORGSpeed2.BackColor = System.Drawing.Color.White; - this.labelORGSpeed2.BackPictureBox = null; - this.labelORGSpeed2.BackPictureBox1 = null; - this.labelORGSpeed2.BackPictureBox2 = null; - this.labelORGSpeed2.BorderColor = System.Drawing.Color.Black; - this.labelORGSpeed2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelORGSpeed2.InitVisible = true; - this.labelORGSpeed2.LineSpacing = 0F; - this.labelORGSpeed2.Location = new System.Drawing.Point(194, 146); - this.labelORGSpeed2.Name = "labelORGSpeed2"; - this.labelORGSpeed2.Size = new System.Drawing.Size(80, 25); - this.labelORGSpeed2.TabIndex = 18; - this.labelORGSpeed2.Text = "0"; - this.labelORGSpeed2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelORGSpeed2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelORGSpeed2.Wordwrap = false; - this.labelORGSpeed2.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); + this.labelSpeed0.BackColor = System.Drawing.Color.White; + this.labelSpeed0.BackPictureBox = null; + this.labelSpeed0.BackPictureBox1 = null; + this.labelSpeed0.BackPictureBox2 = null; + this.labelSpeed0.BorderColor = System.Drawing.Color.Black; + 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.Name = "labelSpeed0"; + this.labelSpeed0.Size = new System.Drawing.Size(80, 35); + this.labelSpeed0.TabIndex = 19; + this.labelSpeed0.Text = "0"; + this.labelSpeed0.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelSpeed0.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelSpeed0.Wordwrap = false; + this.labelSpeed0.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); // - // smartLabel32 + // labelPosition0 // - this.smartLabel32.BackPictureBox1 = null; - this.smartLabel32.BackPictureBox2 = this.smartGroupBox1; - this.smartLabel32.BorderColor = System.Drawing.Color.Black; - this.smartLabel32.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel32.ForeColor = System.Drawing.Color.White; - this.smartLabel32.InitVisible = true; - this.smartLabel32.LineSpacing = 0F; - this.smartLabel32.Location = new System.Drawing.Point(108, 53); - this.smartLabel32.Name = "smartLabel32"; - this.smartLabel32.Size = new System.Drawing.Size(80, 25); - this.smartLabel32.TabIndex = 31; - this.smartLabel32.Text = "Conveyor"; - this.smartLabel32.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel32.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel32.Wordwrap = false; + this.labelPosition0.BackColor = System.Drawing.Color.White; + this.labelPosition0.BackPictureBox = null; + this.labelPosition0.BackPictureBox1 = null; + this.labelPosition0.BackPictureBox2 = null; + this.labelPosition0.BorderColor = System.Drawing.Color.Black; + 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.Name = "labelPosition0"; + this.labelPosition0.Size = new System.Drawing.Size(80, 35); + this.labelPosition0.TabIndex = 20; + this.labelPosition0.Text = "0"; + this.labelPosition0.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelPosition0.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelPosition0.Wordwrap = false; + this.labelPosition0.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); // - // labelSpeed20 + // labelPosition1 // - 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(194, 177); - this.labelSpeed20.Name = "labelSpeed20"; - this.labelSpeed20.Size = new System.Drawing.Size(80, 25); - this.labelSpeed20.TabIndex = 19; - 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); + this.labelPosition1.BackColor = System.Drawing.Color.White; + this.labelPosition1.BackPictureBox = null; + this.labelPosition1.BackPictureBox1 = null; + this.labelPosition1.BackPictureBox2 = null; + this.labelPosition1.BorderColor = System.Drawing.Color.Black; + 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.Name = "labelPosition1"; + this.labelPosition1.Size = new System.Drawing.Size(80, 35); + this.labelPosition1.TabIndex = 22; + this.labelPosition1.Text = "0"; + this.labelPosition1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelPosition1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelPosition1.Wordwrap = false; + this.labelPosition1.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); // - // smartLabel31 + // labelPosition9 // - this.smartLabel31.BackPictureBox1 = null; - this.smartLabel31.BackPictureBox2 = this.smartGroupBox1; - 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(194, 53); - this.smartLabel31.Name = "smartLabel31"; - this.smartLabel31.Size = new System.Drawing.Size(80, 25); - this.smartLabel31.TabIndex = 30; - 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(194, 239); - this.labelPosition20.Name = "labelPosition20"; - this.labelPosition20.Size = new System.Drawing.Size(80, 25); - this.labelPosition20.TabIndex = 20; - 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(194, 270); - this.labelPosition21.Name = "labelPosition21"; - this.labelPosition21.Size = new System.Drawing.Size(80, 25); - this.labelPosition21.TabIndex = 22; - 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); - // - // labelPosition29 - // - this.labelPosition29.BackColor = System.Drawing.Color.White; - this.labelPosition29.BackPictureBox = null; - this.labelPosition29.BackPictureBox1 = null; - this.labelPosition29.BackPictureBox2 = null; - this.labelPosition29.BorderColor = System.Drawing.Color.Black; - this.labelPosition29.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelPosition29.InitVisible = true; - this.labelPosition29.LineSpacing = 0F; - this.labelPosition29.Location = new System.Drawing.Point(194, 301); - this.labelPosition29.Name = "labelPosition29"; - this.labelPosition29.Size = new System.Drawing.Size(80, 25); - this.labelPosition29.TabIndex = 21; - this.labelPosition29.Text = "0"; - this.labelPosition29.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelPosition29.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelPosition29.Wordwrap = false; - this.labelPosition29.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); + this.labelPosition9.BackColor = System.Drawing.Color.White; + this.labelPosition9.BackPictureBox = null; + this.labelPosition9.BackPictureBox1 = null; + this.labelPosition9.BackPictureBox2 = null; + this.labelPosition9.BorderColor = System.Drawing.Color.Black; + 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.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.Wordwrap = false; + this.labelPosition9.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); // // ControlCenterSystemServoMotor // @@ -1233,27 +825,14 @@ private SmartX.SmartLabel smartLabel5; private SmartX.SmartLabel smartLabel6; private SmartX.SmartLabel smartLabel7; - private SmartX.SmartLabel smartLabel8; - private SmartX.SmartLabel smartLabel9; - private SmartX.SmartLabel labelPosition19; - private SmartX.SmartLabel labelPosition11; - private SmartX.SmartLabel labelPosition10; - private SmartX.SmartLabel labelSpeed10; - private SmartX.SmartLabel labelORGSpeed1; - private SmartX.SmartLabel labelOrigin1; - private SmartX.SmartLabel smartLabel16; - private SmartX.SmartLabel labelPosition29; - private SmartX.SmartLabel labelPosition21; - private SmartX.SmartLabel labelPosition20; - private SmartX.SmartLabel labelSpeed20; - private SmartX.SmartLabel labelORGSpeed2; - private SmartX.SmartLabel labelOrigin2; + private SmartX.SmartLabel labelPosition9; + private SmartX.SmartLabel labelPosition1; + private SmartX.SmartLabel labelPosition0; + private SmartX.SmartLabel labelSpeed0; + private SmartX.SmartLabel labelORGSpeed; + private SmartX.SmartLabel labelOrigin; private SmartX.SmartLabel smartLabel23; - private SmartX.SmartLabel smartLabel31; - private SmartX.SmartLabel smartLabel32; - private SmartX.SmartButton buttonAlarmReset1; private SmartX.SmartButton buttonAlarmReset2; - private System.Windows.Forms.ComboBox comboBoxAlarmRead; private SmartX.SmartLabel labelMotorAlarmRead; private SmartX.SmartLabel labelModusStatus; private SmartX.SmartButton buttonOpen; @@ -1262,18 +841,13 @@ private SmartX.SmartButton buttonAlarmRead; private SmartX.SmartButton buttonConveyorUp; private SmartX.SmartButton buttonConveyorDown; - private SmartX.SmartButton buttonConveyorReverse; - private SmartX.SmartButton buttonConveyorForward; - private SmartX.SmartButton buttonOrigin2; - private SmartX.SmartButton buttonOrigin1; - private SmartX.SmartButton buttonStep; + private SmartX.SmartButton buttonOrigin; private SmartX.SmartButton buttonConveyorUp2; private SmartX.SmartGroupBox smartGroupBox1; private SmartX.SmartButton buttonStart; private SmartX.SmartButton buttonStop; private SmartX.SmartLabel smartLabel1; private SmartX.SmartLabel smartLabel10; - private SmartX.SmartLabel labelSpeed11; - private SmartX.SmartLabel labelSpeed21; + private SmartX.SmartLabel labelSpeed1; } } diff --git a/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.cs b/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.cs index 0ed4956..6df90a0 100644 --- a/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.cs +++ b/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.cs @@ -62,13 +62,6 @@ namespace INT51DB.Controls } private void DefaultSetting() { - this.comboBoxAlarmRead.Items.Clear(); - this.comboBoxAlarmRead.Items.Add("Servo1"); - this.comboBoxAlarmRead.Items.Add("Servo2"); - - this.comboBoxAlarmRead.SelectedIndexChanged -= new EventHandler(this.comboBoxAlarmRead_SelectedIndexChanged); - this.comboBoxAlarmRead.SelectedItem = "Servo1"; - this.comboBoxAlarmRead.SelectedIndexChanged += new EventHandler(this.comboBoxAlarmRead_SelectedIndexChanged); } private void ModbusStatusDisplay(bool isOpen) @@ -214,11 +207,6 @@ namespace INT51DB.Controls // Open private void buttonOpen_Click(object sender, EventArgs e) { - if (this.ParentForm.ParentForm.smartSerialPort1.IsOpen == true) - { - this.ParentForm.ParentForm.CloseSerialCOM1(); - this.ParentForm.ParentForm.SystemConfig.SerialCOM1Mode = 0; - } this.ModbusOpen(); } @@ -228,11 +216,6 @@ namespace INT51DB.Controls this.ModbusClose(); } - private void comboBoxAlarmRead_SelectedIndexChanged(object sender, EventArgs e) - { - - } - // Parameter Read private void buttonParameterRead_Click(object sender, EventArgs e) { @@ -255,22 +238,13 @@ namespace INT51DB.Controls this.Enabled = false; // ServoMotor 1 - this.labelOrigin1.Text = this.ServoMotorRead(1, ServoMotorParameterAddress.OriginOffset); - this.labelORGSpeed1.Text = this.ServoMotorRead(1, ServoMotorParameterAddress.ORGSpeed0); - this.labelSpeed10.Text = this.ServoMotorRead(1, ServoMotorParameterAddress.GropSpeed0); - this.labelSpeed11.Text = this.ServoMotorRead(1, ServoMotorParameterAddress.GropSpeed1); - this.labelPosition10.Text = this.ServoMotorRead(1, ServoMotorParameterAddress.PositionCMD0); - this.labelPosition11.Text = this.ServoMotorRead(1, ServoMotorParameterAddress.PositionCMD1); - this.labelPosition19.Text = this.ServoMotorRead(1, ServoMotorParameterAddress.PositionCMD9); - - // ServoMotor 2 - this.labelOrigin2.Text = this.ServoMotorRead(2, ServoMotorParameterAddress.OriginOffset); - this.labelORGSpeed2.Text = this.ServoMotorRead(2, ServoMotorParameterAddress.ORGSpeed0); - this.labelSpeed20.Text = this.ServoMotorRead(2, ServoMotorParameterAddress.GropSpeed0); - this.labelSpeed21.Text = this.ServoMotorRead(2, ServoMotorParameterAddress.GropSpeed1); - this.labelPosition20.Text = this.ServoMotorRead(2, ServoMotorParameterAddress.PositionCMD0); - this.labelPosition21.Text = this.ServoMotorRead(2, ServoMotorParameterAddress.PositionCMD1); - this.labelPosition29.Text = this.ServoMotorRead(2, ServoMotorParameterAddress.PositionCMD9); + this.labelOrigin.Text = this.ServoMotorRead(1, ServoMotorParameterAddress.OriginOffset); + this.labelORGSpeed.Text = this.ServoMotorRead(1, ServoMotorParameterAddress.ORGSpeed0); + this.labelSpeed0.Text = this.ServoMotorRead(1, ServoMotorParameterAddress.GropSpeed0); + this.labelSpeed1.Text = this.ServoMotorRead(1, ServoMotorParameterAddress.GropSpeed1); + this.labelPosition0.Text = this.ServoMotorRead(1, ServoMotorParameterAddress.PositionCMD0); + this.labelPosition1.Text = this.ServoMotorRead(1, ServoMotorParameterAddress.PositionCMD1); + this.labelPosition9.Text = this.ServoMotorRead(1, ServoMotorParameterAddress.PositionCMD9); splash.Finish(); @@ -295,179 +269,10 @@ namespace INT51DB.Controls return; } - if (label == this.labelOrigin1) - { - #region Conveyor Motor - Origin - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelOrigin1.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.labelOrigin1.Text = myKeyPad.StringValue; - - fValue = Convert.ToSingle(this.labelOrigin1.Text); - - this.ServoMotorWrite(1, ServoMotorParameterAddress.OriginOffset, fValue); - } - } - #endregion - } - else if (label == this.labelORGSpeed1) - { - #region Conveyor Motor ORG Speed - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelORGSpeed1.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.labelORGSpeed1.Text = myKeyPad.StringValue; - - fValue = Convert.ToSingle(this.labelORGSpeed1.Text); - - this.ServoMotorWrite(1, ServoMotorParameterAddress.ORGSpeed0, fValue); - } - } - #endregion - } - else if (label == this.labelSpeed10) - { - #region Conveyor Motor Speed 0 - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelSpeed10.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.labelSpeed10.Text = myKeyPad.StringValue; - - fValue = Convert.ToSingle(this.labelSpeed10.Text); - - this.ServoMotorWrite(1, ServoMotorParameterAddress.GropSpeed0, fValue); - } - } - #endregion - } - else if (label == this.labelSpeed11) - { - #region Conveyor Motor Speed 1 - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelSpeed11.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.labelSpeed11.Text = myKeyPad.StringValue; - - fValue = Convert.ToSingle(this.labelSpeed11.Text); - - this.ServoMotorWrite(1, ServoMotorParameterAddress.GropSpeed1, fValue); - } - } - #endregion - } - else if (label == this.labelPosition10) - { - #region Conveyor Motor Position 0 - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelPosition10.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.labelPosition10.Text = myKeyPad.StringValue; - - 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 - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelPosition11.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.labelPosition11.Text = myKeyPad.StringValue; - - fValue = Convert.ToSingle(this.labelPosition11.Text); - - this.ServoMotorWrite(1, ServoMotorParameterAddress.PositionCMD1, fValue); - } - } - #endregion - } - else if (label == this.labelPosition19) - { - #region Conveyor Motor Position 9 - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelPosition19.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.labelPosition19.Text = myKeyPad.StringValue; - - fValue = Convert.ToSingle(this.labelPosition19.Text); - - this.ServoMotorWrite(1, ServoMotorParameterAddress.PositionCMD9, fValue); - } - } - #endregion - } - if (label == this.labelOrigin2) + if (label == this.labelOrigin) { #region UpDown Motor - Origin - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelOrigin2.Text, 4, 0, true, this.ParentForm.ParentForm.SystemConfig.Language); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelOrigin.Text, 4, 0, true, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) { @@ -479,19 +284,19 @@ namespace INT51DB.Controls } else { - this.labelOrigin2.Text = myKeyPad.StringValue; + this.labelOrigin.Text = myKeyPad.StringValue; - fValue = Convert.ToSingle(this.labelOrigin2.Text); + fValue = Convert.ToSingle(this.labelOrigin.Text); this.ServoMotorWrite(2, ServoMotorParameterAddress.OriginOffset, fValue); } } #endregion } - else if (label == this.labelORGSpeed2) + else if (label == this.labelORGSpeed) { #region UpDown Motor ORG Speed - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelORGSpeed2.Text, 4, 0, false, this.ParentForm.ParentForm.SystemConfig.Language); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelORGSpeed.Text, 4, 0, false, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) { @@ -503,19 +308,19 @@ namespace INT51DB.Controls } else { - this.labelORGSpeed2.Text = myKeyPad.StringValue; + this.labelORGSpeed.Text = myKeyPad.StringValue; - fValue = Convert.ToSingle(this.labelORGSpeed2.Text); + fValue = Convert.ToSingle(this.labelORGSpeed.Text); this.ServoMotorWrite(2, ServoMotorParameterAddress.ORGSpeed0, fValue); } } #endregion } - else if (label == this.labelSpeed20) + else if (label == this.labelSpeed0) { #region UpDown Motor Speed 0 - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelSpeed20.Text, 4, 0, false, this.ParentForm.ParentForm.SystemConfig.Language); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelSpeed0.Text, 4, 0, false, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) { @@ -527,19 +332,19 @@ namespace INT51DB.Controls } else { - this.labelSpeed20.Text = myKeyPad.StringValue; + this.labelSpeed0.Text = myKeyPad.StringValue; - fValue = Convert.ToSingle(this.labelSpeed20.Text); + fValue = Convert.ToSingle(this.labelSpeed0.Text); this.ServoMotorWrite(2, ServoMotorParameterAddress.GropSpeed0, fValue); } } #endregion } - else if (label == this.labelSpeed21) + else if (label == this.labelSpeed1) { #region UpDown Motor Speed 1 - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelSpeed21.Text, 4, 0, false, this.ParentForm.ParentForm.SystemConfig.Language); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelSpeed1.Text, 4, 0, false, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) { @@ -551,19 +356,19 @@ namespace INT51DB.Controls } else { - this.labelSpeed21.Text = myKeyPad.StringValue; + this.labelSpeed1.Text = myKeyPad.StringValue; - fValue = Convert.ToSingle(this.labelSpeed21.Text); + fValue = Convert.ToSingle(this.labelSpeed1.Text); this.ServoMotorWrite(2, ServoMotorParameterAddress.GropSpeed1, fValue); } } #endregion } - else if (label == this.labelPosition20) + else if (label == this.labelPosition0) { #region UpDown Motor Position 0 - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelPosition20.Text, 4, 0, true, this.ParentForm.ParentForm.SystemConfig.Language); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelPosition0.Text, 4, 0, true, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) { @@ -575,9 +380,9 @@ namespace INT51DB.Controls } else { - this.labelPosition20.Text = myKeyPad.StringValue; + this.labelPosition0.Text = myKeyPad.StringValue; - fValue = Convert.ToSingle(this.labelPosition20.Text); + fValue = Convert.ToSingle(this.labelPosition0.Text); this.ServoMotorWrite(2, ServoMotorParameterAddress.PositionCMD0, fValue); this.ServoMotorWrite(2, ServoMotorParameterAddress.PositionCMD8, fValue); @@ -585,10 +390,10 @@ namespace INT51DB.Controls } #endregion } - else if (label == this.labelPosition21) + else if (label == this.labelPosition1) { #region UpDown Motor Position 1 - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelPosition21.Text, 4, 0, true, this.ParentForm.ParentForm.SystemConfig.Language); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelPosition1.Text, 4, 0, true, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) { @@ -600,19 +405,19 @@ namespace INT51DB.Controls } else { - this.labelPosition21.Text = myKeyPad.StringValue; + this.labelPosition1.Text = myKeyPad.StringValue; - fValue = Convert.ToSingle(this.labelPosition21.Text); + fValue = Convert.ToSingle(this.labelPosition1.Text); this.ServoMotorWrite(2, ServoMotorParameterAddress.PositionCMD1, fValue); } } #endregion } - else if (label == this.labelPosition29) + else if (label == this.labelPosition9) { #region UpDown Motor Position 9 - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelPosition29.Text, 4, 0, true, this.ParentForm.ParentForm.SystemConfig.Language); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelPosition9.Text, 4, 0, true, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) { @@ -624,9 +429,9 @@ namespace INT51DB.Controls } else { - this.labelPosition29.Text = myKeyPad.StringValue; + this.labelPosition9.Text = myKeyPad.StringValue; - fValue = Convert.ToSingle(this.labelPosition29.Text); + fValue = Convert.ToSingle(this.labelPosition9.Text); this.ServoMotorWrite(2, ServoMotorParameterAddress.PositionCMD9, fValue); } @@ -647,7 +452,6 @@ namespace INT51DB.Controls private void buttonAlarmRead_Click(object sender, EventArgs e) { byte[] writeData = { 0x00, 0x00, 0x00, 0x01 }; - int motorID = 0; string currentAlarm = ""; if (this.ParentForm.ParentForm.smartModbus.IsOpen == false) @@ -660,14 +464,7 @@ namespace INT51DB.Controls this.ParentForm.ParentForm.smartModbus.ReadTimeout = 1000; - if (this.comboBoxAlarmRead.SelectedItem == "Servo1") - motorID = 1; - else if (this.comboBoxAlarmRead.SelectedItem == "Servo2") - motorID = 2; - else - motorID = 1; - - currentAlarm = this.ServoMotorAlarmRead(motorID, 80, 2100, writeData); + currentAlarm = this.ServoMotorAlarmRead(1, 80, 2100, writeData); this.labelMotorAlarmRead.Text = currentAlarm; } @@ -714,22 +511,10 @@ namespace INT51DB.Controls { this.ParentForm.ParentForm.TransferData(CommunicationCommand.MotorReverse, CommunicationID.MainBoard); } - private void buttonStep_Click(object sender, EventArgs e) - { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.MotorStep, CommunicationID.MainBoard); - } - private void buttonOrigin1_Click(object sender, EventArgs e) + private void buttonOrigin_Click(object sender, EventArgs e) { this.ParentForm.ParentForm.TransferData(CommunicationCommand.MotorOrigin, CommunicationID.SubBoard1); } - private void buttonOrigin2_Click(object sender, EventArgs e) - { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.MotorOrigin, CommunicationID.SubBoard2); - } - private void buttonOrigin3_Click(object sender, EventArgs e) - { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.MotorOrigin, CommunicationID.SubBoard3); - } private void buttonStop_Click(object sender, EventArgs e) { this.ParentForm.ParentForm.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); diff --git a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction2.cs b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction2.cs index 0fd5722..cf74d9c 100644 --- a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction2.cs +++ b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction2.cs @@ -81,12 +81,6 @@ namespace INT51DB.Controls } public void ModbusOpen() { - if (this.ParentForm.ParentForm.smartSerialPort1.IsOpen == true) - { - this.ParentForm.ParentForm.CloseSerialCOM1(); - this.ParentForm.ParentForm.SystemConfig.SerialCOM1Mode = 0; - } - if (this.ParentForm.ParentForm.smartModbus.IsOpen == true) this.ParentForm.ParentForm.smartModbus.PortClose(); diff --git a/INT51DB/Controls/MainDisplay/ControlMainDisplayMenu.Designer.cs b/INT51DB/Controls/MainDisplay/ControlMainDisplayMenu.Designer.cs index 855d03d..d8ca6c6 100644 --- a/INT51DB/Controls/MainDisplay/ControlMainDisplayMenu.Designer.cs +++ b/INT51DB/Controls/MainDisplay/ControlMainDisplayMenu.Designer.cs @@ -39,6 +39,12 @@ this.labelSorterBDelayTime = new SmartX.SmartLabel(); this.labelSorterBRunTime = new SmartX.SmartLabel(); this.smartGroupBox1 = new SmartX.SmartGroupBox(); + this.smartLabel6 = new SmartX.SmartLabel(); + this.smartLabel5 = new SmartX.SmartLabel(); + this.smartLabel4 = new SmartX.SmartLabel(); + this.smartLabel3 = new SmartX.SmartLabel(); + this.labelDownDelayTime = new SmartX.SmartLabel(); + this.labelUpDelayTime = new SmartX.SmartLabel(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -53,7 +59,7 @@ this.labelSorterADelayTime.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); this.labelSorterADelayTime.InitVisible = true; this.labelSorterADelayTime.LineSpacing = 0F; - this.labelSorterADelayTime.Location = new System.Drawing.Point(306, 96); + this.labelSorterADelayTime.Location = new System.Drawing.Point(169, 114); this.labelSorterADelayTime.Name = "labelSorterADelayTime"; this.labelSorterADelayTime.Size = new System.Drawing.Size(100, 30); this.labelSorterADelayTime.TabIndex = 129; @@ -75,7 +81,7 @@ this.labelStaticSorterDelayTime.ForeColor = System.Drawing.Color.White; this.labelStaticSorterDelayTime.InitVisible = true; this.labelStaticSorterDelayTime.LineSpacing = 0F; - this.labelStaticSorterDelayTime.Location = new System.Drawing.Point(306, 60); + this.labelStaticSorterDelayTime.Location = new System.Drawing.Point(63, 114); this.labelStaticSorterDelayTime.Name = "labelStaticSorterDelayTime"; this.labelStaticSorterDelayTime.Size = new System.Drawing.Size(100, 30); this.labelStaticSorterDelayTime.TabIndex = 130; @@ -95,7 +101,7 @@ this.labelSorterARunTime.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); this.labelSorterARunTime.InitVisible = true; this.labelSorterARunTime.LineSpacing = 0F; - this.labelSorterARunTime.Location = new System.Drawing.Point(445, 96); + this.labelSorterARunTime.Location = new System.Drawing.Point(169, 150); this.labelSorterARunTime.Name = "labelSorterARunTime"; this.labelSorterARunTime.Size = new System.Drawing.Size(100, 30); this.labelSorterARunTime.TabIndex = 127; @@ -117,7 +123,7 @@ this.labelStaticSorterRunTime.ForeColor = System.Drawing.Color.White; this.labelStaticSorterRunTime.InitVisible = true; this.labelStaticSorterRunTime.LineSpacing = 0F; - this.labelStaticSorterRunTime.Location = new System.Drawing.Point(445, 60); + this.labelStaticSorterRunTime.Location = new System.Drawing.Point(63, 150); this.labelStaticSorterRunTime.Name = "labelStaticSorterRunTime"; this.labelStaticSorterRunTime.Size = new System.Drawing.Size(100, 30); this.labelStaticSorterRunTime.TabIndex = 128; @@ -138,9 +144,9 @@ this.labelStaticSorterMode.ForeColor = System.Drawing.Color.White; this.labelStaticSorterMode.InitVisible = true; this.labelStaticSorterMode.LineSpacing = 0F; - this.labelStaticSorterMode.Location = new System.Drawing.Point(150, 60); + this.labelStaticSorterMode.Location = new System.Drawing.Point(63, 78); this.labelStaticSorterMode.Name = "labelStaticSorterMode"; - this.labelStaticSorterMode.Size = new System.Drawing.Size(120, 30); + this.labelStaticSorterMode.Size = new System.Drawing.Size(100, 30); this.labelStaticSorterMode.TabIndex = 126; this.labelStaticSorterMode.Text = "모드"; this.labelStaticSorterMode.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -150,20 +156,20 @@ // comboBoxSorterB // this.comboBoxSorterB.Enabled = false; - this.comboBoxSorterB.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); - this.comboBoxSorterB.Location = new System.Drawing.Point(150, 134); + this.comboBoxSorterB.Font = new System.Drawing.Font("Arial", 15F, System.Drawing.FontStyle.Bold); + this.comboBoxSorterB.Location = new System.Drawing.Point(275, 79); this.comboBoxSorterB.Name = "comboBoxSorterB"; - this.comboBoxSorterB.Size = new System.Drawing.Size(120, 28); + this.comboBoxSorterB.Size = new System.Drawing.Size(100, 29); this.comboBoxSorterB.TabIndex = 134; this.comboBoxSorterB.SelectedIndexChanged += new System.EventHandler(this.comboBoxSorterB_SelectedIndexChanged); // // comboBoxSorterA // this.comboBoxSorterA.Enabled = false; - this.comboBoxSorterA.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); - this.comboBoxSorterA.Location = new System.Drawing.Point(150, 96); + this.comboBoxSorterA.Font = new System.Drawing.Font("Arial", 15F, System.Drawing.FontStyle.Bold); + this.comboBoxSorterA.Location = new System.Drawing.Point(169, 79); this.comboBoxSorterA.Name = "comboBoxSorterA"; - this.comboBoxSorterA.Size = new System.Drawing.Size(120, 28); + this.comboBoxSorterA.Size = new System.Drawing.Size(100, 29); this.comboBoxSorterA.TabIndex = 133; this.comboBoxSorterA.SelectedIndexChanged += new System.EventHandler(this.comboBoxSorterA_SelectedIndexChanged); // @@ -178,7 +184,7 @@ this.labelSorterBDelayTime.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); this.labelSorterBDelayTime.InitVisible = true; this.labelSorterBDelayTime.LineSpacing = 0F; - this.labelSorterBDelayTime.Location = new System.Drawing.Point(306, 132); + this.labelSorterBDelayTime.Location = new System.Drawing.Point(275, 114); this.labelSorterBDelayTime.Name = "labelSorterBDelayTime"; this.labelSorterBDelayTime.Size = new System.Drawing.Size(100, 30); this.labelSorterBDelayTime.TabIndex = 136; @@ -199,7 +205,7 @@ this.labelSorterBRunTime.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); this.labelSorterBRunTime.InitVisible = true; this.labelSorterBRunTime.LineSpacing = 0F; - this.labelSorterBRunTime.Location = new System.Drawing.Point(445, 132); + this.labelSorterBRunTime.Location = new System.Drawing.Point(275, 150); this.labelSorterBRunTime.Name = "labelSorterBRunTime"; this.labelSorterBRunTime.Size = new System.Drawing.Size(100, 30); this.labelSorterBRunTime.TabIndex = 135; @@ -213,6 +219,12 @@ // this.smartGroupBox1.BackPictureBox = null; this.smartGroupBox1.BackPictureBox1 = null; + this.smartGroupBox1.Controls.Add(this.smartLabel4); + this.smartGroupBox1.Controls.Add(this.smartLabel3); + this.smartGroupBox1.Controls.Add(this.labelDownDelayTime); + this.smartGroupBox1.Controls.Add(this.labelUpDelayTime); + this.smartGroupBox1.Controls.Add(this.smartLabel6); + this.smartGroupBox1.Controls.Add(this.smartLabel5); this.smartGroupBox1.Controls.Add(this.labelSorterBDelayTime); this.smartGroupBox1.Controls.Add(this.labelSorterBRunTime); this.smartGroupBox1.Controls.Add(this.comboBoxSorterB); @@ -236,6 +248,132 @@ this.smartGroupBox1.Text = "smartGroupBox1"; this.smartGroupBox1.TextColor = System.Drawing.Color.Black; // + // smartLabel6 + // + this.smartLabel6.BackColor = System.Drawing.Color.Black; + this.smartLabel6.BackPictureBox = null; + this.smartLabel6.BackPictureBox1 = null; + this.smartLabel6.BackPictureBox2 = null; + this.smartLabel6.BorderColor = System.Drawing.Color.Black; + this.smartLabel6.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel6.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel6.ForeColor = System.Drawing.Color.White; + this.smartLabel6.InitVisible = true; + this.smartLabel6.LineSpacing = 0F; + this.smartLabel6.Location = new System.Drawing.Point(275, 43); + this.smartLabel6.Name = "smartLabel6"; + this.smartLabel6.Size = new System.Drawing.Size(100, 30); + this.smartLabel6.TabIndex = 144; + this.smartLabel6.Text = "선별기B"; + this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel6.Wordwrap = false; + // + // smartLabel5 + // + this.smartLabel5.BackColor = System.Drawing.Color.Black; + this.smartLabel5.BackPictureBox = null; + this.smartLabel5.BackPictureBox1 = null; + this.smartLabel5.BackPictureBox2 = null; + this.smartLabel5.BorderColor = System.Drawing.Color.Black; + this.smartLabel5.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel5.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel5.ForeColor = System.Drawing.Color.White; + this.smartLabel5.InitVisible = true; + this.smartLabel5.LineSpacing = 0F; + this.smartLabel5.Location = new System.Drawing.Point(169, 43); + this.smartLabel5.Name = "smartLabel5"; + this.smartLabel5.Size = new System.Drawing.Size(100, 30); + this.smartLabel5.TabIndex = 143; + this.smartLabel5.Text = "선별기A"; + this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.smartLabel5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel5.Wordwrap = false; + // + // smartLabel4 + // + this.smartLabel4.BackColor = System.Drawing.Color.Black; + this.smartLabel4.BackPictureBox = null; + this.smartLabel4.BackPictureBox1 = null; + this.smartLabel4.BackPictureBox2 = null; + this.smartLabel4.BorderColor = System.Drawing.Color.Black; + this.smartLabel4.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel4.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel4.ForeColor = System.Drawing.Color.White; + this.smartLabel4.InitVisible = true; + this.smartLabel4.LineSpacing = 0F; + this.smartLabel4.Location = new System.Drawing.Point(449, 150); + this.smartLabel4.Name = "smartLabel4"; + this.smartLabel4.Size = new System.Drawing.Size(100, 30); + this.smartLabel4.TabIndex = 148; + this.smartLabel4.Text = "하강지연"; + this.smartLabel4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.smartLabel4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel4.Wordwrap = false; + // + // smartLabel3 + // + this.smartLabel3.BackColor = System.Drawing.Color.Black; + this.smartLabel3.BackPictureBox = null; + this.smartLabel3.BackPictureBox1 = null; + this.smartLabel3.BackPictureBox2 = null; + this.smartLabel3.BorderColor = System.Drawing.Color.Black; + this.smartLabel3.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel3.ForeColor = System.Drawing.Color.White; + this.smartLabel3.InitVisible = true; + this.smartLabel3.LineSpacing = 0F; + this.smartLabel3.Location = new System.Drawing.Point(449, 114); + this.smartLabel3.Name = "smartLabel3"; + this.smartLabel3.Size = new System.Drawing.Size(100, 30); + this.smartLabel3.TabIndex = 147; + this.smartLabel3.Text = "상승지연"; + this.smartLabel3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.smartLabel3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel3.Wordwrap = false; + // + // labelDownDelayTime + // + this.labelDownDelayTime.BackColor = System.Drawing.Color.White; + this.labelDownDelayTime.BackPictureBox = null; + this.labelDownDelayTime.BackPictureBox1 = null; + this.labelDownDelayTime.BackPictureBox2 = null; + this.labelDownDelayTime.BorderColor = System.Drawing.Color.Black; + this.labelDownDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + 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(555, 150); + this.labelDownDelayTime.Name = "labelDownDelayTime"; + this.labelDownDelayTime.Size = new System.Drawing.Size(100, 30); + this.labelDownDelayTime.TabIndex = 146; + this.labelDownDelayTime.Text = "1000"; + this.labelDownDelayTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelDownDelayTime.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelDownDelayTime.Wordwrap = false; + this.labelDownDelayTime.Click += new System.EventHandler(this.labelDownDelayTime_Click); + // + // labelUpDelayTime + // + this.labelUpDelayTime.BackColor = System.Drawing.Color.White; + this.labelUpDelayTime.BackPictureBox = null; + this.labelUpDelayTime.BackPictureBox1 = null; + this.labelUpDelayTime.BackPictureBox2 = null; + this.labelUpDelayTime.BorderColor = System.Drawing.Color.Black; + this.labelUpDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + 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(555, 114); + this.labelUpDelayTime.Name = "labelUpDelayTime"; + this.labelUpDelayTime.Size = new System.Drawing.Size(100, 30); + this.labelUpDelayTime.TabIndex = 145; + this.labelUpDelayTime.Text = "1000"; + this.labelUpDelayTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelUpDelayTime.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelUpDelayTime.Wordwrap = false; + this.labelUpDelayTime.Click += new System.EventHandler(this.labelUpDelayTime_Click); + // // ControlMainDisplayMenu // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -260,6 +398,12 @@ public SmartX.SmartLabel labelSorterBDelayTime; public SmartX.SmartLabel labelSorterBRunTime; private SmartX.SmartGroupBox smartGroupBox1; + private SmartX.SmartLabel smartLabel4; + private SmartX.SmartLabel smartLabel3; + public SmartX.SmartLabel labelDownDelayTime; + public SmartX.SmartLabel labelUpDelayTime; + private SmartX.SmartLabel smartLabel6; + private SmartX.SmartLabel smartLabel5; } } diff --git a/INT51DB/Controls/MainDisplay/ControlMainDisplayMenu.cs b/INT51DB/Controls/MainDisplay/ControlMainDisplayMenu.cs index 99c8002..5bf1201 100644 --- a/INT51DB/Controls/MainDisplay/ControlMainDisplayMenu.cs +++ b/INT51DB/Controls/MainDisplay/ControlMainDisplayMenu.cs @@ -84,6 +84,16 @@ namespace INT51DB.Controls int iValue = 0; string value = ""; + #region Judgment + value = item.UpDelayTime.ToString(); + if (this.labelUpDelayTime.Text != value) + this.labelUpDelayTime.Text = value; + + value = item.DownDelayTime.ToString(); + if (this.labelDownDelayTime.Text != value) + this.labelDownDelayTime.Text = value; + #endregion + #region Sorter this.comboBoxSorterA.SelectedIndexChanged -= new EventHandler(this.comboBoxSorterA_SelectedIndexChanged); this.comboBoxSorterB.SelectedIndexChanged -= new EventHandler(this.comboBoxSorterB_SelectedIndexChanged); @@ -240,6 +250,61 @@ namespace INT51DB.Controls } } } + + private void labelUpDelayTime_Click(object sender, EventArgs e) + { + string value = "", message = ""; + + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelUpDelayTime.Text, 4, 0, false, this.ParentForm.ParentForm.SystemConfig.Language); + + if (myKeyPad.ShowDialog() == DialogResult.OK) + { + if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 9999) + { + // 입력범위를 확인하세요 + message = "0~9999"; + DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.ParentForm.SystemConfig.Language, message); + myMsg.ShowDialog(); + } + else + { + this.labelUpDelayTime.Text = myKeyPad.StringValue; + this.ParentForm.ParentForm.CurrentJudgmentSetItem.UpDelayTime = myKeyPad.IntValue; + + value = Helper.StringZeroFillDigits4(myKeyPad.StringValue); + this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.UpDelayTime, value); + + this.ParentForm.ParentForm.SaveJudgmentSetFile(this.ParentForm.ParentForm.CurrentJudgmentSetItem, this.ParentForm.ParentForm.SystemConfig.ProductNumber - 1); + } + } + } + private void labelDownDelayTime_Click(object sender, EventArgs e) + { + string value = "", message = ""; + + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelDownDelayTime.Text, 4, 0, false, this.ParentForm.ParentForm.SystemConfig.Language); + + if (myKeyPad.ShowDialog() == DialogResult.OK) + { + if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 9999) + { + // 입력범위를 확인하세요 + message = "0~9999"; + DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.ParentForm.SystemConfig.Language, message); + myMsg.ShowDialog(); + } + else + { + this.labelDownDelayTime.Text = myKeyPad.StringValue; + this.ParentForm.ParentForm.CurrentJudgmentSetItem.DownDelayTime = myKeyPad.IntValue; + + value = Helper.StringZeroFillDigits4(myKeyPad.StringValue); + this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.DownDelayTime, value); + + this.ParentForm.ParentForm.SaveJudgmentSetFile(this.ParentForm.ParentForm.CurrentJudgmentSetItem, this.ParentForm.ParentForm.SystemConfig.ProductNumber - 1); + } + } + } #endregion } } diff --git a/INT51DB/DataStore.cs b/INT51DB/DataStore.cs index f823f97..7225724 100644 --- a/INT51DB/DataStore.cs +++ b/INT51DB/DataStore.cs @@ -320,72 +320,84 @@ namespace INT51DB public class CommunicationCommand { // 중량조정모드 - public static readonly string ModeCalibration = "Csc"; + public static readonly string ModeCalibration = "Csc00"; // 노멀모드 - public static readonly string ModeNormal = "Csn"; + public static readonly string ModeNormal = "Csn00"; // 메뉴 모드 - public static readonly string ModeMenu = "Csm"; + public static readonly string ModeMenu = "Csm00"; // 판정설정모드 - public static readonly string ModeJudgment = "Csg"; + public static readonly string ModeJudgment = "Csg00"; // IO 테스트모드 - public static readonly string ModeIOTest = "Cst"; + public static readonly string ModeIOTest = "Cst00"; // 바이패스 - public static readonly string ModeBypass = "Csb"; + public static readonly string ModeBypass = "Csb00"; // 장비 테스트모드 - public static readonly string ModeEquipmentTest = "Csy"; + public static readonly string ModeEquipmentTest = "Csy00"; // 선별기 테스트모드 - public static readonly string ModeRejectorTest = "Csr"; + public static readonly string ModeRejectorTest = "Csr00"; // 중량조정 - 분동 - public static readonly string CalibrationBalance = "Ccb"; + public static readonly string CalibrationBalance = "Ccb00"; // 중량조정 - 시작 - public static readonly string CalibrationStart = "Ccs"; + public static readonly string CalibrationStart = "Ccs00"; // 중량조정 - 취소 - public static readonly string CalibrationCancel = "Ccx"; + public static readonly string CalibrationCancel = "Ccx00"; // 중량보정 - 한자리올림 - public static readonly string CalibrationUp = "Ccu"; + public static readonly string CalibrationUp = "Ccu00"; // 중량보정 - 한자리내림 - public static readonly string CalibrationDown = "Ccd"; + public static readonly string CalibrationDown = "Ccd00"; // 파라미터 쓰기 - public static readonly string Write = "Pw0"; + public static readonly string Write = "Pw000"; // 파라미터 읽기 - public static readonly string Read = "Pr0"; + public static readonly string Read = "Pr000"; // Bypass To Motor - public static readonly string BypassToMotor = "Pb0"; + public static readonly string BypassToMotor = "Pb000"; // IO테스트 - OUT - public static readonly string IOTest = "Pt0"; + public static readonly string IOTest = "Pt000"; // 모터 - 정회전 - public static readonly string MotorForward = "Cmc"; + public static readonly string MotorForward = "Cmc00"; // 모터 - 역회전 - public static readonly string MotorReverse = "Cmr"; + public static readonly string MotorReverse = "Cmr00"; // 모터 - 다운 - public static readonly string MotorDown = "Cmd"; + public static readonly string MotorDown = "Cmd00"; // 모터 - 업 - public static readonly string MotorUp = "Cmu"; + public static readonly string MotorUp = "Cmu00"; // 모더 - 알람리셋 - public static readonly string MotorAlarmReset = "Cma"; + public static readonly string MotorAlarmReset = "Cma00"; // 모터 - 원점초기화 - public static readonly string MotorOrigin = "Cmo"; + public static readonly string MotorOrigin = "Cmo00"; // 모터 - Step - public static readonly string MotorStep = "Cms"; + public static readonly string MotorStep = "Cms00"; // 모터 - 업2 - public static readonly string MotorUp2 = "Cmp"; + public static readonly string MotorUp2 = "Cmp00"; // Cut 신호 - public static readonly string CutInpupt = "Cbc"; + public static readonly string CutInpupt = "Cbc00"; // 공장초기화 - public static readonly string Initialization = "Cbi"; + public static readonly string Initialization = "Cbi00"; // 운전 - public static readonly string Start = "Cbs"; + public static readonly string Start = "Cbs00"; // 정지 - public static readonly string Stop = "Cbt"; + public static readonly string Stop = "Cbt00"; + // 소거 + public static readonly string Clear = "Cbe00"; // 영점 - public static readonly string Zero = "Cbz"; + public static readonly string Zero = "Cbz00"; // 정량알람 - public static readonly string AlarmPass = "Cab"; + public static readonly string AlarmPass = "Cab00"; + + // ACK + public static readonly string ACK = "ACK"; + // NAK + public static readonly string NAK = "NAK"; + // 운전중 중량 + public static readonly string RunWeightData = "Sr"; + + // 알람 해지 - 통신에러 + public static readonly string AlarmClearCommunicationError = "Cra00"; } public class CommunicationID { @@ -633,7 +645,7 @@ namespace INT51DB // 중량설정값 쓰기 public static readonly string ParameterWeightSetting = "9003"; // 품목 설정 모두 쓰기 - public static readonly string ParameterProduct = "9007"; + public static readonly string ParameterProduct = "9013"; // 시스템파라미터 읽기1 public static readonly string SystemParameterRead1 = "9501"; // 시스템파라미터 읽기2 @@ -650,19 +662,15 @@ namespace INT51DB { #region Field private bool m_IsDataBackup; - private bool m_IsPrintPerProductEnable; private int m_EquipmentID; private int m_DecimalPlaces; private int m_ProductNumber; private int m_UsbID; - private int m_SerialCOM1BaudRate; - private int m_SerialCOM1Mode; - private int m_SerialCOM3BaudRate; - private int m_SerialCOM3Mode; - private int m_SerialCOM4BaudRate; - private int m_SerialCOM4Mode; - private int m_DummyInt5; + private int m_COM3BaudRate; + private int m_COM3Mode; + private int m_COM4BaudRate; + private int m_COM4Mode; private string m_SerialNumber; private string m_MainBoardVersion; @@ -684,11 +692,6 @@ namespace INT51DB get { return this.m_IsDataBackup; } set { this.m_IsDataBackup = value; } } - public bool IsPrintPerProductEnable - { - get { return this.m_IsPrintPerProductEnable; } - set { this.m_IsPrintPerProductEnable = value; } - } public int EquipmentID { @@ -710,41 +713,26 @@ namespace INT51DB get { return this.m_UsbID; } set { this.m_UsbID = value; } } - public int SerialCOM1BaudRate + public int COM3BaudRate { - get { return this.m_SerialCOM1BaudRate; } - set { this.m_SerialCOM1BaudRate = value; } + get { return this.m_COM3BaudRate; } + set { this.m_COM3BaudRate = value; } } - public int SerialCOM1Mode + public int COM3Mode { - get { return this.m_SerialCOM1Mode; } - set { this.m_SerialCOM1Mode = value; } + get { return this.m_COM3Mode; } + set { this.m_COM3Mode = value; } } - public int SerialCOM3BaudRate + public int COM4BaudRate { - get { return this.m_SerialCOM3BaudRate; } - set { this.m_SerialCOM3BaudRate = value; } + get { return this.m_COM4BaudRate; } + set { this.m_COM4BaudRate = value; } } - public int SerialCOM3Mode + public int COM4Mode { - get { return this.m_SerialCOM3Mode; } - set { this.m_SerialCOM3Mode = value; } + get { return this.m_COM4Mode; } + set { this.m_COM4Mode = value; } } - public int SerialCOM4BaudRate - { - get { return this.m_SerialCOM4BaudRate; } - set { this.m_SerialCOM4BaudRate = value; } - } - public int SerialCOM4Mode - { - get { return this.m_SerialCOM4Mode; } - set { this.m_SerialCOM4Mode = value; } - } - public int DummyInt5 - { - get { return this.m_DummyInt5; } - set { this.m_DummyInt5 = value; } - } public string SerialNumber { @@ -773,19 +761,15 @@ namespace INT51DB public void Initialization() { this.IsDataBackup = false; - this.IsPrintPerProductEnable = false; this.EquipmentID = 1; this.DecimalPlaces = 1; this.ProductNumber = 1; this.UsbID = 1; - this.SerialCOM1BaudRate = 0; - this.SerialCOM1Mode = 0; - this.SerialCOM3BaudRate = 0; - this.SerialCOM3Mode = 0; - this.SerialCOM4BaudRate = 0; - this.SerialCOM4Mode = 0; - this.DummyInt5 = 0; + this.COM3BaudRate = 0; + this.COM3Mode = 0; + this.COM4BaudRate = 0; + this.COM4Mode = 0; this.SerialNumber = "23K0000"; this.MainBoardVersion = "000"; @@ -806,10 +790,10 @@ namespace INT51DB public int DecimalPlaces; public int ProductNumber; public int UsbID; - public int Serial1BaudRate; - public int Serial1Mode; - public int Serial2BaudRate; - public int Serial2Mode; + public int COM3BaudRate; + public int COM3Mode; + public int COM4BaudRate; + public int COM4Mode; [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 15)] public string SerialNumber; @@ -824,11 +808,11 @@ namespace INT51DB public bool DummyBool4; public bool DummyBool5; - public int Serial3BaudRate; - public int Serial3Mode; public int DummyInt1; public int DummyInt2; public int DummyInt3; + public int DummyInt4; + public int DummyInt5; [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 40)] public string DummyString1; @@ -1665,8 +1649,9 @@ namespace INT51DB { #region Field private int m_Filter; + private int m_DownDelayTime; private int m_JudgmentDelayTime; - private int m_DoubleDelayTime; + private int m_UpDelayTime; private int m_JudgmentCount; private int m_FeedSpeed; private double m_DynamicCorrection; @@ -1692,15 +1677,20 @@ namespace INT51DB get { return this.m_Filter; } set { this.m_Filter = value; } } + public int DownDelayTime + { + get { return this.m_DownDelayTime; } + set { this.m_DownDelayTime = value; } + } public int JudgmentDelayTime { get { return this.m_JudgmentDelayTime; } set { this.m_JudgmentDelayTime = value; } } - public int DoubleDelayTime + public int UpDelayTime { - get { return this.m_DoubleDelayTime; } - set { this.m_DoubleDelayTime = value; } + get { return this.m_UpDelayTime; } + set { this.m_UpDelayTime = value; } } public int JudgmentCount { @@ -1754,8 +1744,9 @@ namespace INT51DB public void Initialization() { this.Filter = 8; - this.JudgmentDelayTime = 1000; - this.DoubleDelayTime = 900; + this.DownDelayTime = 500; + this.JudgmentDelayTime = 500; + this.UpDelayTime = 500; this.JudgmentCount = 10; this.FeedSpeed = 60; this.DynamicCorrection = 1.000000; @@ -1775,8 +1766,9 @@ namespace INT51DB public struct StructJudgmentSetItem { public int Filter; + public int DownDelayTime; public int JudgmentDelayTime; - public int DoubleDelayTime; + public int UpDelayTime; public int JudgmentCount; public int FeedSpeed; public double DynamicCorrection; diff --git a/INT51DB/Forms/FormMain.cs b/INT51DB/Forms/FormMain.cs index 772e6c9..9bc6416 100644 --- a/INT51DB/Forms/FormMain.cs +++ b/INT51DB/Forms/FormMain.cs @@ -177,8 +177,8 @@ namespace INT51DB.Forms value = value.Replace(".", ""); sb.Append(Helper.StringZeroFillDigits7(value)); sb.Append(Helper.StringZeroFillDigits4(jItem.Filter.ToString())); - sb.Append(Helper.StringZeroFillDigits4(jItem.JudgmentDelayTime.ToString())); - sb.Append(Helper.StringZeroFillDigits4(jItem.DoubleDelayTime.ToString())); + sb.Append(Helper.StringZeroFillDigits4(jItem.UpDelayTime.ToString())); + sb.Append(Helper.StringZeroFillDigits4(jItem.DownDelayTime.ToString())); sb.Append(Helper.StringZeroFillDigits4(jItem.JudgmentCount.ToString())); sb.Append(Helper.StringZeroFillDigits4(jItem.FeedSpeed.ToString())); sb.Append(Helper.StringZeroFillDigits4(jItem.Sorter1Mode.ToString())); @@ -187,6 +187,10 @@ namespace INT51DB.Forms sb.Append(Helper.StringZeroFillDigits4(jItem.Sorter2Mode.ToString())); sb.Append(Helper.StringZeroFillDigits4(jItem.Sorter2DelayTime.ToString())); sb.Append(Helper.StringZeroFillDigits4(jItem.Sorter2RunTime.ToString())); + sb.Append(Helper.StringZeroFillDigits4(jItem.JudgmentDelayTime.ToString())); + sb.Append(Helper.StringZeroFillDigits4("0000")); + sb.Append(Helper.StringZeroFillDigits4("0000")); + sb.Append(Helper.StringZeroFillDigits4("0000")); sb.Append(Helper.StringZeroFillDigits4(pItem.Number.ToString())); this.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.ParameterProduct, sb.ToString()); @@ -1198,73 +1202,29 @@ namespace INT51DB.Forms #endregion #region 통신 - // 통신 COM1 - if (this.SystemConfig.SerialCOM1Mode != 0) - { - #region COM1 - switch (this.SystemConfig.SerialCOM1Mode) - { - case 1: - this.TransferSerialCOM1(this.Transfer_1_STD1(this.SystemConfig, this.CurrentWeightData, this.CurrentProductItem)); - break; - case 2: - this.TransferSerialCOM1(this.Transfer_2_Remote(this.CurrentWeightData, this.CurrentProductItem)); - break; - case 3: - if (this.SystemConfig.IsPrintPerProductEnable == true) - this.TransferSerialCOM1(this.Transfer_3_Print(this.CurrentWeightData, this.CurrentProductItem)); - break; - case 4: - this.TransferSerialCOM1(this.Transfer_4_STD2(this.SystemConfig, this.CurrentWeightData, this.CurrentProductItem)); - break; - default: - break; - } - #endregion - } // 통신 COM3 - if (this.SystemConfig.SerialCOM3Mode != 0) + if (this.SystemConfig.COM3Mode != 0) { #region COM3 - switch (this.SystemConfig.SerialCOM3Mode) + switch (this.SystemConfig.COM3Mode) { case 1: this.TransferSerialCOM3(this.Transfer_1_STD1(this.SystemConfig, this.CurrentWeightData, this.CurrentProductItem)); break; - case 2: - this.TransferSerialCOM3(this.Transfer_2_Remote(this.CurrentWeightData, this.CurrentProductItem)); - break; - case 3: - if (this.SystemConfig.IsPrintPerProductEnable == true) - this.TransferSerialCOM3(this.Transfer_3_Print(this.CurrentWeightData, this.CurrentProductItem)); - break; - case 4: - this.TransferSerialCOM3(this.Transfer_4_STD2(this.SystemConfig, this.CurrentWeightData, this.CurrentProductItem)); - break; default: break; } #endregion } // 통신 COM4 - if (this.SystemConfig.SerialCOM4Mode != 0) + if (this.SystemConfig.COM4Mode != 0) { #region COM4 - switch (this.SystemConfig.SerialCOM4Mode) + switch (this.SystemConfig.COM4Mode) { case 1: this.TransferSerialCOM4(this.Transfer_1_STD1(this.SystemConfig, this.CurrentWeightData, this.CurrentProductItem)); break; - case 2: - this.TransferSerialCOM4(this.Transfer_2_Remote(this.CurrentWeightData, this.CurrentProductItem)); - break; - case 3: - if (this.SystemConfig.IsPrintPerProductEnable == true) - this.TransferSerialCOM4(this.Transfer_3_Print(this.CurrentWeightData, this.CurrentProductItem)); - break; - case 4: - this.TransferSerialCOM4(this.Transfer_4_STD2(this.SystemConfig, this.CurrentWeightData, this.CurrentProductItem)); - break; default: break; } @@ -1583,114 +1543,16 @@ namespace INT51DB.Forms } #endregion - #region Serial COM1 - public void OpenSerialCOM1() - { - if (this.SystemConfig.SerialCOM1Mode == 0) - return; - - if (this.smartSerialPort1.IsOpen == true) - this.smartSerialPort1.Close(); - - switch (this.SystemConfig.SerialCOM1BaudRate) - { - case 0: - this.smartSerialPort1.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps; - break; - case 1: - this.smartSerialPort1.Baud_Rate = SmartSerialPort.BAUDRATE._19200bps; - break; - case 2: - this.smartSerialPort1.Baud_Rate = SmartSerialPort.BAUDRATE._38400bps; - break; - case 3: - this.smartSerialPort1.Baud_Rate = SmartSerialPort.BAUDRATE._57600bps; - break; - case 4: - this.smartSerialPort1.Baud_Rate = SmartSerialPort.BAUDRATE._115200bps; - break; - default: - this.smartSerialPort1.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps; - break; - } - - this.smartSerialPort1.Open(); - } - public void CloseSerialCOM1() - { - this.smartSerialPort1.Close(); - } - public bool CheckOpenCOM1() - { - if (this.smartSerialPort1.IsOpen == true) - return true; - else - return false; - } - public void TransferDirectSerialCOM1(string strTemp) - { - this.smartSerialPort1.WriteNoneFrame(strTemp, SmartSerialPort.CODETYPES.ASCIICODE); - } - public void TransferDirectSerialCOM1(byte[] buffer) - { - this.smartSerialPort1.WriteNoneFrame(buffer); - } - public void TransferSerialCOM1(string strTemp) - { - if (this.smartSerialPort1.IsOpen == true) - this.smartSerialPort1.WriteNoneFrame(strTemp, SmartSerialPort.CODETYPES.ASCIICODE); - } - public void TransferSerialCOM1(byte[] buffer) - { - if (this.smartSerialPort1.IsOpen == true) - this.smartSerialPort1.WriteNoneFrame(buffer); - } - public void ChangeSerialCOM1FrameSeparateType(DataStore.SeparateType type) - { - // 통신 포트 설정 - if (this.smartSerialPort1.IsOpen == true) - this.smartSerialPort1.Close(); - - if (type == DataStore.SeparateType.ETXONLY) - { - this.smartSerialPort1.FrameSeparationType = SmartSerialPort.FRAMESEPARATIONTYPES.ETXONLY; - - byte[] etxCodes = new byte[2]; - etxCodes[0] = 13; - etxCodes[1] = 10; - this.smartSerialPort1.ETXCodes = etxCodes; - } - else if (type == DataStore.SeparateType.STXANDETX) - { - this.smartSerialPort1.FrameSeparationType = SmartSerialPort.FRAMESEPARATIONTYPES.STXANDETX; - - this.smartSerialPort1.STXCode = 2; - this.smartSerialPort1.ETXCode = 3; - } - else if (type == DataStore.SeparateType.NONEFRAME_READTIMEOUT) - { - this.smartSerialPort1.FrameSeparationType = SmartSerialPort.FRAMESEPARATIONTYPES.NONEFRAME_READTIMEOUT; - this.smartSerialPort1.ReadTimeout = 300; - } - else - { - this.smartSerialPort1.FrameSeparationType = SmartSerialPort.FRAMESEPARATIONTYPES.STXONLY; - this.smartSerialPort1.STXCode = 2; - } - - this.smartSerialPort1.Open(); - } - #endregion #region Serial COM3 public void OpenSerialCOM3() { - if (this.SystemConfig.SerialCOM3Mode == 0) + if (this.SystemConfig.COM3Mode == 0) return; if (this.smartSerialPort3.IsOpen == true) this.smartSerialPort3.Close(); - switch (this.SystemConfig.SerialCOM3BaudRate) + switch (this.SystemConfig.COM3BaudRate) { case 0: this.smartSerialPort3.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps; @@ -1826,13 +1688,13 @@ namespace INT51DB.Forms #region Serial COM4 public void OpenSerialCOM4() { - if (this.SystemConfig.SerialCOM4Mode == 0) + if (this.SystemConfig.COM4Mode == 0) return; if (this.smartSerialPort4.IsOpen == true) this.smartSerialPort4.Close(); - switch (this.SystemConfig.SerialCOM4BaudRate) + switch (this.SystemConfig.COM4BaudRate) { case 0: this.smartSerialPort4.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps; @@ -2031,10 +1893,10 @@ namespace INT51DB.Forms structItem.DecimalPlaces = this.SystemConfig.DecimalPlaces; structItem.ProductNumber = this.SystemConfig.ProductNumber; structItem.UsbID = this.SystemConfig.UsbID; - structItem.Serial1BaudRate = this.SystemConfig.SerialCOM1BaudRate; - structItem.Serial1Mode = this.SystemConfig.SerialCOM1Mode; - structItem.Serial2BaudRate = this.SystemConfig.SerialCOM3BaudRate; - structItem.Serial2Mode = this.SystemConfig.SerialCOM3Mode; + structItem.COM3BaudRate = this.SystemConfig.COM3BaudRate; + structItem.COM3Mode = this.SystemConfig.COM3Mode; + structItem.COM4BaudRate = this.SystemConfig.COM4BaudRate; + structItem.COM4Mode = this.SystemConfig.COM4Mode; structItem.SerialNumber = this.SystemConfig.SerialNumber; structItem.Language = this.SystemConfig.Language; @@ -2045,11 +1907,11 @@ namespace INT51DB.Forms structItem.DummyBool3 = false; structItem.DummyBool4 = false; structItem.DummyBool5 = false; - structItem.Serial3BaudRate = 0; - structItem.Serial3Mode = 0; - structItem.DummyInt1 = 1; - structItem.DummyInt2 = 1; - structItem.DummyInt3 = 1; + structItem.DummyInt1 = 0; + structItem.DummyInt2 = 0; + structItem.DummyInt3 = 0; + structItem.DummyInt4 = 0; + structItem.DummyInt5 = 0; structItem.DummyString1 = ""; structItem.DummyString2 = ""; structItem.DummyString3 = ""; @@ -2085,10 +1947,10 @@ namespace INT51DB.Forms structItem.DecimalPlaces = item.DecimalPlaces; structItem.ProductNumber = item.ProductNumber; structItem.UsbID = item.UsbID; - structItem.Serial1BaudRate = item.SerialCOM1BaudRate; - structItem.Serial1Mode = item.SerialCOM1Mode; - structItem.Serial2BaudRate = item.SerialCOM3BaudRate; - structItem.Serial2Mode = item.SerialCOM3Mode; + structItem.COM3BaudRate = item.COM3BaudRate; + structItem.COM3Mode = item.COM3Mode; + structItem.COM4BaudRate = item.COM4BaudRate; + structItem.COM4Mode = item.COM4Mode; structItem.SerialNumber = item.SerialNumber; structItem.Language = item.Language; @@ -2099,11 +1961,13 @@ namespace INT51DB.Forms structItem.DummyBool3 = false; structItem.DummyBool4 = false; structItem.DummyBool5 = false; - structItem.DummyInt1 = 1; - structItem.DummyInt2 = 1; - structItem.DummyInt3 = 1; - structItem.Serial3BaudRate = 1; - structItem.Serial3Mode = item.DummyInt5; + + structItem.DummyInt1 = 0; + structItem.DummyInt2 = 0; + structItem.DummyInt3 = 0; + structItem.DummyInt4 = 0; + structItem.DummyInt5 = 0; + structItem.DummyString1 = ""; structItem.DummyString2 = ""; structItem.DummyString3 = ""; @@ -2143,12 +2007,11 @@ namespace INT51DB.Forms this.SystemConfig.EquipmentID = structItem.EquipmentID; this.SystemConfig.DecimalPlaces = structItem.DecimalPlaces; this.SystemConfig.ProductNumber = structItem.ProductNumber; - this.SystemConfig.UsbID = structItem.UsbID; - this.SystemConfig.SerialCOM1BaudRate = structItem.Serial1BaudRate; - this.SystemConfig.SerialCOM1Mode = structItem.Serial1Mode; - this.SystemConfig.SerialCOM3BaudRate = structItem.Serial2BaudRate; - this.SystemConfig.SerialCOM3Mode = structItem.Serial2Mode; - this.SystemConfig.DummyInt5 = structItem.Serial3Mode; + this.SystemConfig.UsbID = structItem.UsbID; + this.SystemConfig.COM3BaudRate = structItem.COM3BaudRate; + this.SystemConfig.COM3Mode = structItem.COM3Mode; + this.SystemConfig.COM4BaudRate = structItem.COM4BaudRate; + this.SystemConfig.COM4Mode = structItem.COM4Mode; this.SystemConfig.SerialNumber = structItem.SerialNumber; this.SystemConfig.Language = structItem.Language; @@ -2310,8 +2173,9 @@ namespace INT51DB.Forms for (int i = 0; i < 1000; i++) { structItem.Filter = this.CurrentJudgmentSetItem.Filter; + structItem.DownDelayTime = this.CurrentJudgmentSetItem.DownDelayTime; structItem.JudgmentDelayTime = this.CurrentJudgmentSetItem.JudgmentDelayTime; - structItem.DoubleDelayTime = this.CurrentJudgmentSetItem.DoubleDelayTime; + structItem.UpDelayTime = this.CurrentJudgmentSetItem.UpDelayTime; structItem.JudgmentCount = this.CurrentJudgmentSetItem.JudgmentCount; structItem.FeedSpeed = this.CurrentJudgmentSetItem.FeedSpeed; structItem.DynamicCorrection = this.CurrentJudgmentSetItem.DynamicCorrection; @@ -2359,8 +2223,9 @@ namespace INT51DB.Forms } structItem.Filter = item.Filter; + structItem.DownDelayTime = item.DownDelayTime; structItem.JudgmentDelayTime = item.JudgmentDelayTime; - structItem.DoubleDelayTime = item.DoubleDelayTime; + structItem.UpDelayTime = item.UpDelayTime; structItem.JudgmentCount = item.JudgmentCount; structItem.FeedSpeed = item.FeedSpeed; structItem.DynamicCorrection = item.DynamicCorrection; @@ -2415,8 +2280,9 @@ namespace INT51DB.Forms structItem = (StructJudgmentSetItem)this.smartFileIO.ReadStructureBuffer(typeof(StructJudgmentSetItem), index); item.Filter = structItem.Filter; + item.DownDelayTime = structItem.DownDelayTime; item.JudgmentDelayTime = structItem.JudgmentDelayTime; - item.DoubleDelayTime = structItem.DoubleDelayTime; + item.UpDelayTime = structItem.UpDelayTime; item.JudgmentCount = structItem.JudgmentCount; item.FeedSpeed = structItem.FeedSpeed; item.DynamicCorrection = structItem.DynamicCorrection; @@ -2721,16 +2587,12 @@ namespace INT51DB.Forms this.OpenSmartUartLink(); #region Communication - // COM1 OPEN - if (this.SystemConfig.SerialCOM1Mode != 0) - this.OpenSerialCOM1(); - // COM3 OPEN - if (this.SystemConfig.SerialCOM3Mode != 0) + if (this.SystemConfig.COM3Mode != 0) this.OpenSerialCOM3(); // COM4 OPEN - if (this.SystemConfig.SerialCOM4Mode != 0) + if (this.SystemConfig.COM4Mode != 0) this.OpenSerialCOM4(); #endregion diff --git a/INT51DB/Forms/FormMainDisplay.Designer.cs b/INT51DB/Forms/FormMainDisplay.Designer.cs index 46a957e..7bc1c9d 100644 --- a/INT51DB/Forms/FormMainDisplay.Designer.cs +++ b/INT51DB/Forms/FormMainDisplay.Designer.cs @@ -280,6 +280,7 @@ this.pictureBoxCh1.Location = new System.Drawing.Point(51, 68); this.pictureBoxCh1.Name = "pictureBoxCh1"; this.pictureBoxCh1.Size = new System.Drawing.Size(24, 25); + this.pictureBoxCh1.Visible = false; // // labelIconLog // @@ -350,7 +351,9 @@ this.buttonBargraph.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonBargraph.Name = "buttonBargraph"; this.buttonBargraph.NestedClickEventPrevent = false; + this.buttonBargraph.OutlinePixel = 1; this.buttonBargraph.RepeatInterval = 200; + this.buttonBargraph.RepeatIntervalAccelerate = null; this.buttonBargraph.SafeInterval = 200; this.buttonBargraph.Size = new System.Drawing.Size(65, 65); this.buttonBargraph.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -379,7 +382,9 @@ this.buttonSubMenu.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonSubMenu.Name = "buttonSubMenu"; this.buttonSubMenu.NestedClickEventPrevent = false; + this.buttonSubMenu.OutlinePixel = 1; this.buttonSubMenu.RepeatInterval = 200; + this.buttonSubMenu.RepeatIntervalAccelerate = null; this.buttonSubMenu.SafeInterval = 200; this.buttonSubMenu.Size = new System.Drawing.Size(65, 65); this.buttonSubMenu.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -408,7 +413,9 @@ this.buttonLinegraph.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonLinegraph.Name = "buttonLinegraph"; this.buttonLinegraph.NestedClickEventPrevent = false; + this.buttonLinegraph.OutlinePixel = 1; this.buttonLinegraph.RepeatInterval = 200; + this.buttonLinegraph.RepeatIntervalAccelerate = null; this.buttonLinegraph.SafeInterval = 200; this.buttonLinegraph.Size = new System.Drawing.Size(65, 65); this.buttonLinegraph.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -437,7 +444,9 @@ this.buttonList.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonList.Name = "buttonList"; this.buttonList.NestedClickEventPrevent = false; + this.buttonList.OutlinePixel = 1; this.buttonList.RepeatInterval = 200; + this.buttonList.RepeatIntervalAccelerate = null; this.buttonList.SafeInterval = 200; this.buttonList.Size = new System.Drawing.Size(65, 65); this.buttonList.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -466,7 +475,9 @@ this.buttonDataStat.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonDataStat.Name = "buttonDataStat"; this.buttonDataStat.NestedClickEventPrevent = false; + this.buttonDataStat.OutlinePixel = 1; this.buttonDataStat.RepeatInterval = 200; + this.buttonDataStat.RepeatIntervalAccelerate = null; this.buttonDataStat.SafeInterval = 200; this.buttonDataStat.Size = new System.Drawing.Size(65, 65); this.buttonDataStat.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -511,7 +522,9 @@ this.buttonWeightInputMode.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonWeightInputMode.Name = "buttonWeightInputMode"; this.buttonWeightInputMode.NestedClickEventPrevent = false; + this.buttonWeightInputMode.OutlinePixel = 1; this.buttonWeightInputMode.RepeatInterval = 200; + this.buttonWeightInputMode.RepeatIntervalAccelerate = null; this.buttonWeightInputMode.SafeInterval = 200; this.buttonWeightInputMode.Size = new System.Drawing.Size(90, 57); this.buttonWeightInputMode.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -540,7 +553,9 @@ this.buttonClear.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonClear.Name = "buttonClear"; this.buttonClear.NestedClickEventPrevent = false; + this.buttonClear.OutlinePixel = 1; this.buttonClear.RepeatInterval = 200; + this.buttonClear.RepeatIntervalAccelerate = null; this.buttonClear.SafeInterval = 200; this.buttonClear.Size = new System.Drawing.Size(90, 57); this.buttonClear.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -569,7 +584,9 @@ this.buttonZero.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonZero.Name = "buttonZero"; this.buttonZero.NestedClickEventPrevent = false; + this.buttonZero.OutlinePixel = 1; this.buttonZero.RepeatInterval = 200; + this.buttonZero.RepeatIntervalAccelerate = null; this.buttonZero.SafeInterval = 200; this.buttonZero.Size = new System.Drawing.Size(90, 57); this.buttonZero.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -598,7 +615,9 @@ this.buttonMenu.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonMenu.Name = "buttonMenu"; this.buttonMenu.NestedClickEventPrevent = false; + this.buttonMenu.OutlinePixel = 1; this.buttonMenu.RepeatInterval = 200; + this.buttonMenu.RepeatIntervalAccelerate = null; this.buttonMenu.SafeInterval = 200; this.buttonMenu.Size = new System.Drawing.Size(90, 65); this.buttonMenu.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -629,7 +648,9 @@ this.buttonProductNo.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonProductNo.Name = "buttonProductNo"; this.buttonProductNo.NestedClickEventPrevent = false; + this.buttonProductNo.OutlinePixel = 1; this.buttonProductNo.RepeatInterval = 200; + this.buttonProductNo.RepeatIntervalAccelerate = null; this.buttonProductNo.SafeInterval = 200; this.buttonProductNo.Size = new System.Drawing.Size(70, 50); this.buttonProductNo.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -688,7 +709,9 @@ this.buttonConveyorUpDown.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonConveyorUpDown.Name = "buttonConveyorUpDown"; this.buttonConveyorUpDown.NestedClickEventPrevent = false; + this.buttonConveyorUpDown.OutlinePixel = 1; this.buttonConveyorUpDown.RepeatInterval = 200; + this.buttonConveyorUpDown.RepeatIntervalAccelerate = null; this.buttonConveyorUpDown.SafeInterval = 200; this.buttonConveyorUpDown.Size = new System.Drawing.Size(90, 57); this.buttonConveyorUpDown.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; diff --git a/INT51DB/Forms/FormMainDisplay.cs b/INT51DB/Forms/FormMainDisplay.cs index 6bd373f..561f126 100644 --- a/INT51DB/Forms/FormMainDisplay.cs +++ b/INT51DB/Forms/FormMainDisplay.cs @@ -148,14 +148,8 @@ namespace INT51DB.Forms if (this.labelUnit.Text != this.ParentForm.SystemConfig.Unit) this.labelUnit.Text = this.ParentForm.SystemConfig.Unit; - // Icon - Ch1 - if (this.ParentForm.SystemConfig.SerialCOM1Mode == 0) - this.pictureBoxCh1.Visible = false; - else - this.pictureBoxCh1.Visible = true; - // Icon - Ch2 - if (this.ParentForm.SystemConfig.SerialCOM3Mode == 0) + if (this.ParentForm.SystemConfig.COM3Mode == 0) this.pictureBoxCh2.Visible = false; else this.pictureBoxCh2.Visible = true; diff --git a/INT51DB/obj/Release/INT51DB.exe b/INT51DB/obj/Release/INT51DB.exe index 9785cb9..f15c956 100644 Binary files a/INT51DB/obj/Release/INT51DB.exe and b/INT51DB/obj/Release/INT51DB.exe differ