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

Compare commits

base: chojy:c83c0bfa59631db1652256f120b9646928635226
Branches Tags
chojy:master
chojy:V12.3.1
chojy:V12.2.2
chojy:V12.3.0
chojy:V12.2.1
chojy:V12.2.0
chojy:V12.1.0
chojy:V12.0.0
chojy:V11.4.5
chojy:V11.4.4
chojy:V11.4.3
chojy:V11.4.1
chojy:V11.4.0
chojy:V11.2.1
chojy:V11.1.0
chojy:V11.0.4
chojy:V11.0.3
chojy:V11.0.2
chojy:V11.0.1
..
compare: chojy:d4b927138c4f21486cd4286de805c526717e977f
Branches Tags
chojy:master
chojy:V12.3.1
chojy:V12.2.2
chojy:V12.3.0
chojy:V12.2.1
chojy:V12.2.0
chojy:V12.1.0
chojy:V12.0.0
chojy:V11.4.5
chojy:V11.4.4
chojy:V11.4.3
chojy:V11.4.1
chojy:V11.4.0
chojy:V11.2.1
chojy:V11.1.0
chojy:V11.0.4
chojy:V11.0.3
chojy:V11.0.2
chojy:V11.0.1

No commits in common. "c83c0bfa59631db1652256f120b9646928635226" and "d4b927138c4f21486cd4286de805c526717e977f" have entirely different histories.
c83c0bfa59 ... d4b927138c

7 changed files with 6 additions and 41 deletions
Show Stats Expand all files Collapse all files

10
INT69DC_7C/Controls/ControlCalibration10.cs
View File

@ -59,14 +59,6 @@ namespace INT69DC_7C.Controls
this.CollLabelConstant = new Collection<SmartLabel>();
this.CollCalStatus = new Collection<CalibrationStatus>();
<<<<<<< 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();
@ -118,9 +110,7 @@ namespace INT69DC_7C.Controls
this.CollLabelConstant.Add(this.labelConstant10);
for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++)
>>>>>>> d4b927138c4f21486cd4286de805c526717e977f
this.CollCalStatus.Add(new CalibrationStatus());
}
}
private void InitilizeControls()
{

10
INT69DC_7C/Controls/ControlCalibration12.cs
View File

@ -59,14 +59,6 @@ namespace INT69DC_7C.Controls
this.CollLabelConstant = new Collection<SmartLabel>();
this.CollCalStatus = new Collection<CalibrationStatus>();
<<<<<<< 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();
@ -126,9 +118,7 @@ namespace INT69DC_7C.Controls
this.CollLabelConstant.Add(this.labelConstant12);
for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++)
>>>>>>> d4b927138c4f21486cd4286de805c526717e977f
this.CollCalStatus.Add(new CalibrationStatus());
}
}
private void InitilizeControls()
{

10
INT69DC_7C/Controls/ControlCalibration7.cs
View File

@ -59,14 +59,6 @@ namespace INT69DC_7C.Controls
this.CollLabelConstant = new Collection<SmartLabel>();
this.CollCalStatus = new Collection<CalibrationStatus>();
<<<<<<< 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();
@ -106,9 +98,7 @@ namespace INT69DC_7C.Controls
this.CollLabelConstant.Add(this.labelConstant7);
for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++)
>>>>>>> d4b927138c4f21486cd4286de805c526717e977f
this.CollCalStatus.Add(new CalibrationStatus());
}
}
private void InitilizeControls()
{

10
INT69DC_7C/Controls/ControlCalibration8.cs
View File

@ -59,14 +59,6 @@ namespace INT69DC_7C.Controls
this.CollLabelConstant = new Collection<SmartLabel>();
this.CollCalStatus = new Collection<CalibrationStatus>();
<<<<<<< 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();
@ -110,9 +102,7 @@ namespace INT69DC_7C.Controls
this.CollLabelConstant.Add(this.labelConstant8);
for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++)
>>>>>>> d4b927138c4f21486cd4286de805c526717e977f
this.CollCalStatus.Add(new CalibrationStatus());
}
}
private void InitilizeControls()
{

2
INT69DC_7C/DataStore.cs
View File

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

1
INT69DC_7C/Forms/FormConfiguration.cs
View File

@ -609,6 +609,7 @@ 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)

4
INT69DC_7C/Forms/FormMainDisplay.cs
View File

@ -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)
{