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

Part11 추가 중

Ver_522
DESKTOP-999R8N3\CJY 2023-08-14 17:45:01 +09:00
parent 4a4272e2b2
commit ba87e9b677
15 changed files with 571 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
INT69DB_2A.suo
View File

Binary file not shown.

23
INT69DB_2A/DataStore.cs
View File

@ -406,6 +406,8 @@ namespace INT69DB_2A
Clear,
UserEditor,
MainCut,
DataBackup,
GroupEditor,
Bypass,
Update,
@ -420,6 +422,10 @@ namespace INT69DB_2A
ProductPaste,
ProductAllPaste,
Initialization,
MotorInitDown,
MotorChangeID,
MotorChangeValueEach,
MotorChangeValueAll,
}
public enum TrackingParameter
{
@ -436,15 +442,18 @@ namespace INT69DB_2A
JudgmentFilter,
JudgmentDelayTime,
JudgmentDamperDelayTime,
JudgmentDoubleDelayTime,
JudgmentCount,
JudgmentCVSpeed,
JudgmentDynamic,
ForcedZeroDelayTime,
SorterDelayTime,
SorterRunTime,
DischargeCVDelay,
DischargeCVRun,
FeedingCVDelay,
FeedingCVRun,
RejectCVDelayTime,
RejectCVRunTime,
FeedingCVDelayTime,
FeedingCVRunTime,
Com3Baudrate,
Com3Mode,
@ -475,6 +484,10 @@ namespace INT69DB_2A
EtcDecimalpoint,
EtcBypass,
MotorDirection,
MotorAnglePass,
MotorAngleNG,
MotorOriginOffset,
MotorOriginSpeed,
MotorSpeed,

1
INT69DB_2A/Forms/FormDataBackup_Part11.cs
View File

@ -276,6 +276,7 @@ namespace INT69DB_2A.Forms
// 복사 완료 메시지
DialogFormMessage msg = new DialogFormMessage(count.ToString(), this.ParentForm.SystemConfig.Language);
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.DataBackup, type.ToString());
this.SplashFinish();
msg.ShowDialog();
#endregion

2
INT69DB_2A/Forms/FormFactoryReset.cs
View File

@ -350,8 +350,6 @@ namespace INT69DB_2A.Forms
this.ResetCountFile();
this.progressBarResetBar.Value = 100;
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Initialization, "");
this.labelResetWait.Visible = false;
this.labelResetRestart.Visible = true;
}

8
INT69DB_2A/Forms/FormMainDisplay.cs
View File

@ -2683,7 +2683,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1);
if (before != after)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.DischargeCVDelay, "", before, after);
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RejectCVDelayTime, "", before, after);
}
}
}
@ -2719,7 +2719,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1);
if (before != after)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.DischargeCVRun, "", before, after);
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RejectCVRunTime, "", before, after);
}
}
}
@ -2755,7 +2755,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1);
if (before != after)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVDelay, "", before, after);
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVDelayTime, "", before, after);
}
}
}
@ -2791,7 +2791,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1);
if (before != after)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVRun, "", before, after);
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVRunTime, "", before, after);
}
}
}

10
INT69DB_2A/Forms/FormMenu.cs
View File

@ -542,6 +542,10 @@ namespace INT69DB_2A.Forms
DialogResult dr = myDlg.ShowDialog();
if (dr == DialogResult.Yes)
{
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Initialization, "");
((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormFactory);
this.ParentForm.ChildFormFactoryInitialize.timer1.Enabled = true;
}
@ -553,7 +557,13 @@ namespace INT69DB_2A.Forms
DialogFormYesNo myDlg = new DialogFormYesNo(this.ParentForm.SystemConfig.Language, 3);
DialogResult dr = myDlg.ShowDialog();
if (dr == DialogResult.Yes)
{
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Update, "");
this.ParentForm.ChildFormProgramUpdate.DisplayRefresh();
}
#endregion
}
else if (button == this.buttonEquipment)

22
INT69DB_2A/Forms/FormMotorSetting.Designer.cs generated
View File

@ -1354,7 +1354,7 @@
this.groupBoxDirection.Location = new System.Drawing.Point(5, 302);
this.groupBoxDirection.Name = "groupBoxDirection";
this.groupBoxDirection.RoundRadius = 10;
this.groupBoxDirection.Size = new System.Drawing.Size(620, 92);
this.groupBoxDirection.Size = new System.Drawing.Size(782, 92);
this.groupBoxDirection.TabIndex = 248;
this.groupBoxDirection.Text = "열별 회전 방향(기본:정방향, Click:역방향)";
this.groupBoxDirection.TextColor = System.Drawing.Color.Black;
@ -1372,7 +1372,7 @@
this.buttonDirectionLine10.Font = new System.Drawing.Font("Arial", 36F, System.Drawing.FontStyle.Bold);
this.buttonDirectionLine10.GroupID = 0;
this.buttonDirectionLine10.InitVisible = true;
this.buttonDirectionLine10.Location = new System.Drawing.Point(536, 23);
this.buttonDirectionLine10.Location = new System.Drawing.Point(633, 24);
this.buttonDirectionLine10.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonDirectionLine10.Name = "buttonDirectionLine10";
this.buttonDirectionLine10.NestedClickEventPrevent = false;
@ -1405,7 +1405,7 @@
this.buttonDirectionLine9.Font = new System.Drawing.Font("Arial", 36F, System.Drawing.FontStyle.Bold);
this.buttonDirectionLine9.GroupID = 0;
this.buttonDirectionLine9.InitVisible = true;
this.buttonDirectionLine9.Location = new System.Drawing.Point(480, 23);
this.buttonDirectionLine9.Location = new System.Drawing.Point(577, 24);
this.buttonDirectionLine9.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonDirectionLine9.Name = "buttonDirectionLine9";
this.buttonDirectionLine9.NestedClickEventPrevent = false;
@ -1438,7 +1438,7 @@
this.buttonDirectionLine8.Font = new System.Drawing.Font("Arial", 36F, System.Drawing.FontStyle.Bold);
this.buttonDirectionLine8.GroupID = 0;
this.buttonDirectionLine8.InitVisible = true;
this.buttonDirectionLine8.Location = new System.Drawing.Point(424, 23);
this.buttonDirectionLine8.Location = new System.Drawing.Point(521, 24);
this.buttonDirectionLine8.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonDirectionLine8.Name = "buttonDirectionLine8";
this.buttonDirectionLine8.NestedClickEventPrevent = false;
@ -1471,7 +1471,7 @@
this.buttonDirectionLine7.Font = new System.Drawing.Font("Arial", 36F, System.Drawing.FontStyle.Bold);
this.buttonDirectionLine7.GroupID = 0;
this.buttonDirectionLine7.InitVisible = true;
this.buttonDirectionLine7.Location = new System.Drawing.Point(368, 23);
this.buttonDirectionLine7.Location = new System.Drawing.Point(465, 24);
this.buttonDirectionLine7.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonDirectionLine7.Name = "buttonDirectionLine7";
this.buttonDirectionLine7.NestedClickEventPrevent = false;
@ -1503,7 +1503,7 @@
this.buttonDirectionLine1.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonDirectionLine1.DownImage")));
this.buttonDirectionLine1.GroupID = 0;
this.buttonDirectionLine1.InitVisible = true;
this.buttonDirectionLine1.Location = new System.Drawing.Point(32, 23);
this.buttonDirectionLine1.Location = new System.Drawing.Point(129, 24);
this.buttonDirectionLine1.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonDirectionLine1.Name = "buttonDirectionLine1";
this.buttonDirectionLine1.NestedClickEventPrevent = false;
@ -1535,7 +1535,7 @@
this.buttonDirectionLine2.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonDirectionLine2.DownImage")));
this.buttonDirectionLine2.GroupID = 0;
this.buttonDirectionLine2.InitVisible = true;
this.buttonDirectionLine2.Location = new System.Drawing.Point(88, 23);
this.buttonDirectionLine2.Location = new System.Drawing.Point(185, 24);
this.buttonDirectionLine2.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonDirectionLine2.Name = "buttonDirectionLine2";
this.buttonDirectionLine2.NestedClickEventPrevent = false;
@ -1567,7 +1567,7 @@
this.buttonDirectionLine3.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonDirectionLine3.DownImage")));
this.buttonDirectionLine3.GroupID = 0;
this.buttonDirectionLine3.InitVisible = true;
this.buttonDirectionLine3.Location = new System.Drawing.Point(144, 23);
this.buttonDirectionLine3.Location = new System.Drawing.Point(241, 24);
this.buttonDirectionLine3.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonDirectionLine3.Name = "buttonDirectionLine3";
this.buttonDirectionLine3.NestedClickEventPrevent = false;
@ -1599,7 +1599,7 @@
this.buttonDirectionLine4.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonDirectionLine4.DownImage")));
this.buttonDirectionLine4.GroupID = 0;
this.buttonDirectionLine4.InitVisible = true;
this.buttonDirectionLine4.Location = new System.Drawing.Point(200, 23);
this.buttonDirectionLine4.Location = new System.Drawing.Point(297, 24);
this.buttonDirectionLine4.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonDirectionLine4.Name = "buttonDirectionLine4";
this.buttonDirectionLine4.NestedClickEventPrevent = false;
@ -1631,7 +1631,7 @@
this.buttonDirectionLine5.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonDirectionLine5.DownImage")));
this.buttonDirectionLine5.GroupID = 0;
this.buttonDirectionLine5.InitVisible = true;
this.buttonDirectionLine5.Location = new System.Drawing.Point(256, 23);
this.buttonDirectionLine5.Location = new System.Drawing.Point(353, 24);
this.buttonDirectionLine5.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonDirectionLine5.Name = "buttonDirectionLine5";
this.buttonDirectionLine5.NestedClickEventPrevent = false;
@ -1663,7 +1663,7 @@
this.buttonDirectionLine6.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonDirectionLine6.DownImage")));
this.buttonDirectionLine6.GroupID = 0;
this.buttonDirectionLine6.InitVisible = true;
this.buttonDirectionLine6.Location = new System.Drawing.Point(312, 23);
this.buttonDirectionLine6.Location = new System.Drawing.Point(409, 24);
this.buttonDirectionLine6.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonDirectionLine6.Name = "buttonDirectionLine6";
this.buttonDirectionLine6.NestedClickEventPrevent = false;

346
INT69DB_2A/Forms/FormMotorSetting.cs
View File

@ -47,6 +47,10 @@ namespace INT69DB_2A.Forms
private int m_Value5Max;
private int m_Value6Max;
private string BeforeDirection;
private string AfterDirection;
private Collection<SmartButton> CollectionDirection;
private Collection<SmartButton> CollectionButtonLine;
#endregion
@ -390,6 +394,19 @@ namespace INT69DB_2A.Forms
this.CollectionButtonLine.Add(this.buttonLine8);
this.CollectionButtonLine.Add(this.buttonLine9);
this.CollectionButtonLine.Add(this.buttonLine10);
this.CollectionDirection = new Collection<SmartButton>();
this.CollectionDirection.Clear();
this.CollectionDirection.Add(this.buttonDirectionLine1);
this.CollectionDirection.Add(this.buttonDirectionLine2);
this.CollectionDirection.Add(this.buttonDirectionLine3);
this.CollectionDirection.Add(this.buttonDirectionLine4);
this.CollectionDirection.Add(this.buttonDirectionLine5);
this.CollectionDirection.Add(this.buttonDirectionLine6);
this.CollectionDirection.Add(this.buttonDirectionLine7);
this.CollectionDirection.Add(this.buttonDirectionLine8);
this.CollectionDirection.Add(this.buttonDirectionLine9);
this.CollectionDirection.Add(this.buttonDirectionLine10);
}
private void ButtonEnable(bool enable)
{
@ -752,6 +769,53 @@ namespace INT69DB_2A.Forms
}
}
private string ReturnAngle(int num)
{
string tempString = "";
switch (num)
{
case 1:
tempString = "60";
break;
case 2:
tempString = "90";
break;
case 3:
tempString = "120";
break;
case 4:
tempString = "180";
break;
case 5:
tempString = "50";
break;
case 6:
tempString = "60";
break;
case 7:
tempString = "70";
break;
case 8:
tempString = "80";
break;
case 9:
tempString = "100";
break;
case 10:
tempString = "110";
break;
case 11:
tempString = "120";
break;
case 12:
tempString = "130";
break;
default:
break;
}
return tempString;
}
public void Visible2StepRotate(bool bValue)
{
this.labelTitleStep1.Visible = bValue;
@ -765,40 +829,21 @@ namespace INT69DB_2A.Forms
}
public void UpdateMotorDirectionDisplay(DataStore.EquipmentStatus status, Collection<string> values)
{
this.buttonDirectionLine1.Click -= new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine2.Click -= new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine3.Click -= new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine4.Click -= new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine5.Click -= new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine6.Click -= new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine7.Click -= new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine8.Click -= new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine9.Click -= new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine10.Click -= new EventHandler(this.buttonDirection_Click);
for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++)
{
this.CollectionDirection[i].Click -= new EventHandler(this.buttonDirection_Click);
if (values[0] == "0") this.buttonDirectionLine1.ButtonUp(); else this.buttonDirectionLine1.ButtonDown();
if (values[1] == "0") this.buttonDirectionLine2.ButtonUp(); else this.buttonDirectionLine2.ButtonDown();
if (values[2] == "0") this.buttonDirectionLine3.ButtonUp(); else this.buttonDirectionLine3.ButtonDown();
if (values[3] == "0") this.buttonDirectionLine4.ButtonUp(); else this.buttonDirectionLine4.ButtonDown();
if (values[4] == "0") this.buttonDirectionLine5.ButtonUp(); else this.buttonDirectionLine5.ButtonDown();
if (values[5] == "0") this.buttonDirectionLine6.ButtonUp(); else this.buttonDirectionLine6.ButtonDown();
if (values[6] == "0") this.buttonDirectionLine7.ButtonUp(); else this.buttonDirectionLine7.ButtonDown();
if (values[7] == "0") this.buttonDirectionLine8.ButtonUp(); else this.buttonDirectionLine8.ButtonDown();
if (values[8] == "0") this.buttonDirectionLine9.ButtonUp(); else this.buttonDirectionLine9.ButtonDown();
if (values[9] == "0") this.buttonDirectionLine10.ButtonUp(); else this.buttonDirectionLine10.ButtonDown();
if (values[i] == "0") this.CollectionDirection[i].ButtonUp(); else this.CollectionDirection[i].ButtonDown();
if (i == 0)
this.BeforeDirection = values[i];
else
this.BeforeDirection += values[i];
this.CollectionDirection[i].Click += new EventHandler(this.buttonDirection_Click);
}
this.buttonSave.Visible = false;
this.buttonDirectionLine1.Click += new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine2.Click += new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine3.Click += new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine4.Click += new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine5.Click += new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine6.Click += new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine7.Click += new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine8.Click += new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine9.Click += new EventHandler(this.buttonDirection_Click);
this.buttonDirectionLine10.Click += new EventHandler(this.buttonDirection_Click);
}
public byte[] SendCommand(Byte Address, Byte Command, Byte Type, Byte Motor, int iValue)
@ -1774,9 +1819,23 @@ namespace INT69DB_2A.Forms
this.TransferDirectSTXETX0x0A(this.ArrayDeviceName[i] + value);
Thread.Sleep(100);
}
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MotorChangeValueAll, "MDrive" + "/" +
this.CurrentImpellerMotorItem.Rc + "," + this.CurrentImpellerMotorItem.Hc + "," + this.CurrentImpellerMotorItem.Ms + ","
+ this.CurrentImpellerMotorItem.Vi + "," + this.CurrentImpellerMotorItem.Vm + "," + this.CurrentImpellerMotorItem.A);
}
else
{
this.TransferDirectSTXETX0x0A(this.DeviceName + value);
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MotorChangeValueEach, "MDrive" + "/" + this.DeviceName + "/" +
this.CurrentImpellerMotorItem.Rc + "," + this.CurrentImpellerMotorItem.Hc + "," + this.CurrentImpellerMotorItem.Ms + ","
+ this.CurrentImpellerMotorItem.Vi + "," + this.CurrentImpellerMotorItem.Vm + "," + this.CurrentImpellerMotorItem.A);
}
}
#endregion
break;
@ -1829,9 +1888,25 @@ namespace INT69DB_2A.Forms
if (value != "")
{
if (this.IsAllDownload == true)
{
this.TransferDirectETX0x0D(value);
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MotorChangeValueAll, "Moons" + "/" +
this.CurrentImpellerMotorItem.CC + "," + this.CurrentImpellerMotorItem.PI + "," + this.CurrentImpellerMotorItem.EG + ","
+ this.CurrentImpellerMotorItem.VE + "," + this.CurrentImpellerMotorItem.AC + "," + this.CurrentImpellerMotorItem.DE);
}
else
{
this.TransferDirectETX0x0D(this.SelectImpellerTag + value);
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MotorChangeValueEach, "Moons" + "/" + this.SelectImpellerTag + "/" +
this.CurrentImpellerMotorItem.CC + "," + this.CurrentImpellerMotorItem.PI + "," + this.CurrentImpellerMotorItem.EG + ","
+ this.CurrentImpellerMotorItem.VE + "," + this.CurrentImpellerMotorItem.AC + "," + this.CurrentImpellerMotorItem.DE);
}
}
#endregion
break;
@ -1844,7 +1919,187 @@ namespace INT69DB_2A.Forms
}
private void timerInitialDownload_Tick(object sender, EventArgs e)
{
string value = "";
string str = "";
this.timerInitialDownload.Enabled = false;
this.Time += 1;
this.progressBarDownload.Value += 5;
switch ((int)this.ParentForm.SystemConfig.StepMotorType)
{
case (int)DataStore.StepMotorType.MDrive:
#region MDrive
switch (this.Time)
{
case 1:
this.SerialPort1OpenForMotor(115200);
value = "*FD";
this.TransferDirectSTXETX0x0ACOM1(value);
break;
case 2:
this.SerialPort1OpenForMotor(9600);
value = "ex 1";
this.TransferDirectETX0x0DCOM1(value);
break;
case 3:
value = "PG 1";
this.TransferDirectETX0x0DCOM1(value);
break;
case 4:
value = "LB SU";
this.TransferDirectETX0x0DCOM1(value);
break;
case 5:
this.CurrentImpellerMotorItem.Rc = this.label1.Text.Trim();
value = "Rc=" + this.label1.Text.Trim();
this.TransferDirectETX0x0DCOM1(value);
break;
case 6:
this.CurrentImpellerMotorItem.Hc = this.label2.Text.Trim();
value = "Hc=" + this.label2.Text.Trim();
this.TransferDirectETX0x0DCOM1(value);
break;
case 7:
this.CurrentImpellerMotorItem.Ms = this.label3.Text.Trim();
value = "Ms=" + this.label3.Text.Trim();
this.TransferDirectETX0x0DCOM1(value);
break;
case 8:
this.CurrentImpellerMotorItem.Vi = this.label4.Text.Trim();
value = "Vi=" + this.label4.Text.Trim();
this.TransferDirectETX0x0DCOM1(value);
break;
case 9:
this.CurrentImpellerMotorItem.Vm = this.label5.Text.Trim();
value = "Vm=" + this.label5.Text.Trim();
this.TransferDirectETX0x0DCOM1(value);
break;
case 10:
this.CurrentImpellerMotorItem.A = this.label6.Text.Trim();
value = "A=" + this.label6.Text.Trim();
this.TransferDirectETX0x0DCOM1(value);
break;
case 11:
value = "EM=2";
this.TransferDirectETX0x0DCOM1(value);
break;
case 12:
value = "D=A";
this.TransferDirectETX0x0DCOM1(value);
break;
case 13:
value = "E";
this.TransferDirectETX0x0DCOM1(value);
break;
case 14:
value = "PG";
this.TransferDirectETX0x0DCOM1(value);
break;
case 15:
value = this.DNValueForComm;
this.TransferDirectETX0x0DCOM1(value);
break;
case 16:
value = "PY=1";
this.TransferDirectETX0x0DCOM1(value);
break;
case 17:
value = this.DeviceName + "BD=11";
this.TransferDirectSTXETX0x0ACOM1(value);
break;
case 18:
value = this.DeviceName + "S";
this.TransferDirectSTXETX0x0ACOM1(value);
break;
case 19:
value = this.DeviceName + "ex 1";
this.TransferDirectSTXETX0x0ACOM1(value);
this.progressBarDownload.Value = 100;
this.SaveImpellerFile(this.CurrentImpellerMotorItem);
this.Time = 0;
this.serialPort1.Close();
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MotorInitDown, "MDrive");
this.ButtonEnable(true);
break;
default:
break;
}
#endregion
break;
case (int)DataStore.StepMotorType.Moons:
#region Moons
switch (this.Time)
{
case 1:
this.SerialPort1OpenForMotor(9600);
value = "DA" + this.SelectImpellerTag;
break;
case 2:
value = "EG36000";
break;
case 3:
this.CurrentImpellerMotorItem.CC = (double.Parse(this.label1.Text) / 100).ToString();
value = "CC" + this.CurrentImpellerMotorItem.CC;
break;
case 4:
this.CurrentImpellerMotorItem.PI = (double.Parse(this.label2.Text) / 100).ToString();
value = "PI" + this.CurrentImpellerMotorItem.PI;
break;
case 5:
this.CurrentImpellerMotorItem.VE = this.label4.Text.Trim();
value = "VE" + this.label4.Text.Trim();
break;
case 6:
this.CurrentImpellerMotorItem.AC = this.label5.Text.Trim();
value = "AC" + this.label5.Text;
break;
case 7:
this.CurrentImpellerMotorItem.DE = this.label6.Text.Trim();
value = "DE" + this.label6.Text;
break;
case 8:
value = "PR3";
break;
case 9:
value = "BR5";
break;
case 10:
this.SerialPort1OpenForMotor(115200);
value = "SA";
break;
case 11:
this.progressBarDownload.Value = 100;
this.SaveImpellerFile(this.CurrentImpellerMotorItem);
this.Time = 0;
this.serialPort1.Close();
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MotorInitDown, "Moons");
this.ButtonEnable(true);
break;
default:
break;
}
#endregion
this.TransferDirectETX0x0DCOM1(value);
break;
default:
break;
}
if (this.Time != 0)
this.timerInitialDownload.Enabled = true;
}
private void timerChangeDeviceNo_Tick(object sender, EventArgs e)
{
@ -1870,6 +2125,10 @@ namespace INT69DB_2A.Forms
this.Time = 0;
this.serialPort1.Close();
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MotorChangeID, "Moons" + "/" + this.SelectImpellerTag);
this.ButtonEnable(true);
break;
default:
@ -2000,12 +2259,12 @@ namespace INT69DB_2A.Forms
}
private void buttonSave_Click(object sender, EventArgs e)
{
string beforeAnglePass = "", afterAnglePass = "";
string beforeAngleNG = "", afterAngleNG = "";
string value = "";
string[] tempArray = new string[12];
string[] array = new string[3];
if (this.buttonDirectionLine1.ButtonStatus == SmartButton.BUTSTATUS.UP) tempArray[11] = "0"; else tempArray[11] = "1";
if (this.buttonDirectionLine2.ButtonStatus == SmartButton.BUTSTATUS.UP) tempArray[10] = "0"; else tempArray[10] = "1";
if (this.buttonDirectionLine3.ButtonStatus == SmartButton.BUTSTATUS.UP) tempArray[9] = "0"; else tempArray[9] = "1";
@ -2019,6 +2278,14 @@ namespace INT69DB_2A.Forms
tempArray[1] = "0";
tempArray[0] = "0";
for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++)
{
if (i == 0)
this.AfterDirection = tempArray[11 - i];
else
this.AfterDirection += tempArray[11 - i];
}
for (int i = 0; i < 3; i++)
{
int a = 0;
@ -2030,6 +2297,9 @@ namespace INT69DB_2A.Forms
value = "0" + array[0] + array[1] + array[2];
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._1104_ImpellerMotorIndividualDirection, value);
beforeAnglePass = this.ReturnAngle(this.ParentForm.SystemConfig.ImpellerMotorAnglePass);
beforeAngleNG = this.ReturnAngle(this.ParentForm.SystemConfig.ImpellerMotorAngleNG);
if (this.radioButtonImpellerMotorAngle60.Checked == true)
{
this.ParentForm.SystemConfig.ImpellerMotorAnglePass = 1;
@ -2058,6 +2328,9 @@ namespace INT69DB_2A.Forms
this.ParentForm.SystemConfig.ImpellerMotorAngleNG = this.comboBoxTwoStepNGAngle.SelectedIndex + 5;
}
afterAnglePass = this.ReturnAngle(this.ParentForm.SystemConfig.ImpellerMotorAnglePass);
afterAngleNG = this.ReturnAngle(this.ParentForm.SystemConfig.ImpellerMotorAngleNG);
// SystemConfig 파일 저장
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
@ -2067,6 +2340,13 @@ namespace INT69DB_2A.Forms
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._1105_ImpellerMotorAngleNG, value);
this.buttonSave.Visible = false;
if (this.BeforeDirection != this.AfterDirection)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.MotorDirection, "", this.BeforeDirection, this.AfterDirection);
if (beforeAnglePass != afterAnglePass)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.MotorAnglePass, "", beforeAnglePass, afterAnglePass);
if (beforeAngleNG != afterAngleNG)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.MotorAngleNG, "", beforeAngleNG, afterAngleNG);
}
#endregion
}

1
INT69DB_2A/Forms/FormProgramUpdate.cs
View File

@ -147,7 +147,6 @@ namespace INT69DB_2A.Forms
this.TreatmentCopyNewFile(newFiles);
this.progressBarUpdateBar.Value += 100;
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Update, "");
}
private void TreatmentRemoveOldFile()
{

1
INT69DB_2A/Forms/FormSystemSetting.Designer.cs generated
View File

@ -1519,6 +1519,7 @@
this.smartKeyboard.TopMargin = 5;
this.smartKeyboard.Visible = false;
this.smartKeyboard.OnXKeyClick += new System.EventHandler(this.smartKeyboard_OnXKeyClick);
this.smartKeyboard.OnHanYoungKeyChange += new System.EventHandler(this.smartKeyboard_OnHanYoungKeyChange);
//
// labelTitle
//

233
INT69DB_2A/Forms/FormSystemSetting.cs
View File

@ -19,7 +19,11 @@ namespace INT69DB_2A.Forms
#region Field
private FormMain m_ParentForm;
private bool IsHanyoung;
private int SelectedProductNo;
private string BeforeName;
private string BeforeLot;
private ProductItem SelectedProductItem;
private JudgmentSetItem SelectedJudgmentSetItem;
private JudgmentSetItem CaptureJudgmentSetItem;
@ -163,6 +167,10 @@ namespace INT69DB_2A.Forms
}
private void DefaultSetting()
{
this.IsHanyoung = false;
this.BeforeName = "";
this.BeforeLot = "";
this.CollectionButtonLine = new Collection<SmartButton>();
this.CollectionButtonLine.Clear();
@ -701,6 +709,10 @@ namespace INT69DB_2A.Forms
}
private void buttonItemNo_Click(object sender, EventArgs e)
{
string before = "", after = "";
before = this.labelItemNo.Text;
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonItemNo.Text, 4, 0, false, this.ParentForm.SystemConfig.Language);
myKeyPad.Location = new Point(280, 90);
@ -714,7 +726,7 @@ namespace INT69DB_2A.Forms
}
else
{
this.buttonItemNo.Text = this.labelItemNo.Text = myKeyPad.StringValue;
after = this.buttonItemNo.Text = this.labelItemNo.Text = myKeyPad.StringValue;
this.SelectedProductNo = myKeyPad.IntValue;
this.listBoxProductList.SelectedIndexChanged -= new EventHandler(this.listBoxProductList_SelectedIndexChanged);
@ -727,6 +739,10 @@ namespace INT69DB_2A.Forms
this.buttonItemNo.Text = "**";
this.ParentForm.TransferProductParameter(this.SelectedProductNo);
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ProductNumber, "", before, after);
}
}
}
@ -758,11 +774,15 @@ namespace INT69DB_2A.Forms
#region 품목설정
private void listBoxProductList_SelectedIndexChanged(object sender, EventArgs e)
{
string before = "", after = "";
if (this.listBoxProductList.SelectedItem == null)
return;
before = this.SelectedProductNo.ToString();
this.SelectedProductNo = this.listBoxProductList.SelectedIndex + 1;
this.labelItemNo.Text = this.SelectedProductNo.ToString();
after = this.labelItemNo.Text = this.SelectedProductNo.ToString();
this.ParentForm.LoadProductFile(ref this.SelectedProductItem, this.listBoxProductList.SelectedIndex);
@ -770,10 +790,16 @@ namespace INT69DB_2A.Forms
this.buttonItemNo.Text = "**";
this.ParentForm.TransferProductParameter(this.SelectedProductNo);
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ProductNumber, "", before, after);
}
private void textBoxProductName_KeyPress(object sender, KeyPressEventArgs e)
{
string after = "", number = "";
if (e.KeyChar == '\r')
{
this.SelectedProductItem.Name = this.textBoxProductName.Text;
@ -791,6 +817,21 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1);
this.textBoxLotNo.Enabled = true;
if (this.IsHanyoung == true)
{
this.smartKeyboard.HanYoungKeyToggle();
this.IsHanyoung = false;
}
// Part11
if (this.ParentForm.SystemConfig.IsPart11 == true)
{
after = this.textBoxProductName.Text;
number = this.SelectedProductItem.Number.ToString();
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ChangeName, number, this.BeforeName, after);
}
}
else if (e.KeyChar == 27)
{
@ -807,9 +848,10 @@ namespace INT69DB_2A.Forms
e.Handled = true;
}
}
private void textBoxLotNo_KeyPress(object sender, KeyPressEventArgs e)
{
string after = "", number = "";
if (e.KeyChar == '\r')
{
this.SelectedProductItem.LotNo = this.textBoxLotNo.Text;
@ -820,6 +862,21 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1);
this.textBoxProductName.Enabled = true;
if (this.IsHanyoung == true)
{
this.smartKeyboard.HanYoungKeyToggle();
this.IsHanyoung = false;
}
// Part11
if (this.ParentForm.SystemConfig.IsPart11 == true)
{
after = this.textBoxLotNo.Text;
number = this.SelectedProductItem.Number.ToString();
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ChangeLOT, number, this.BeforeLot, after);
}
}
else if (e.KeyChar == 27)
{
@ -850,8 +907,9 @@ namespace INT69DB_2A.Forms
this.textBoxProductName.Select(this.textBoxProductName.Text.Length, 0);
this.textBoxLotNo.Enabled = false;
}
this.BeforeName = this.textBoxProductName.Text;
}
private void buttonLotEdit_Click(object sender, EventArgs e)
{
this.smartKeyboard.KeyboardType = SmartX.SmartKeyboard.KEYBOARDTYPES.NORMAL;
@ -865,19 +923,33 @@ namespace INT69DB_2A.Forms
this.textBoxLotNo.Select(this.textBoxLotNo.Text.Length, 0);
this.textBoxProductName.Enabled = false;
this.BeforeLot = this.textBoxLotNo.Text;
}
private void smartKeyboard_OnHanYoungKeyChange(object sender, EventArgs e)
{
if (this.IsHanyoung == false)
this.IsHanyoung = true;
else
this.IsHanyoung = false;
}
private void smartKeyboard_OnXKeyClick(object sender, EventArgs e)
{
this.smartKeyboard.Hide();
this.ParentForm.LoadProductFile(ref this.SelectedProductItem, this.listBoxProductList.SelectedIndex);
this.DisplayControls(this.SelectedProductItem);
this.buttonNameEdit.Enabled = true;
this.buttonLotEdit.Enabled = true;
this.textBoxProductName.Enabled = true;
this.textBoxLotNo.Enabled = true;
}
private void buttonUnder_Click(object sender, EventArgs e)
{
string before = "", after = "";
before = this.buttonUnder.Text;
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonUnder.Text, 5, this.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.SystemConfig.Language);
myKeyPad.Location = new Point(100, 90);
@ -891,15 +963,21 @@ namespace INT69DB_2A.Forms
}
else
{
this.buttonUnder.Text = myKeyPad.StringValue;
after = this.buttonUnder.Text = myKeyPad.StringValue;
this.SelectedProductItem.UnderRange = myKeyPad.StringValue.Replace(".", "");
this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1);
if (before != after)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightUnderRange, "", before, after);
}
}
}
private void buttonPass_Click(object sender, EventArgs e)
{
string before = "", after = "";
before = this.buttonPass.Text;
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonPass.Text, 5, this.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.SystemConfig.Language);
myKeyPad.Location = new Point(100, 90);
@ -914,15 +992,21 @@ namespace INT69DB_2A.Forms
}
else
{
this.buttonPass.Text = myKeyPad.StringValue;
after = this.buttonPass.Text = myKeyPad.StringValue;
this.SelectedProductItem.PassRange = myKeyPad.StringValue.Replace(".", "");
this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1);
if (before != after)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightPassRange, "", before, after);
}
}
}
private void buttonOver_Click(object sender, EventArgs e)
{
string before = "", after = "";
before = this.buttonOver.Text;
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonOver.Text, 5, this.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.SystemConfig.Language);
myKeyPad.Location = new Point(100, 90);
@ -936,15 +1020,21 @@ namespace INT69DB_2A.Forms
}
else
{
this.buttonOver.Text = myKeyPad.StringValue;
after = this.buttonOver.Text = myKeyPad.StringValue;
this.SelectedProductItem.OverRange = myKeyPad.StringValue.Replace(".", "");
this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1);
if (before != after)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightOverRange, "", before, after);
}
}
}
private void buttonTare_Click(object sender, EventArgs e)
{
string before = "", after = "";
before = this.buttonTare.Text;
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonTare.Text, 5, this.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.SystemConfig.Language);
myKeyPad.Location = new Point(100, 90);
@ -958,10 +1048,13 @@ namespace INT69DB_2A.Forms
}
else
{
this.buttonTare.Text = myKeyPad.StringValue;
after = this.buttonTare.Text = myKeyPad.StringValue;
this.SelectedProductItem.TareRange = myKeyPad.StringValue.Replace(".", "");
this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1);
if (before != after)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightTareRange, "", before, after);
}
}
}
@ -970,7 +1063,10 @@ namespace INT69DB_2A.Forms
#region 판정설정
private void labelFilter_Click(object sender, EventArgs e)
{
string value = "";
string value = "", before = "", after = "", number = "";
before = this.labelFilter.Text;
number = this.SelectedProductNo.ToString();
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelFilter.Text, 2, 0, false, this.ParentForm.SystemConfig.Language);
myKeyPad.Location = new Point(300, 90);
@ -985,19 +1081,26 @@ namespace INT69DB_2A.Forms
}
else
{
this.labelFilter.Text = myKeyPad.StringValue;
after = this.labelFilter.Text = myKeyPad.StringValue;
this.SelectedJudgmentSetItem.Filter = myKeyPad.IntValue;
value = Helper.StringZeroFillDigits4(this.labelFilter.Text);
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5001_Filter, value);
this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1);
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentFilter, number, before, after);
}
}
}
private void labelJudgmentDelayTime_Click(object sender, EventArgs e)
{
string value = "";
string value = "", before = "", after = "", number = "";
before = this.labelJudgmentDelayTime.Text;
number = this.SelectedProductNo.ToString();
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelJudgmentDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language);
myKeyPad.Location = new Point(300, 90);
@ -1012,20 +1115,26 @@ namespace INT69DB_2A.Forms
}
else
{
this.labelJudgmentDelayTime.Text = myKeyPad.StringValue;
after = this.labelJudgmentDelayTime.Text = myKeyPad.StringValue;
this.SelectedJudgmentSetItem.JudgmentDelayTime = myKeyPad.IntValue;
value = Helper.StringZeroFillDigits4(this.labelJudgmentDelayTime.Text);
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5002_JudgmentDelayTime, value);
this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1);
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentDelayTime, number, before, after);
}
}
}
private void labelDoubleDelayTime_Click(object sender, EventArgs e)
{
string value = "";
string value = "", before = "", after = "", number = "";
before = this.labelDoubleDelayTime.Text;
number = this.SelectedProductNo.ToString();
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelDoubleDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language);
myKeyPad.Location = new Point(300, 90);
@ -1040,19 +1149,26 @@ namespace INT69DB_2A.Forms
}
else
{
this.labelDoubleDelayTime.Text = myKeyPad.StringValue;
after = this.labelDoubleDelayTime.Text = myKeyPad.StringValue;
this.SelectedJudgmentSetItem.DoubleDelayTime = myKeyPad.IntValue;
value = Helper.StringZeroFillDigits4(this.labelDoubleDelayTime.Text);
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5003_DoubleDelayTime, value);
this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1);
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentDoubleDelayTime, number, before, after);
}
}
}
private void labelJudgmentCount_Click(object sender, EventArgs e)
{
string value = "";
string value = "", before = "", after = "", number = "";
before = this.labelJudgmentCount.Text;
number = this.SelectedProductNo.ToString();
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelJudgmentCount.Text, 4, 0, false, this.ParentForm.SystemConfig.Language);
myKeyPad.Location = new Point(300, 90);
@ -1067,7 +1183,7 @@ namespace INT69DB_2A.Forms
}
else
{
this.labelJudgmentCount.Text = myKeyPad.StringValue;
after = this.labelJudgmentCount.Text = myKeyPad.StringValue;
this.SelectedJudgmentSetItem.JudgmentCount = myKeyPad.IntValue;
this.GraphBackRedraw();
@ -1076,12 +1192,19 @@ namespace INT69DB_2A.Forms
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5004_JudgmentCount, value);
this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1);
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentCount, number, before, after);
}
}
}
private void labelDynamicCorrection_Click(object sender, EventArgs e)
{
string value = "";
string value = "", before = "", after = "", number = "";
before = this.labelDynamicCorrection.Text;
number = this.SelectedProductNo.ToString();
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelDynamicCorrection.Text, 7, 6, false, this.ParentForm.SystemConfig.Language);
myKeyPad.Location = new Point(300, 90);
@ -1096,7 +1219,7 @@ namespace INT69DB_2A.Forms
}
else
{
this.labelDynamicCorrection.Text = myKeyPad.StringValue;
after = this.labelDynamicCorrection.Text = myKeyPad.StringValue;
this.SelectedJudgmentSetItem.DynamicCorrection = myKeyPad.doubleValue;
value = string.Format("{0:f6}", this.labelDynamicCorrection.Text);
@ -1105,12 +1228,20 @@ namespace INT69DB_2A.Forms
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5006_DynamicCorrection, value);
this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1);
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentDynamic, number, before, after);
}
}
}
private void labelForcedZeroDelayTime_Click(object sender, EventArgs e)
{
string value = "";
string value = "", before = "", after = "", number = "";
before = this.labelForcedZeroDelayTime.Text;
number = this.SelectedProductNo.ToString();
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelForcedZeroDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language);
myKeyPad.Location = new Point(300, 90);
@ -1124,13 +1255,17 @@ namespace INT69DB_2A.Forms
}
else
{
this.labelForcedZeroDelayTime.Text = myKeyPad.StringValue;
after = this.labelForcedZeroDelayTime.Text = myKeyPad.StringValue;
this.SelectedJudgmentSetItem.ForcedZeroDelayTime = myKeyPad.IntValue;
value = Helper.StringZeroFillDigits4(this.labelForcedZeroDelayTime.Text);
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._4501_ForcedZeroDelayTime, value);
this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1);
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ForcedZeroDelayTime, number, before, after);
}
}
}
@ -1143,7 +1278,10 @@ namespace INT69DB_2A.Forms
private void labelRejectConveyorDelayTime_Click(object sender, EventArgs e)
{
string value = "";
string value = "", before = "", after = "", number = "";
before = this.labelRejectConveyorDelayTime.Text;
number = this.SelectedProductNo.ToString();
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelRejectConveyorDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language);
myKeyPad.Location = new Point(300, 90);
@ -1158,19 +1296,26 @@ namespace INT69DB_2A.Forms
}
else
{
this.labelRejectConveyorDelayTime.Text = myKeyPad.StringValue;
after = this.labelRejectConveyorDelayTime.Text = myKeyPad.StringValue;
this.SelectedJudgmentSetItem.RejectConveyorDelayTime = myKeyPad.IntValue;
value = Helper.StringZeroFillDigits4(this.labelRejectConveyorDelayTime.Text);
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5009_DischargeConveyorDelayTime, value);
this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1);
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RejectCVDelayTime, number, before, after);
}
}
}
private void labelRejectConveyorRunTime_Click(object sender, EventArgs e)
{
string value = "";
string value = "", before = "", after = "", number = "";
before = this.labelRejectConveyorRunTime.Text;
number = this.SelectedProductNo.ToString();
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelRejectConveyorRunTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language);
myKeyPad.Location = new Point(300, 90);
@ -1185,19 +1330,26 @@ namespace INT69DB_2A.Forms
}
else
{
this.labelRejectConveyorRunTime.Text = myKeyPad.StringValue;
after = this.labelRejectConveyorRunTime.Text = myKeyPad.StringValue;
this.SelectedJudgmentSetItem.RejectConveyorRunTime = myKeyPad.IntValue;
value = Helper.StringZeroFillDigits4(this.labelRejectConveyorRunTime.Text);
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5010_DischargeConveyorRunTime, value);
this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1);
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RejectCVRunTime, number, before, after);
}
}
}
private void labelFeedingConveyorDelayTime_Click(object sender, EventArgs e)
{
string value = "";
string value = "", before = "", after = "", number = "";
before = this.labelFeedingConveyorDelayTime.Text;
number = this.SelectedProductNo.ToString();
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelFeedingConveyorDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language);
myKeyPad.Location = new Point(300, 90);
@ -1212,19 +1364,26 @@ namespace INT69DB_2A.Forms
}
else
{
this.labelFeedingConveyorDelayTime.Text = myKeyPad.StringValue;
after = this.labelFeedingConveyorDelayTime.Text = myKeyPad.StringValue;
this.SelectedJudgmentSetItem.FeedingConveyorDelayTime = myKeyPad.IntValue;
value = Helper.StringZeroFillDigits4(this.labelFeedingConveyorDelayTime.Text);
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5007_FeedingConveyorDelayTime, value);
this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1);
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVDelayTime, number, before, after);
}
}
}
private void labelFeedingConveyorRunTime_Click(object sender, EventArgs e)
{
string value = "";
string value = "", before = "", after = "", number = "";
before = this.labelFeedingConveyorRunTime.Text;
number = this.SelectedProductNo.ToString();
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelFeedingConveyorRunTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language);
myKeyPad.Location = new Point(300, 90);
@ -1239,13 +1398,17 @@ namespace INT69DB_2A.Forms
}
else
{
this.labelFeedingConveyorRunTime.Text = myKeyPad.StringValue;
after = this.labelFeedingConveyorRunTime.Text = myKeyPad.StringValue;
this.SelectedJudgmentSetItem.FeedingConveyorRunTime = myKeyPad.IntValue;
value = Helper.StringZeroFillDigits4(this.labelFeedingConveyorRunTime.Text);
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5008_FeedingConveyorRunTime, value);
this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1);
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVRunTime, number, before, after);
}
}
}
@ -1299,6 +1462,10 @@ namespace INT69DB_2A.Forms
this.CaptureJudgmentSetItem.Sorter4Mode = this.SelectedJudgmentSetItem.Sorter4Mode;
this.CaptureJudgmentSetItem.Sorter4DelayTime = this.SelectedJudgmentSetItem.Sorter4DelayTime;
this.CaptureJudgmentSetItem.Sorter4RunTime = this.SelectedJudgmentSetItem.Sorter4RunTime;
// Part11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.ProductCopy, this.buttonCopy.Text);
}
private void buttonPaste_Click(object sender, EventArgs e)
{
@ -1335,6 +1502,10 @@ namespace INT69DB_2A.Forms
this.buttonItemNo.Text = "**";
this.ParentForm.TransferProductParameter(this.SelectedProductNo);
// Part11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.ProductPaste, this.SelectedProductNo.ToString());
}
private void buttonPasteAll_Click(object sender, EventArgs e)
{
@ -1438,6 +1609,10 @@ namespace INT69DB_2A.Forms
this.buttonPasteAll.Enabled = true;
splash.Finish();
// Part11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.ProductAllPaste, "");
}
#endregion

2
INT69DB_2A/Forms/FormUserEditor.Designer.cs generated
View File

@ -245,7 +245,7 @@
this.labelAccessRightAdmin.LineSpacing = 0F;
this.labelAccessRightAdmin.Location = new System.Drawing.Point(209, 67);
this.labelAccessRightAdmin.Name = "labelAccessRightAdmin";
this.labelAccessRightAdmin.Size = new System.Drawing.Size(277, 26);
this.labelAccessRightAdmin.Size = new System.Drawing.Size(270, 26);
this.labelAccessRightAdmin.TabIndex = 238;
this.labelAccessRightAdmin.Text = "Administrator";
this.labelAccessRightAdmin.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;

6
INT69DB_2A/Forms/FormUserGroupEditor.cs
View File

@ -335,6 +335,8 @@ namespace INT69DB_2A.Forms
}
private void buttonSave_Click(object sender, EventArgs e)
{
string detail;
#region Level1
this.ParentForm.CurrentUserGroup.Level1.IsMainDisplayProductNo = this.checkBoxL1MainProductNo.Checked;
this.ParentForm.CurrentUserGroup.Level1.IsMainDisplayWeightSetting = this.checkBoxL1MainWeightSet.Checked;
@ -432,6 +434,10 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveUserGroupFile(this.ParentForm.CurrentUserGroup);
// Part 11
detail = "Change access right";
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.GroupEditor, detail);
this.buttonSave.Visible = false;
}

1
INT69DB_2A/Part11_UserManager/UserItem.cs
View File

@ -253,7 +253,6 @@ namespace INT69DB_2A.Part11_UserManager
private bool m_IsMenuUser;
private bool m_IsMenuUserGroupEditor;
private bool m_IsMenuViewer;
#endregion
#region Constructor

BIN
INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/Refactor/INT69DB_2A_ImageDll.dll
View File

Binary file not shown.