From 4490a78b6fd9c79ad5aa15d07a3011472459f27c Mon Sep 17 00:00:00 2001 From: CJY Date: Thu, 23 Oct 2025 18:21:25 +0900 Subject: [PATCH] =?UTF-8?q?Collection=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DC_7C/Controls/ControlCalibration10.cs | 58 +++--------------- INT69DC_7C/Controls/ControlCalibration12.cs | 66 +++------------------ INT69DC_7C/Controls/ControlCalibration7.cs | 46 +++----------- INT69DC_7C/Controls/ControlCalibration8.cs | 50 +++------------- INT69DC_7C/DataStore.cs | 2 +- INT69DC_7C/Forms/FormConfiguration.cs | 1 - INT69DC_7C/Forms/FormMainDisplay.cs | 4 -- 7 files changed, 29 insertions(+), 198 deletions(-) diff --git a/INT69DC_7C/Controls/ControlCalibration10.cs b/INT69DC_7C/Controls/ControlCalibration10.cs index 5b36f38..aa01028 100644 --- a/INT69DC_7C/Controls/ControlCalibration10.cs +++ b/INT69DC_7C/Controls/ControlCalibration10.cs @@ -59,58 +59,14 @@ namespace INT69DC_7C.Controls this.CollLabelConstant = new Collection(); this.CollCalStatus = new Collection(); - this.CollButtonLane.Clear(); - this.CollLabelWeight.Clear(); - this.CollLabelADC.Clear(); - this.CollLabelConstant.Clear(); - this.CollCalStatus.Clear(); - - this.CollButtonLane.Add(this.buttonLine1); - this.CollButtonLane.Add(this.buttonLine2); - this.CollButtonLane.Add(this.buttonLine3); - this.CollButtonLane.Add(this.buttonLine4); - this.CollButtonLane.Add(this.buttonLine5); - this.CollButtonLane.Add(this.buttonLine6); - this.CollButtonLane.Add(this.buttonLine7); - this.CollButtonLane.Add(this.buttonLine8); - this.CollButtonLane.Add(this.buttonLine9); - this.CollButtonLane.Add(this.buttonLine10); - - this.CollLabelWeight.Add(this.labelWeight1); - this.CollLabelWeight.Add(this.labelWeight2); - this.CollLabelWeight.Add(this.labelWeight3); - this.CollLabelWeight.Add(this.labelWeight4); - this.CollLabelWeight.Add(this.labelWeight5); - this.CollLabelWeight.Add(this.labelWeight6); - this.CollLabelWeight.Add(this.labelWeight7); - this.CollLabelWeight.Add(this.labelWeight8); - this.CollLabelWeight.Add(this.labelWeight9); - this.CollLabelWeight.Add(this.labelWeight10); - - this.CollLabelADC.Add(this.labelADC1); - this.CollLabelADC.Add(this.labelADC2); - this.CollLabelADC.Add(this.labelADC3); - this.CollLabelADC.Add(this.labelADC4); - this.CollLabelADC.Add(this.labelADC5); - this.CollLabelADC.Add(this.labelADC6); - this.CollLabelADC.Add(this.labelADC7); - this.CollLabelADC.Add(this.labelADC8); - this.CollLabelADC.Add(this.labelADC9); - this.CollLabelADC.Add(this.labelADC10); - - this.CollLabelConstant.Add(this.labelConstant1); - this.CollLabelConstant.Add(this.labelConstant2); - this.CollLabelConstant.Add(this.labelConstant3); - this.CollLabelConstant.Add(this.labelConstant4); - this.CollLabelConstant.Add(this.labelConstant5); - this.CollLabelConstant.Add(this.labelConstant6); - this.CollLabelConstant.Add(this.labelConstant7); - this.CollLabelConstant.Add(this.labelConstant8); - this.CollLabelConstant.Add(this.labelConstant9); - this.CollLabelConstant.Add(this.labelConstant10); - - for (int i = 0; i < 10; i++) + for (int i = 1; i <= this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++) + { + this.CollButtonLane.Add(FindByNameUtil.SmartButton("buttonLane" + i, this)); + this.CollLabelWeight.Add(FindByNameUtil.SmartLabel("labelWeight" + i, this)); + this.CollLabelADC.Add(FindByNameUtil.SmartLabel("labelADC" + i, this)); + this.CollLabelConstant.Add(FindByNameUtil.SmartLabel("labelConstant" + i, this)); this.CollCalStatus.Add(new CalibrationStatus()); + } } private void InitilizeControls() { diff --git a/INT69DC_7C/Controls/ControlCalibration12.cs b/INT69DC_7C/Controls/ControlCalibration12.cs index 2e85770..51ce302 100644 --- a/INT69DC_7C/Controls/ControlCalibration12.cs +++ b/INT69DC_7C/Controls/ControlCalibration12.cs @@ -59,66 +59,14 @@ namespace INT69DC_7C.Controls this.CollLabelConstant = new Collection(); this.CollCalStatus = new Collection(); - this.CollButtonLane.Clear(); - this.CollLabelWeight.Clear(); - this.CollLabelADC.Clear(); - this.CollLabelConstant.Clear(); - this.CollCalStatus.Clear(); - - this.CollButtonLane.Add(this.buttonLine1); - this.CollButtonLane.Add(this.buttonLine2); - this.CollButtonLane.Add(this.buttonLine3); - this.CollButtonLane.Add(this.buttonLine4); - this.CollButtonLane.Add(this.buttonLine5); - this.CollButtonLane.Add(this.buttonLine6); - this.CollButtonLane.Add(this.buttonLine7); - this.CollButtonLane.Add(this.buttonLine8); - this.CollButtonLane.Add(this.buttonLine9); - this.CollButtonLane.Add(this.buttonLine10); - this.CollButtonLane.Add(this.buttonLine11); - this.CollButtonLane.Add(this.buttonLine12); - - this.CollLabelWeight.Add(this.labelWeight1); - this.CollLabelWeight.Add(this.labelWeight2); - this.CollLabelWeight.Add(this.labelWeight3); - this.CollLabelWeight.Add(this.labelWeight4); - this.CollLabelWeight.Add(this.labelWeight5); - this.CollLabelWeight.Add(this.labelWeight6); - this.CollLabelWeight.Add(this.labelWeight7); - this.CollLabelWeight.Add(this.labelWeight8); - this.CollLabelWeight.Add(this.labelWeight9); - this.CollLabelWeight.Add(this.labelWeight10); - this.CollLabelWeight.Add(this.labelWeight11); - this.CollLabelWeight.Add(this.labelWeight12); - - this.CollLabelADC.Add(this.labelADC1); - this.CollLabelADC.Add(this.labelADC2); - this.CollLabelADC.Add(this.labelADC3); - this.CollLabelADC.Add(this.labelADC4); - this.CollLabelADC.Add(this.labelADC5); - this.CollLabelADC.Add(this.labelADC6); - this.CollLabelADC.Add(this.labelADC7); - this.CollLabelADC.Add(this.labelADC8); - this.CollLabelADC.Add(this.labelADC9); - this.CollLabelADC.Add(this.labelADC10); - this.CollLabelADC.Add(this.labelADC11); - this.CollLabelADC.Add(this.labelADC12); - - this.CollLabelConstant.Add(this.labelConstant1); - this.CollLabelConstant.Add(this.labelConstant2); - this.CollLabelConstant.Add(this.labelConstant3); - this.CollLabelConstant.Add(this.labelConstant4); - this.CollLabelConstant.Add(this.labelConstant5); - this.CollLabelConstant.Add(this.labelConstant6); - this.CollLabelConstant.Add(this.labelConstant7); - this.CollLabelConstant.Add(this.labelConstant8); - this.CollLabelConstant.Add(this.labelConstant9); - this.CollLabelConstant.Add(this.labelConstant10); - this.CollLabelConstant.Add(this.labelConstant11); - this.CollLabelConstant.Add(this.labelConstant12); - - for (int i = 0; i < 12; i++) + for (int i = 1; i <= this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++) + { + this.CollButtonLane.Add(FindByNameUtil.SmartButton("buttonLane" + i, this)); + this.CollLabelWeight.Add(FindByNameUtil.SmartLabel("labelWeight" + i, this)); + this.CollLabelADC.Add(FindByNameUtil.SmartLabel("labelADC" + i, this)); + this.CollLabelConstant.Add(FindByNameUtil.SmartLabel("labelConstant" + i, this)); this.CollCalStatus.Add(new CalibrationStatus()); + } } private void InitilizeControls() { diff --git a/INT69DC_7C/Controls/ControlCalibration7.cs b/INT69DC_7C/Controls/ControlCalibration7.cs index 830f167..f25f5a4 100644 --- a/INT69DC_7C/Controls/ControlCalibration7.cs +++ b/INT69DC_7C/Controls/ControlCalibration7.cs @@ -59,46 +59,14 @@ namespace INT69DC_7C.Controls this.CollLabelConstant = new Collection(); this.CollCalStatus = new Collection(); - this.CollButtonLane.Clear(); - this.CollLabelWeight.Clear(); - this.CollLabelADC.Clear(); - this.CollLabelConstant.Clear(); - this.CollCalStatus.Clear(); - - this.CollButtonLane.Add(this.buttonLane1); - this.CollButtonLane.Add(this.buttonLane2); - this.CollButtonLane.Add(this.buttonLane3); - this.CollButtonLane.Add(this.buttonLane4); - this.CollButtonLane.Add(this.buttonLane5); - this.CollButtonLane.Add(this.buttonLane6); - this.CollButtonLane.Add(this.buttonLane7); - - this.CollLabelWeight.Add(this.labelWeight1); - this.CollLabelWeight.Add(this.labelWeight2); - this.CollLabelWeight.Add(this.labelWeight3); - this.CollLabelWeight.Add(this.labelWeight4); - this.CollLabelWeight.Add(this.labelWeight5); - this.CollLabelWeight.Add(this.labelWeight6); - this.CollLabelWeight.Add(this.labelWeight7); - - this.CollLabelADC.Add(this.labelADC1); - this.CollLabelADC.Add(this.labelADC2); - this.CollLabelADC.Add(this.labelADC3); - this.CollLabelADC.Add(this.labelADC4); - this.CollLabelADC.Add(this.labelADC5); - this.CollLabelADC.Add(this.labelADC6); - this.CollLabelADC.Add(this.labelADC7); - - this.CollLabelConstant.Add(this.labelConstant1); - this.CollLabelConstant.Add(this.labelConstant2); - this.CollLabelConstant.Add(this.labelConstant3); - this.CollLabelConstant.Add(this.labelConstant4); - this.CollLabelConstant.Add(this.labelConstant5); - this.CollLabelConstant.Add(this.labelConstant6); - this.CollLabelConstant.Add(this.labelConstant7); - - for (int i = 0; i < 7; i++) + for (int i = 1; i <= this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++) + { + this.CollButtonLane.Add(FindByNameUtil.SmartButton("buttonLane" + i, this)); + this.CollLabelWeight.Add(FindByNameUtil.SmartLabel("labelWeight" + i, this)); + this.CollLabelADC.Add(FindByNameUtil.SmartLabel("labelADC" + i, this)); + this.CollLabelConstant.Add(FindByNameUtil.SmartLabel("labelConstant" + i, this)); this.CollCalStatus.Add(new CalibrationStatus()); + } } private void InitilizeControls() { diff --git a/INT69DC_7C/Controls/ControlCalibration8.cs b/INT69DC_7C/Controls/ControlCalibration8.cs index 0face74..b007cf4 100644 --- a/INT69DC_7C/Controls/ControlCalibration8.cs +++ b/INT69DC_7C/Controls/ControlCalibration8.cs @@ -59,50 +59,14 @@ namespace INT69DC_7C.Controls this.CollLabelConstant = new Collection(); this.CollCalStatus = new Collection(); - this.CollButtonLane.Clear(); - this.CollLabelWeight.Clear(); - this.CollLabelADC.Clear(); - this.CollLabelConstant.Clear(); - this.CollCalStatus.Clear(); - - this.CollButtonLane.Add(this.buttonLine1); - this.CollButtonLane.Add(this.buttonLine2); - this.CollButtonLane.Add(this.buttonLine3); - this.CollButtonLane.Add(this.buttonLine4); - this.CollButtonLane.Add(this.buttonLine5); - this.CollButtonLane.Add(this.buttonLine6); - this.CollButtonLane.Add(this.buttonLine7); - this.CollButtonLane.Add(this.buttonLine8); - - this.CollLabelWeight.Add(this.labelWeight1); - this.CollLabelWeight.Add(this.labelWeight2); - this.CollLabelWeight.Add(this.labelWeight3); - this.CollLabelWeight.Add(this.labelWeight4); - this.CollLabelWeight.Add(this.labelWeight5); - this.CollLabelWeight.Add(this.labelWeight6); - this.CollLabelWeight.Add(this.labelWeight7); - this.CollLabelWeight.Add(this.labelWeight8); - - this.CollLabelADC.Add(this.labelADC1); - this.CollLabelADC.Add(this.labelADC2); - this.CollLabelADC.Add(this.labelADC3); - this.CollLabelADC.Add(this.labelADC4); - this.CollLabelADC.Add(this.labelADC5); - this.CollLabelADC.Add(this.labelADC6); - this.CollLabelADC.Add(this.labelADC7); - this.CollLabelADC.Add(this.labelADC8); - - this.CollLabelConstant.Add(this.labelConstant1); - this.CollLabelConstant.Add(this.labelConstant2); - this.CollLabelConstant.Add(this.labelConstant3); - this.CollLabelConstant.Add(this.labelConstant4); - this.CollLabelConstant.Add(this.labelConstant5); - this.CollLabelConstant.Add(this.labelConstant6); - this.CollLabelConstant.Add(this.labelConstant7); - this.CollLabelConstant.Add(this.labelConstant8); - - for (int i = 0; i < 8; i++) + for (int i = 1; i <= this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++) + { + this.CollButtonLane.Add(FindByNameUtil.SmartButton("buttonLane" + i, this)); + this.CollLabelWeight.Add(FindByNameUtil.SmartLabel("labelWeight" + i, this)); + this.CollLabelADC.Add(FindByNameUtil.SmartLabel("labelADC" + i, this)); + this.CollLabelConstant.Add(FindByNameUtil.SmartLabel("labelConstant" + i, this)); this.CollCalStatus.Add(new CalibrationStatus()); + } } private void InitilizeControls() { diff --git a/INT69DC_7C/DataStore.cs b/INT69DC_7C/DataStore.cs index 6467283..27d9ac9 100644 --- a/INT69DC_7C/DataStore.cs +++ b/INT69DC_7C/DataStore.cs @@ -1320,7 +1320,7 @@ namespace INT69DC_7C this.DataStoragePeriod = 36; this.Unit = "g"; - this.SerialNumber = "23D0000"; + this.SerialNumber = "25I0000"; this.EthernetServerAddress = "0.0.0.0"; this.User_Level1_Name = "Level 1"; this.User_Level2_Name = "Level 2"; diff --git a/INT69DC_7C/Forms/FormConfiguration.cs b/INT69DC_7C/Forms/FormConfiguration.cs index 531d910..5139d45 100644 --- a/INT69DC_7C/Forms/FormConfiguration.cs +++ b/INT69DC_7C/Forms/FormConfiguration.cs @@ -609,7 +609,6 @@ namespace INT69DC_7C.Forms // Part 11 if (this.ParentForm.SystemConfig.IsOptPart11 == true) - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.AutoZeroVariance, "", before, after); } private void comboBoxZeroParameterMode_SelectedIndexChanged(object sender, EventArgs e) diff --git a/INT69DC_7C/Forms/FormMainDisplay.cs b/INT69DC_7C/Forms/FormMainDisplay.cs index e25b69a..97ffc67 100644 --- a/INT69DC_7C/Forms/FormMainDisplay.cs +++ b/INT69DC_7C/Forms/FormMainDisplay.cs @@ -4071,10 +4071,6 @@ namespace INT69DC_7C.Forms this.Part11AutomaticLogoutReset(); this.ParentForm.TransferData(CommunicationCommand.CutInput, CommunicationID.MainBoard); - - // Part11 - if (this.ParentForm.SystemConfig.IsOptPart11 == true) - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MainCut, ""); } private void buttonPrint_Click(object sender, EventArgs e) {