chojy
/
INT69DC_7C
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Collection 정리

master
CJY 2025-10-23 18:21:25 +09:00
parent 1031ba1a35
commit 4490a78b6f
7 changed files with 29 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
INT69DC_7C/Controls/ControlCalibration10.cs
View File

@ -59,58 +59,14 @@ namespace INT69DC_7C.Controls
this.CollLabelConstant = new Collection<SmartLabel>(); this.CollLabelConstant = new Collection<SmartLabel>();
this.CollCalStatus = new Collection<CalibrationStatus>(); this.CollCalStatus = new Collection<CalibrationStatus>();
this.CollButtonLane.Clear(); for (int i = 1; i <= this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++)
this.CollLabelWeight.Clear(); {
this.CollLabelADC.Clear(); this.CollButtonLane.Add(FindByNameUtil.SmartButton("buttonLane" + i, this));
this.CollLabelConstant.Clear(); this.CollLabelWeight.Add(FindByNameUtil.SmartLabel("labelWeight" + i, this));
this.CollCalStatus.Clear(); this.CollLabelADC.Add(FindByNameUtil.SmartLabel("labelADC" + i, this));
this.CollLabelConstant.Add(FindByNameUtil.SmartLabel("labelConstant" + i, this));
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++)
this.CollCalStatus.Add(new CalibrationStatus()); this.CollCalStatus.Add(new CalibrationStatus());
}
} }
private void InitilizeControls() private void InitilizeControls()
{ {

66
INT69DC_7C/Controls/ControlCalibration12.cs
View File

@ -59,66 +59,14 @@ namespace INT69DC_7C.Controls
this.CollLabelConstant = new Collection<SmartLabel>(); this.CollLabelConstant = new Collection<SmartLabel>();
this.CollCalStatus = new Collection<CalibrationStatus>(); this.CollCalStatus = new Collection<CalibrationStatus>();
this.CollButtonLane.Clear(); for (int i = 1; i <= this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++)
this.CollLabelWeight.Clear(); {
this.CollLabelADC.Clear(); this.CollButtonLane.Add(FindByNameUtil.SmartButton("buttonLane" + i, this));
this.CollLabelConstant.Clear(); this.CollLabelWeight.Add(FindByNameUtil.SmartLabel("labelWeight" + i, this));
this.CollCalStatus.Clear(); this.CollLabelADC.Add(FindByNameUtil.SmartLabel("labelADC" + i, this));
this.CollLabelConstant.Add(FindByNameUtil.SmartLabel("labelConstant" + i, this));
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++)
this.CollCalStatus.Add(new CalibrationStatus()); this.CollCalStatus.Add(new CalibrationStatus());
}
} }
private void InitilizeControls() private void InitilizeControls()
{ {

46
INT69DC_7C/Controls/ControlCalibration7.cs
View File

@ -59,46 +59,14 @@ namespace INT69DC_7C.Controls
this.CollLabelConstant = new Collection<SmartLabel>(); this.CollLabelConstant = new Collection<SmartLabel>();
this.CollCalStatus = new Collection<CalibrationStatus>(); this.CollCalStatus = new Collection<CalibrationStatus>();
this.CollButtonLane.Clear(); for (int i = 1; i <= this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++)
this.CollLabelWeight.Clear(); {
this.CollLabelADC.Clear(); this.CollButtonLane.Add(FindByNameUtil.SmartButton("buttonLane" + i, this));
this.CollLabelConstant.Clear(); this.CollLabelWeight.Add(FindByNameUtil.SmartLabel("labelWeight" + i, this));
this.CollCalStatus.Clear(); this.CollLabelADC.Add(FindByNameUtil.SmartLabel("labelADC" + i, this));
this.CollLabelConstant.Add(FindByNameUtil.SmartLabel("labelConstant" + i, this));
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++)
this.CollCalStatus.Add(new CalibrationStatus()); this.CollCalStatus.Add(new CalibrationStatus());
}
} }
private void InitilizeControls() private void InitilizeControls()
{ {

50
INT69DC_7C/Controls/ControlCalibration8.cs
View File

@ -59,50 +59,14 @@ namespace INT69DC_7C.Controls
this.CollLabelConstant = new Collection<SmartLabel>(); this.CollLabelConstant = new Collection<SmartLabel>();
this.CollCalStatus = new Collection<CalibrationStatus>(); this.CollCalStatus = new Collection<CalibrationStatus>();
this.CollButtonLane.Clear(); for (int i = 1; i <= this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++)
this.CollLabelWeight.Clear(); {
this.CollLabelADC.Clear(); this.CollButtonLane.Add(FindByNameUtil.SmartButton("buttonLane" + i, this));
this.CollLabelConstant.Clear(); this.CollLabelWeight.Add(FindByNameUtil.SmartLabel("labelWeight" + i, this));
this.CollCalStatus.Clear(); this.CollLabelADC.Add(FindByNameUtil.SmartLabel("labelADC" + i, this));
this.CollLabelConstant.Add(FindByNameUtil.SmartLabel("labelConstant" + i, this));
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++)
this.CollCalStatus.Add(new CalibrationStatus()); this.CollCalStatus.Add(new CalibrationStatus());
}
} }
private void InitilizeControls() private void InitilizeControls()
{ {

2
INT69DC_7C/DataStore.cs
View File

@ -1320,7 +1320,7 @@ namespace INT69DC_7C
this.DataStoragePeriod = 36; this.DataStoragePeriod = 36;
this.Unit = "g"; this.Unit = "g";
this.SerialNumber = "23D0000"; this.SerialNumber = "25I0000";
this.EthernetServerAddress = "0.0.0.0"; this.EthernetServerAddress = "0.0.0.0";
this.User_Level1_Name = "Level 1"; this.User_Level1_Name = "Level 1";
this.User_Level2_Name = "Level 2"; this.User_Level2_Name = "Level 2";

1
INT69DC_7C/Forms/FormConfiguration.cs
View File

@ -609,7 +609,6 @@ namespace INT69DC_7C.Forms
// Part 11 // Part 11
if (this.ParentForm.SystemConfig.IsOptPart11 == true) if (this.ParentForm.SystemConfig.IsOptPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.AutoZeroVariance, "", before, after); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.AutoZeroVariance, "", before, after);
} }
private void comboBoxZeroParameterMode_SelectedIndexChanged(object sender, EventArgs e) private void comboBoxZeroParameterMode_SelectedIndexChanged(object sender, EventArgs e)

4
INT69DC_7C/Forms/FormMainDisplay.cs
View File

@ -4071,10 +4071,6 @@ namespace INT69DC_7C.Forms
this.Part11AutomaticLogoutReset(); this.Part11AutomaticLogoutReset();
this.ParentForm.TransferData(CommunicationCommand.CutInput, CommunicationID.MainBoard); 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) private void buttonPrint_Click(object sender, EventArgs e)
{ {