diff --git a/INT51DB/Controls/Bottom/ControlBottomConfiguration.Designer.cs b/INT51DB/Controls/Bottom/ControlBottomConfiguration.Designer.cs index be789e0..33efb53 100644 --- a/INT51DB/Controls/Bottom/ControlBottomConfiguration.Designer.cs +++ b/INT51DB/Controls/Bottom/ControlBottomConfiguration.Designer.cs @@ -52,7 +52,9 @@ this.buttonHelp.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonHelp.Name = "buttonHelp"; this.buttonHelp.NestedClickEventPrevent = false; + this.buttonHelp.OutlinePixel = 1; this.buttonHelp.RepeatInterval = 200; + this.buttonHelp.RepeatIntervalAccelerate = null; this.buttonHelp.SafeInterval = 200; this.buttonHelp.Size = new System.Drawing.Size(65, 65); this.buttonHelp.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -81,7 +83,9 @@ this.buttonCommunication.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonCommunication.Name = "buttonCommunication"; this.buttonCommunication.NestedClickEventPrevent = false; + this.buttonCommunication.OutlinePixel = 1; this.buttonCommunication.RepeatInterval = 200; + this.buttonCommunication.RepeatIntervalAccelerate = null; this.buttonCommunication.SafeInterval = 200; this.buttonCommunication.Size = new System.Drawing.Size(65, 65); this.buttonCommunication.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -110,7 +114,9 @@ this.buttonOption.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonOption.Name = "buttonOption"; this.buttonOption.NestedClickEventPrevent = false; + this.buttonOption.OutlinePixel = 1; this.buttonOption.RepeatInterval = 200; + this.buttonOption.RepeatIntervalAccelerate = null; this.buttonOption.SafeInterval = 200; this.buttonOption.Size = new System.Drawing.Size(65, 65); this.buttonOption.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -121,6 +127,7 @@ this.buttonOption.TextLocation = new System.Drawing.Point(0, 0); this.buttonOption.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonOption.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonOption.UpImage"))); + this.buttonOption.Visible = false; this.buttonOption.Click += new System.EventHandler(this.buttonMenu_Click); // // buttonOptionBoard1 @@ -139,7 +146,9 @@ this.buttonOptionBoard1.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonOptionBoard1.Name = "buttonOptionBoard1"; this.buttonOptionBoard1.NestedClickEventPrevent = false; + this.buttonOptionBoard1.OutlinePixel = 1; this.buttonOptionBoard1.RepeatInterval = 200; + this.buttonOptionBoard1.RepeatIntervalAccelerate = null; this.buttonOptionBoard1.SafeInterval = 200; this.buttonOptionBoard1.Size = new System.Drawing.Size(65, 65); this.buttonOptionBoard1.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -170,7 +179,9 @@ this.buttonOptionBoard2.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonOptionBoard2.Name = "buttonOptionBoard2"; this.buttonOptionBoard2.NestedClickEventPrevent = false; + this.buttonOptionBoard2.OutlinePixel = 1; this.buttonOptionBoard2.RepeatInterval = 200; + this.buttonOptionBoard2.RepeatIntervalAccelerate = null; this.buttonOptionBoard2.SafeInterval = 200; this.buttonOptionBoard2.Size = new System.Drawing.Size(65, 65); this.buttonOptionBoard2.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; diff --git a/INT51DB/Controls/Bottom/ControlBottomSystem.Designer.cs b/INT51DB/Controls/Bottom/ControlBottomSystem.Designer.cs index cec00ed..f051936 100644 --- a/INT51DB/Controls/Bottom/ControlBottomSystem.Designer.cs +++ b/INT51DB/Controls/Bottom/ControlBottomSystem.Designer.cs @@ -51,7 +51,7 @@ this.buttonAutoZero.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonAutoZero.DownImage"))); this.buttonAutoZero.GroupID = 0; this.buttonAutoZero.InitVisible = true; - this.buttonAutoZero.Location = new System.Drawing.Point(314, 0); + this.buttonAutoZero.Location = new System.Drawing.Point(243, 0); this.buttonAutoZero.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonAutoZero.Name = "buttonAutoZero"; this.buttonAutoZero.NestedClickEventPrevent = false; @@ -144,7 +144,7 @@ this.buttonIOTest.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonIOTest.DownImage"))); this.buttonIOTest.GroupID = 0; this.buttonIOTest.InitVisible = true; - this.buttonIOTest.Location = new System.Drawing.Point(385, 0); + this.buttonIOTest.Location = new System.Drawing.Point(314, 0); this.buttonIOTest.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonIOTest.Name = "buttonIOTest"; this.buttonIOTest.NestedClickEventPrevent = false; @@ -206,7 +206,7 @@ this.buttonSorter.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonSorter.DownImage"))); this.buttonSorter.GroupID = 0; this.buttonSorter.InitVisible = true; - this.buttonSorter.Location = new System.Drawing.Point(243, 0); + this.buttonSorter.Location = new System.Drawing.Point(527, 0); this.buttonSorter.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonSorter.Name = "buttonSorter"; this.buttonSorter.NestedClickEventPrevent = false; @@ -223,6 +223,7 @@ this.buttonSorter.TextLocation = new System.Drawing.Point(0, 0); this.buttonSorter.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonSorter.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonSorter.UpImage"))); + this.buttonSorter.Visible = false; this.buttonSorter.Click += new System.EventHandler(this.buttonMenu_Click); // // buttonServo @@ -237,7 +238,7 @@ this.buttonServo.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonServo.DownImage"))); this.buttonServo.GroupID = 0; this.buttonServo.InitVisible = true; - this.buttonServo.Location = new System.Drawing.Point(456, 0); + this.buttonServo.Location = new System.Drawing.Point(385, 0); this.buttonServo.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonServo.Name = "buttonServo"; this.buttonServo.NestedClickEventPrevent = false; @@ -268,7 +269,7 @@ this.buttonExternalOutput.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonExternalOutput.DownImage"))); this.buttonExternalOutput.GroupID = 0; this.buttonExternalOutput.InitVisible = true; - this.buttonExternalOutput.Location = new System.Drawing.Point(527, 3); + this.buttonExternalOutput.Location = new System.Drawing.Point(456, 0); this.buttonExternalOutput.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonExternalOutput.Name = "buttonExternalOutput"; this.buttonExternalOutput.NestedClickEventPrevent = false; diff --git a/INT51DB/Controls/CenterBasic/ControlCenterBasicProduct.cs b/INT51DB/Controls/CenterBasic/ControlCenterBasicProduct.cs index bcce995..6baa331 100644 --- a/INT51DB/Controls/CenterBasic/ControlCenterBasicProduct.cs +++ b/INT51DB/Controls/CenterBasic/ControlCenterBasicProduct.cs @@ -189,8 +189,8 @@ namespace INT51DB.Controls private void buttonNameEdit_Click(object sender, EventArgs e) { this.smartKeyboard.KeyboardType = SmartX.SmartKeyboard.KEYBOARDTYPES.NORMAL; - this.smartKeyboard.Location = new Point(25, 181); - this.smartKeyboard.Size = new Size(532,210); + this.smartKeyboard.Location = new Point(9, 176); + this.smartKeyboard.Size = new Size(684, 274); this.smartKeyboard.Hide(); this.smartKeyboard.TargetInputObject = this.textBoxProductName; @@ -207,8 +207,8 @@ namespace INT51DB.Controls private void buttonLotEdit_Click(object sender, EventArgs e) { this.smartKeyboard.KeyboardType = SmartX.SmartKeyboard.KEYBOARDTYPES.NORMAL; - this.smartKeyboard.Location = new Point(25, 181); - this.smartKeyboard.Size = new Size(532, 210); + this.smartKeyboard.Location = new Point(9, 176); + this.smartKeyboard.Size = new Size(684, 274); this.smartKeyboard.Hide(); this.smartKeyboard.TargetInputObject = this.textBoxLotNo; diff --git a/INT51DB/Controls/CenterConfiguration/ControlCenterConfiHelp.Designer.cs b/INT51DB/Controls/CenterConfiguration/ControlCenterConfiHelp.Designer.cs index d6805f6..0b453fc 100644 --- a/INT51DB/Controls/CenterConfiguration/ControlCenterConfiHelp.Designer.cs +++ b/INT51DB/Controls/CenterConfiguration/ControlCenterConfiHelp.Designer.cs @@ -71,7 +71,9 @@ this.buttonOption.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonOption.Name = "buttonOption"; this.buttonOption.NestedClickEventPrevent = false; + this.buttonOption.OutlinePixel = 1; this.buttonOption.RepeatInterval = 200; + this.buttonOption.RepeatIntervalAccelerate = null; this.buttonOption.SafeInterval = 200; this.buttonOption.Size = new System.Drawing.Size(160, 208); this.buttonOption.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -82,6 +84,7 @@ this.buttonOption.TextLocation = new System.Drawing.Point(0, 0); this.buttonOption.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonOption.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonOption.UpImage"))); + this.buttonOption.Visible = false; this.buttonOption.Click += new System.EventHandler(this.buttonMenu_Click); // // buttonCommunication @@ -100,7 +103,9 @@ this.buttonCommunication.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonCommunication.Name = "buttonCommunication"; this.buttonCommunication.NestedClickEventPrevent = false; + this.buttonCommunication.OutlinePixel = 1; this.buttonCommunication.RepeatInterval = 200; + this.buttonCommunication.RepeatIntervalAccelerate = null; this.buttonCommunication.SafeInterval = 200; this.buttonCommunication.Size = new System.Drawing.Size(160, 208); this.buttonCommunication.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; diff --git a/INT51DB/Controls/CenterSystem/ControlCenterSystemCalibration.Designer.cs b/INT51DB/Controls/CenterSystem/ControlCenterSystemCalibration.Designer.cs index ad5df25..04ec27b 100644 --- a/INT51DB/Controls/CenterSystem/ControlCenterSystemCalibration.Designer.cs +++ b/INT51DB/Controls/CenterSystem/ControlCenterSystemCalibration.Designer.cs @@ -30,6 +30,7 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlCenterSystemCalibration)); this.smartGroupBox1 = new SmartX.SmartGroupBox(); + this.listBoxHelp = new SmartX.SmartListBox(); this.smartGroupBox4 = new SmartX.SmartGroupBox(); this.radioButtonUnitKg = new SmartX.SmartRadioButton(); this.radioButtonUnitG = new SmartX.SmartRadioButton(); @@ -56,7 +57,6 @@ this.labelWeightUnit = new SmartX.SmartLabel(); this.labelWeight = new SmartX.SmartLabel(); this.buttonStart = new SmartX.SmartButton(); - this.listBoxHelp = new SmartX.SmartListBox(); this.smartGroupBox1.SuspendLayout(); this.smartGroupBox4.SuspendLayout(); this.smartGroupBox3.SuspendLayout(); @@ -100,6 +100,40 @@ this.smartGroupBox1.TabIndex = 176; this.smartGroupBox1.TextColor = System.Drawing.Color.Black; // + // listBoxHelp + // + this.listBoxHelp.BackColor = System.Drawing.Color.White; + this.listBoxHelp.BackPictureBox1 = null; + this.listBoxHelp.BackPictureBox2 = this.smartGroupBox1; + this.listBoxHelp.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.LEFT; + this.listBoxHelp.ColumnDelimiter = '\0'; + this.listBoxHelp.ColumnOffsets = null; + this.listBoxHelp.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Bold); + this.listBoxHelp.FontColor = System.Drawing.Color.White; + this.listBoxHelp.ForeColor = System.Drawing.Color.Black; + this.listBoxHelp.InitVisible = true; + this.listBoxHelp.ItemAddOrder = SmartX.SmartListBox.ITEMADDORDERS.BOTTOMADD; + this.listBoxHelp.ItemOffsetGap = 0; + this.listBoxHelp.ItemOffsetX = 0; + this.listBoxHelp.ItemOffsetY = 0; + this.listBoxHelp.Location = new System.Drawing.Point(453, 327); + this.listBoxHelp.MouseMoveEventSpace = 3; + this.listBoxHelp.MouseMoveSpace = 10; + this.listBoxHelp.Name = "listBoxHelp"; + this.listBoxHelp.OutLineColor = System.Drawing.Color.White; + this.listBoxHelp.SelectColor = System.Drawing.Color.Blue; + this.listBoxHelp.SelectFilled = true; + this.listBoxHelp.SelectFontColor = System.Drawing.Color.DarkBlue; + this.listBoxHelp.SelectItemIndex = -1; + this.listBoxHelp.SeparationlineColor1 = System.Drawing.Color.Black; + this.listBoxHelp.SeparationlineColor2 = System.Drawing.Color.Black; + this.listBoxHelp.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle; + this.listBoxHelp.SeparationlineVisibleBottom = true; + this.listBoxHelp.SeparationlineVisibleTop = true; + this.listBoxHelp.Size = new System.Drawing.Size(221, 105); + this.listBoxHelp.TabIndex = 486; + this.listBoxHelp.Text = "smartListBox1"; + // // smartGroupBox4 // this.smartGroupBox4.BackColor = System.Drawing.Color.Black; @@ -727,40 +761,6 @@ this.buttonStart.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonStart.UpImage"))); this.buttonStart.Click += new System.EventHandler(this.buttonStart_Click); // - // listBoxHelp - // - this.listBoxHelp.BackColor = System.Drawing.Color.White; - this.listBoxHelp.BackPictureBox1 = null; - this.listBoxHelp.BackPictureBox2 = this.smartGroupBox1; - this.listBoxHelp.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.LEFT; - this.listBoxHelp.ColumnDelimiter = '\0'; - this.listBoxHelp.ColumnOffsets = null; - this.listBoxHelp.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Bold); - this.listBoxHelp.FontColor = System.Drawing.Color.White; - this.listBoxHelp.ForeColor = System.Drawing.Color.Black; - this.listBoxHelp.InitVisible = true; - this.listBoxHelp.ItemAddOrder = SmartX.SmartListBox.ITEMADDORDERS.BOTTOMADD; - this.listBoxHelp.ItemOffsetGap = 0; - this.listBoxHelp.ItemOffsetX = 0; - this.listBoxHelp.ItemOffsetY = 0; - this.listBoxHelp.Location = new System.Drawing.Point(447, 356); - this.listBoxHelp.MouseMoveEventSpace = 3; - this.listBoxHelp.MouseMoveSpace = 10; - this.listBoxHelp.Name = "listBoxHelp"; - this.listBoxHelp.OutLineColor = System.Drawing.Color.White; - this.listBoxHelp.SelectColor = System.Drawing.Color.Blue; - this.listBoxHelp.SelectFilled = true; - this.listBoxHelp.SelectFontColor = System.Drawing.Color.DarkBlue; - this.listBoxHelp.SelectItemIndex = -1; - this.listBoxHelp.SeparationlineColor1 = System.Drawing.Color.Black; - this.listBoxHelp.SeparationlineColor2 = System.Drawing.Color.Black; - this.listBoxHelp.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle; - this.listBoxHelp.SeparationlineVisibleBottom = true; - this.listBoxHelp.SeparationlineVisibleTop = true; - this.listBoxHelp.Size = new System.Drawing.Size(230, 50); - this.listBoxHelp.TabIndex = 486; - this.listBoxHelp.Text = "smartListBox1"; - // // ControlCenterSystemCalibration // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); diff --git a/INT51DB/Controls/CenterSystem/ControlCenterSystemHelp.Designer.cs b/INT51DB/Controls/CenterSystem/ControlCenterSystemHelp.Designer.cs index 5a858a0..e06ee9d 100644 --- a/INT51DB/Controls/CenterSystem/ControlCenterSystemHelp.Designer.cs +++ b/INT51DB/Controls/CenterSystem/ControlCenterSystemHelp.Designer.cs @@ -77,7 +77,7 @@ this.buttonServo.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonServo.DownImage"))); this.buttonServo.GroupID = 0; this.buttonServo.InitVisible = true; - this.buttonServo.Location = new System.Drawing.Point(194, 240); + this.buttonServo.Location = new System.Drawing.Point(28, 240); this.buttonServo.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonServo.Name = "buttonServo"; this.buttonServo.NestedClickEventPrevent = false; @@ -140,7 +140,7 @@ this.buttonAutoZero.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonAutoZero.DownImage"))); this.buttonAutoZero.GroupID = 0; this.buttonAutoZero.InitVisible = true; - this.buttonAutoZero.Location = new System.Drawing.Point(526, 17); + this.buttonAutoZero.Location = new System.Drawing.Point(360, 17); this.buttonAutoZero.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonAutoZero.Name = "buttonAutoZero"; this.buttonAutoZero.NestedClickEventPrevent = false; @@ -171,7 +171,7 @@ this.buttonIOTest.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonIOTest.DownImage"))); this.buttonIOTest.GroupID = 0; this.buttonIOTest.InitVisible = true; - this.buttonIOTest.Location = new System.Drawing.Point(28, 240); + this.buttonIOTest.Location = new System.Drawing.Point(526, 17); this.buttonIOTest.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonIOTest.Name = "buttonIOTest"; this.buttonIOTest.NestedClickEventPrevent = false; @@ -202,7 +202,7 @@ this.buttonSorter.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonSorter.DownImage"))); this.buttonSorter.GroupID = 0; this.buttonSorter.InitVisible = true; - this.buttonSorter.Location = new System.Drawing.Point(360, 17); + this.buttonSorter.Location = new System.Drawing.Point(526, 240); this.buttonSorter.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonSorter.Name = "buttonSorter"; this.buttonSorter.NestedClickEventPrevent = false; @@ -219,6 +219,7 @@ this.buttonSorter.TextLocation = new System.Drawing.Point(0, 0); this.buttonSorter.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonSorter.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonSorter.UpImage"))); + this.buttonSorter.Visible = false; this.buttonSorter.Click += new System.EventHandler(this.buttonMenu_Click); // // buttonJudgmentSetting diff --git a/INT51DB/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.cs b/INT51DB/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.cs index 1f95494..ecef7e5 100644 --- a/INT51DB/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.cs +++ b/INT51DB/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.cs @@ -172,10 +172,18 @@ namespace INT51DB.Controls { this.smartDraw.PutDataAllClear(); this.labelProductNo.Enabled = false; + + this.buttonCopy.Enabled = false; + this.buttonPaste.Enabled = false; + this.buttonPasteAll.Enabled = false; } else { this.labelProductNo.Enabled = true; + + this.buttonCopy.Enabled = true; + this.buttonPaste.Enabled = true; + this.buttonPasteAll.Enabled = true; } } public void UpdateCurrentProductDisplay(DataStore.EquipmentStatus status, ProductItem pItem) diff --git a/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.Designer.cs b/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.Designer.cs index d7cbb3f..98a7782 100644 --- a/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.Designer.cs +++ b/INT51DB/Controls/CenterSystem/ControlCenterSystemServoMotor.Designer.cs @@ -118,13 +118,14 @@ this.smartLabel10.ForeColor = System.Drawing.Color.White; this.smartLabel10.InitVisible = true; this.smartLabel10.LineSpacing = 0F; - this.smartLabel10.Location = new System.Drawing.Point(106, 258); + this.smartLabel10.Location = new System.Drawing.Point(106, 381); this.smartLabel10.Name = "smartLabel10"; 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.Visible = false; this.smartLabel10.Wordwrap = false; // // labelSpeed1 @@ -137,13 +138,14 @@ this.labelSpeed1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelSpeed1.InitVisible = true; this.labelSpeed1.LineSpacing = 0F; - this.labelSpeed1.Location = new System.Drawing.Point(192, 258); + this.labelSpeed1.Location = new System.Drawing.Point(192, 381); 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.Visible = false; this.labelSpeed1.Wordwrap = false; this.labelSpeed1.Click += new System.EventHandler(this.labelMotorParameterSetup_Click); // @@ -357,7 +359,7 @@ this.smartLabel5.ForeColor = System.Drawing.Color.White; this.smartLabel5.InitVisible = true; this.smartLabel5.LineSpacing = 0F; - this.smartLabel5.Location = new System.Drawing.Point(106, 299); + this.smartLabel5.Location = new System.Drawing.Point(106, 258); this.smartLabel5.Name = "smartLabel5"; this.smartLabel5.Size = new System.Drawing.Size(80, 35); this.smartLabel5.TabIndex = 5; @@ -375,7 +377,7 @@ this.smartLabel6.ForeColor = System.Drawing.Color.White; this.smartLabel6.InitVisible = true; this.smartLabel6.LineSpacing = 0F; - this.smartLabel6.Location = new System.Drawing.Point(106, 340); + this.smartLabel6.Location = new System.Drawing.Point(106, 299); this.smartLabel6.Name = "smartLabel6"; this.smartLabel6.Size = new System.Drawing.Size(80, 35); this.smartLabel6.TabIndex = 6; @@ -425,7 +427,7 @@ this.smartLabel7.ForeColor = System.Drawing.Color.White; this.smartLabel7.InitVisible = true; this.smartLabel7.LineSpacing = 0F; - this.smartLabel7.Location = new System.Drawing.Point(106, 381); + this.smartLabel7.Location = new System.Drawing.Point(106, 340); this.smartLabel7.Name = "smartLabel7"; this.smartLabel7.Size = new System.Drawing.Size(80, 35); this.smartLabel7.TabIndex = 6; @@ -757,7 +759,7 @@ this.labelPosition0.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelPosition0.InitVisible = true; this.labelPosition0.LineSpacing = 0F; - this.labelPosition0.Location = new System.Drawing.Point(192, 299); + this.labelPosition0.Location = new System.Drawing.Point(192, 258); this.labelPosition0.Name = "labelPosition0"; this.labelPosition0.Size = new System.Drawing.Size(80, 35); this.labelPosition0.TabIndex = 20; @@ -777,7 +779,7 @@ this.labelPosition1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelPosition1.InitVisible = true; this.labelPosition1.LineSpacing = 0F; - this.labelPosition1.Location = new System.Drawing.Point(192, 340); + this.labelPosition1.Location = new System.Drawing.Point(192, 299); this.labelPosition1.Name = "labelPosition1"; this.labelPosition1.Size = new System.Drawing.Size(80, 35); this.labelPosition1.TabIndex = 22; @@ -797,7 +799,7 @@ this.labelPosition9.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelPosition9.InitVisible = true; this.labelPosition9.LineSpacing = 0F; - this.labelPosition9.Location = new System.Drawing.Point(192, 381); + this.labelPosition9.Location = new System.Drawing.Point(192, 340); this.labelPosition9.Name = "labelPosition9"; this.labelPosition9.Size = new System.Drawing.Size(80, 35); this.labelPosition9.TabIndex = 21; diff --git a/INT51DB/Forms/FormMainDisplay.cs b/INT51DB/Forms/FormMainDisplay.cs index 66ec540..b7a5190 100644 --- a/INT51DB/Forms/FormMainDisplay.cs +++ b/INT51DB/Forms/FormMainDisplay.cs @@ -587,7 +587,7 @@ namespace INT51DB.Forms private void buttonZero_Click(object sender, EventArgs e) { - this.ParentForm.TransferData(CommunicationCommand.Zero, CommunicationID.SubBoard1); + this.ParentForm.TransferData(CommunicationCommand.Zero, CommunicationID.MainBoard); } private void buttonWeightInputMode_Click(object sender, EventArgs e) { diff --git a/INT51DB/Version.txt b/INT51DB/Version.txt index 90bba0f..1016ba2 100644 --- a/INT51DB/Version.txt +++ b/INT51DB/Version.txt @@ -20,6 +20,10 @@ 3. ߷ Է 4. 5. ǰ + 6. ȵǴ + 7. ͼ ӵ1 visible=false + 8. Ÿ + - ⼳, ɼǼ ޴ visible=false @ Ver 1.0.0 - 2023.11.24 diff --git a/INT51DB/obj/Release/INT51DB.exe b/INT51DB/obj/Release/INT51DB.exe index c8f754c..19e02cc 100644 Binary files a/INT51DB/obj/Release/INT51DB.exe and b/INT51DB/obj/Release/INT51DB.exe differ