numkeypad
parent
e8bb0498b7
commit
d2150c34bd
|
@ -634,8 +634,8 @@ namespace INT63DC_6CH
|
|||
public static readonly string _1025_WeightLimitIgnoreCount = "1025";
|
||||
// 바이패스
|
||||
public static readonly string _1201_Bypass = "1201";
|
||||
// 보드 버전 모두 읽기
|
||||
public static readonly string _1500_ProgramVersion = "1500";
|
||||
// 메인보드 버전 읽기
|
||||
public static readonly string _1502_ProgramVersion = "1502";
|
||||
|
||||
// 품목설정 - 품번
|
||||
public static readonly string _2001_ProductNumber = "2001";
|
||||
|
|
|
@ -129,7 +129,7 @@
|
|||
this.labelTitle.BackPictureBox2 = null;
|
||||
this.labelTitle.BorderColor = System.Drawing.Color.Black;
|
||||
this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.labelTitle.Font = new System.Drawing.Font("새굴림", 35F, System.Drawing.FontStyle.Bold);
|
||||
this.labelTitle.Font = new System.Drawing.Font("New Gulim", 35F, System.Drawing.FontStyle.Bold);
|
||||
this.labelTitle.InitVisible = true;
|
||||
this.labelTitle.LineSpacing = 0F;
|
||||
this.labelTitle.Location = new System.Drawing.Point(199, 7);
|
||||
|
@ -148,7 +148,7 @@
|
|||
this.labelStaticSaveFile.BackPictureBox2 = null;
|
||||
this.labelStaticSaveFile.BorderColor = System.Drawing.Color.Black;
|
||||
this.labelStaticSaveFile.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.labelStaticSaveFile.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold);
|
||||
this.labelStaticSaveFile.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold);
|
||||
this.labelStaticSaveFile.InitVisible = true;
|
||||
this.labelStaticSaveFile.LineSpacing = 0F;
|
||||
this.labelStaticSaveFile.Location = new System.Drawing.Point(151, 306);
|
||||
|
@ -167,7 +167,7 @@
|
|||
this.labelStaticBackupEnable.BackPictureBox2 = null;
|
||||
this.labelStaticBackupEnable.BorderColor = System.Drawing.Color.Black;
|
||||
this.labelStaticBackupEnable.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.labelStaticBackupEnable.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold);
|
||||
this.labelStaticBackupEnable.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold);
|
||||
this.labelStaticBackupEnable.InitVisible = true;
|
||||
this.labelStaticBackupEnable.LineSpacing = 0F;
|
||||
this.labelStaticBackupEnable.Location = new System.Drawing.Point(151, 213);
|
||||
|
@ -246,7 +246,7 @@
|
|||
this.labelStaticWarning1.BackPictureBox2 = null;
|
||||
this.labelStaticWarning1.BorderColor = System.Drawing.Color.Black;
|
||||
this.labelStaticWarning1.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.labelStaticWarning1.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold);
|
||||
this.labelStaticWarning1.Font = new System.Drawing.Font("New Gulim", 18F, System.Drawing.FontStyle.Bold);
|
||||
this.labelStaticWarning1.ForeColor = System.Drawing.Color.Red;
|
||||
this.labelStaticWarning1.InitVisible = true;
|
||||
this.labelStaticWarning1.LineSpacing = 0F;
|
||||
|
@ -266,7 +266,7 @@
|
|||
this.labelStaticWarning2.BackPictureBox2 = null;
|
||||
this.labelStaticWarning2.BorderColor = System.Drawing.Color.Black;
|
||||
this.labelStaticWarning2.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.labelStaticWarning2.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold);
|
||||
this.labelStaticWarning2.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold);
|
||||
this.labelStaticWarning2.InitVisible = true;
|
||||
this.labelStaticWarning2.LineSpacing = 0F;
|
||||
this.labelStaticWarning2.Location = new System.Drawing.Point(151, 465);
|
||||
|
@ -281,7 +281,7 @@
|
|||
// radioButtonDisable
|
||||
//
|
||||
this.radioButtonDisable.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(208)))), ((int)(((byte)(208)))));
|
||||
this.radioButtonDisable.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold);
|
||||
this.radioButtonDisable.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold);
|
||||
this.radioButtonDisable.Location = new System.Drawing.Point(715, 213);
|
||||
this.radioButtonDisable.Name = "radioButtonDisable";
|
||||
this.radioButtonDisable.Size = new System.Drawing.Size(150, 50);
|
||||
|
@ -292,7 +292,7 @@
|
|||
// radioButtonEnable
|
||||
//
|
||||
this.radioButtonEnable.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(208)))), ((int)(((byte)(208)))));
|
||||
this.radioButtonEnable.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold);
|
||||
this.radioButtonEnable.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold);
|
||||
this.radioButtonEnable.Location = new System.Drawing.Point(510, 213);
|
||||
this.radioButtonEnable.Name = "radioButtonEnable";
|
||||
this.radioButtonEnable.Size = new System.Drawing.Size(150, 50);
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -76,7 +76,7 @@
|
|||
this.labelTitle.BackPictureBox2 = null;
|
||||
this.labelTitle.BorderColor = System.Drawing.Color.Black;
|
||||
this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.labelTitle.Font = new System.Drawing.Font("새굴림", 35F, System.Drawing.FontStyle.Bold);
|
||||
this.labelTitle.Font = new System.Drawing.Font("New Gulim", 35F, System.Drawing.FontStyle.Bold);
|
||||
this.labelTitle.InitVisible = true;
|
||||
this.labelTitle.LineSpacing = 0F;
|
||||
this.labelTitle.Location = new System.Drawing.Point(199, 7);
|
||||
|
@ -126,7 +126,7 @@
|
|||
this.smartGroupBox1.Controls.Add(this.treeViewInspection);
|
||||
this.smartGroupBox1.Controls.Add(this.buttonInspectionBackup);
|
||||
this.smartGroupBox1.Controls.Add(this.labelInspectionFileCount);
|
||||
this.smartGroupBox1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
|
||||
this.smartGroupBox1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
|
||||
this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.Black;
|
||||
this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black;
|
||||
this.smartGroupBox1.FrameLineThickness = 1;
|
||||
|
@ -188,7 +188,7 @@
|
|||
this.labelInspectionFileCount.BackPictureBox2 = null;
|
||||
this.labelInspectionFileCount.BorderColor = System.Drawing.Color.Black;
|
||||
this.labelInspectionFileCount.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.labelInspectionFileCount.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold);
|
||||
this.labelInspectionFileCount.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold);
|
||||
this.labelInspectionFileCount.InitVisible = true;
|
||||
this.labelInspectionFileCount.LineSpacing = 0F;
|
||||
this.labelInspectionFileCount.Location = new System.Drawing.Point(46, 26);
|
||||
|
@ -207,7 +207,7 @@
|
|||
this.smartGroupBox2.Controls.Add(this.treeViewHistory);
|
||||
this.smartGroupBox2.Controls.Add(this.buttonHistoryBackup);
|
||||
this.smartGroupBox2.Controls.Add(this.labelHistoryFileCount);
|
||||
this.smartGroupBox2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
|
||||
this.smartGroupBox2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
|
||||
this.smartGroupBox2.FrameLineColor1 = System.Drawing.Color.Black;
|
||||
this.smartGroupBox2.FrameLineColor2 = System.Drawing.Color.Black;
|
||||
this.smartGroupBox2.FrameLineThickness = 1;
|
||||
|
@ -269,7 +269,7 @@
|
|||
this.labelHistoryFileCount.BackPictureBox2 = null;
|
||||
this.labelHistoryFileCount.BorderColor = System.Drawing.Color.Black;
|
||||
this.labelHistoryFileCount.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.labelHistoryFileCount.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold);
|
||||
this.labelHistoryFileCount.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold);
|
||||
this.labelHistoryFileCount.InitVisible = true;
|
||||
this.labelHistoryFileCount.LineSpacing = 0F;
|
||||
this.labelHistoryFileCount.Location = new System.Drawing.Point(46, 26);
|
||||
|
@ -332,7 +332,7 @@
|
|||
this.smartGroupBox3.Controls.Add(this.listBoxOther);
|
||||
this.smartGroupBox3.Controls.Add(this.buttonOtherBackup);
|
||||
this.smartGroupBox3.Controls.Add(this.labelOtherFileCount);
|
||||
this.smartGroupBox3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
|
||||
this.smartGroupBox3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
|
||||
this.smartGroupBox3.FrameLineColor1 = System.Drawing.Color.Black;
|
||||
this.smartGroupBox3.FrameLineColor2 = System.Drawing.Color.Black;
|
||||
this.smartGroupBox3.FrameLineThickness = 1;
|
||||
|
@ -392,7 +392,7 @@
|
|||
this.labelOtherFileCount.BackPictureBox2 = null;
|
||||
this.labelOtherFileCount.BorderColor = System.Drawing.Color.Black;
|
||||
this.labelOtherFileCount.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.labelOtherFileCount.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold);
|
||||
this.labelOtherFileCount.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold);
|
||||
this.labelOtherFileCount.InitVisible = true;
|
||||
this.labelOtherFileCount.LineSpacing = 0F;
|
||||
this.labelOtherFileCount.Location = new System.Drawing.Point(46, 26);
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -258,14 +258,9 @@ namespace INT63DC_6CH.Forms
|
|||
#endregion
|
||||
}
|
||||
|
||||
public void UpdateProgreamVersionDisplay(DataStore.EquipmentStatus status, string value)
|
||||
public void UpdateProgreamVersionDisplay(DataStore.EquipmentStatus status, string version)
|
||||
{
|
||||
StringBuilder sb;
|
||||
|
||||
sb = new StringBuilder(value.Trim());
|
||||
sb.Insert(sb.Length - 1, ".");
|
||||
sb.Insert(sb.Length - 3, ".");
|
||||
this.labelMainControlVer.Text = sb.ToString();
|
||||
this.labelMainControlVer.Text = version;
|
||||
}
|
||||
public void UpdatePart11UserManagerVersionDisplay(string ver)
|
||||
{
|
||||
|
@ -306,7 +301,7 @@ namespace INT63DC_6CH.Forms
|
|||
Encryption.AesEncryption_GetVersion();
|
||||
|
||||
this.ParentForm.SystemConfig.CurrentForm = DataStore.FormStore.FormInformation;
|
||||
this.ParentForm.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._1500_ProgramVersion, "");
|
||||
this.ParentForm.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._1502_ProgramVersion, "");
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
|
@ -1063,9 +1063,9 @@ namespace INT63DC_6CH.Forms
|
|||
{
|
||||
switch (address)
|
||||
{
|
||||
case "1500":
|
||||
case "1502":
|
||||
#region Value Assign
|
||||
sValue = receiveData.Substring(0, 4);
|
||||
sValue = receiveData.Substring(0, 8);
|
||||
|
||||
if (this.ChildFormInformation != null)
|
||||
this.ChildFormInformation.UpdateProgreamVersionDisplay(this.EquipmentStatus, sValue);
|
||||
|
|
|
@ -680,6 +680,7 @@ namespace INT63DC_6CH.Forms
|
|||
#region Event Handler
|
||||
private void buttonBack_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (this.ParentForm.SystemConfig.IsLogin == false)
|
||||
this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.NotLogin;
|
||||
|
||||
this.ParentForm.ChildFormMainDisplay.DisplayRefresh();
|
||||
|
|
Loading…
Reference in New Issue