diff --git a/INT69DC_7C/Controls/ControlCalibration10.cs b/INT69DC_7C/Controls/ControlCalibration10.cs index b109598..436cbaf 100644 --- a/INT69DC_7C/Controls/ControlCalibration10.cs +++ b/INT69DC_7C/Controls/ControlCalibration10.cs @@ -59,66 +59,19 @@ namespace INT69DC_7C.Controls this.CollLabelConstant = new Collection(); this.CollCalStatus = new Collection(); -<<<<<<< HEAD - 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.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); + 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.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 < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++) ->>>>>>> d4b927138c4f21486cd4286de805c526717e977f this.CollCalStatus.Add(new CalibrationStatus()); } } diff --git a/INT69DC_7C/Controls/ControlCalibration11.cs b/INT69DC_7C/Controls/ControlCalibration11.cs index b4ebbce..1ad55a3 100644 --- a/INT69DC_7C/Controls/ControlCalibration11.cs +++ b/INT69DC_7C/Controls/ControlCalibration11.cs @@ -65,56 +65,14 @@ namespace INT69DC_7C.Controls 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.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.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.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); - - for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; 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 32c3dc2..7017b0d 100644 --- a/INT69DC_7C/Controls/ControlCalibration12.cs +++ b/INT69DC_7C/Controls/ControlCalibration12.cs @@ -59,74 +59,19 @@ namespace INT69DC_7C.Controls this.CollLabelConstant = new Collection(); this.CollCalStatus = new Collection(); -<<<<<<< HEAD - 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.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); + 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.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 < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++) ->>>>>>> d4b927138c4f21486cd4286de805c526717e977f this.CollCalStatus.Add(new CalibrationStatus()); } } diff --git a/INT69DC_7C/Controls/ControlCalibration7.cs b/INT69DC_7C/Controls/ControlCalibration7.cs index c4720d2..5f5daac 100644 --- a/INT69DC_7C/Controls/ControlCalibration7.cs +++ b/INT69DC_7C/Controls/ControlCalibration7.cs @@ -59,54 +59,19 @@ namespace INT69DC_7C.Controls this.CollLabelConstant = new Collection(); this.CollCalStatus = new Collection(); -<<<<<<< HEAD - 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.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); + 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.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 < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++) ->>>>>>> d4b927138c4f21486cd4286de805c526717e977f this.CollCalStatus.Add(new CalibrationStatus()); } } diff --git a/INT69DC_7C/Controls/ControlCalibration8.cs b/INT69DC_7C/Controls/ControlCalibration8.cs index f642a62..6fe9246 100644 --- a/INT69DC_7C/Controls/ControlCalibration8.cs +++ b/INT69DC_7C/Controls/ControlCalibration8.cs @@ -59,58 +59,19 @@ namespace INT69DC_7C.Controls this.CollLabelConstant = new Collection(); this.CollCalStatus = new Collection(); -<<<<<<< HEAD - 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.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); + 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.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 < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++) ->>>>>>> d4b927138c4f21486cd4286de805c526717e977f this.CollCalStatus.Add(new CalibrationStatus()); } } diff --git a/INT69DC_7C/Forms/FormMainDisplay.cs b/INT69DC_7C/Forms/FormMainDisplay.cs index 69655af..89548cd 100644 --- a/INT69DC_7C/Forms/FormMainDisplay.cs +++ b/INT69DC_7C/Forms/FormMainDisplay.cs @@ -4303,6 +4303,10 @@ 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) {