parent
bf56be73b4
commit
3ae63cb72b
|
@ -111,12 +111,21 @@ namespace ITC81DB_2.Controls
|
||||||
|
|
||||||
this.buttonEngineerSetting.Visible = bValue;
|
this.buttonEngineerSetting.Visible = bValue;
|
||||||
}
|
}
|
||||||
|
private void UpdateDisplayUser(UserItem user)
|
||||||
|
{
|
||||||
|
if (user.Group == DataStore.UserGroup.Level4Developer && this.ParentForm.ParentForm.SystemConfig.IsLogin == true)
|
||||||
|
this.DisplayHiddenMenu(true);
|
||||||
|
else
|
||||||
|
this.DisplayHiddenMenu(false);
|
||||||
|
}
|
||||||
|
|
||||||
public void DisplayRefresh(SystemStatus status)
|
public void DisplayRefresh(SystemStatus status)
|
||||||
{
|
{
|
||||||
this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.EquipHelp;
|
this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.EquipHelp;
|
||||||
this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu);
|
this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu);
|
||||||
this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus);
|
this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus);
|
||||||
|
|
||||||
|
this.UpdateDisplayUser(status.CurrentUser);
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
|
@ -355,7 +355,6 @@
|
||||||
this.buttonLine2.ButtonColor = System.Drawing.Color.Gray;
|
this.buttonLine2.ButtonColor = System.Drawing.Color.Gray;
|
||||||
this.buttonLine2.ButtonImageAutoSize = true;
|
this.buttonLine2.ButtonImageAutoSize = true;
|
||||||
this.buttonLine2.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
|
this.buttonLine2.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
|
||||||
this.buttonLine2.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonLine2.DisableImage")));
|
|
||||||
this.buttonLine2.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLine2.DownImage")));
|
this.buttonLine2.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLine2.DownImage")));
|
||||||
this.buttonLine2.GroupID = 0;
|
this.buttonLine2.GroupID = 0;
|
||||||
this.buttonLine2.InitVisible = true;
|
this.buttonLine2.InitVisible = true;
|
||||||
|
@ -386,7 +385,6 @@
|
||||||
this.buttonLine1.ButtonColor = System.Drawing.Color.Gray;
|
this.buttonLine1.ButtonColor = System.Drawing.Color.Gray;
|
||||||
this.buttonLine1.ButtonImageAutoSize = true;
|
this.buttonLine1.ButtonImageAutoSize = true;
|
||||||
this.buttonLine1.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
|
this.buttonLine1.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
|
||||||
this.buttonLine1.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonLine1.DisableImage")));
|
|
||||||
this.buttonLine1.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLine1.DownImage")));
|
this.buttonLine1.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLine1.DownImage")));
|
||||||
this.buttonLine1.GroupID = 0;
|
this.buttonLine1.GroupID = 0;
|
||||||
this.buttonLine1.InitVisible = true;
|
this.buttonLine1.InitVisible = true;
|
||||||
|
|
|
@ -269,6 +269,9 @@ namespace ITC81DB_2.Controls
|
||||||
this.buttonPasteAll.Enabled = false;
|
this.buttonPasteAll.Enabled = false;
|
||||||
this.buttonLine1.Enabled = false;
|
this.buttonLine1.Enabled = false;
|
||||||
this.buttonLine2.Enabled = false;
|
this.buttonLine2.Enabled = false;
|
||||||
|
this.buttonDown.Enabled = false;
|
||||||
|
this.buttonUp.Enabled = false;
|
||||||
|
this.buttonLineCopy.Enabled = false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -279,6 +282,9 @@ namespace ITC81DB_2.Controls
|
||||||
this.buttonPasteAll.Enabled = true;
|
this.buttonPasteAll.Enabled = true;
|
||||||
this.buttonLine1.Enabled = true;
|
this.buttonLine1.Enabled = true;
|
||||||
this.buttonLine2.Enabled = true;
|
this.buttonLine2.Enabled = true;
|
||||||
|
this.buttonDown.Enabled = true;
|
||||||
|
this.buttonUp.Enabled = true;
|
||||||
|
this.buttonLineCopy.Enabled = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public void UpdateCurrentProductDisplay(DataStore.EquipmentStatus status, ProductItem pItem1, ProductItem pItem2)
|
public void UpdateCurrentProductDisplay(DataStore.EquipmentStatus status, ProductItem pItem1, ProductItem pItem2)
|
||||||
|
|
|
@ -292,6 +292,7 @@
|
||||||
this.pictureBoxStart.Location = new System.Drawing.Point(710, 0);
|
this.pictureBoxStart.Location = new System.Drawing.Point(710, 0);
|
||||||
this.pictureBoxStart.Name = "pictureBoxStart";
|
this.pictureBoxStart.Name = "pictureBoxStart";
|
||||||
this.pictureBoxStart.Size = new System.Drawing.Size(90, 60);
|
this.pictureBoxStart.Size = new System.Drawing.Size(90, 60);
|
||||||
|
this.pictureBoxStart.Click += new System.EventHandler(this.pictureBoxStart_Click);
|
||||||
//
|
//
|
||||||
// pictureBoxStop
|
// pictureBoxStop
|
||||||
//
|
//
|
||||||
|
@ -299,6 +300,7 @@
|
||||||
this.pictureBoxStop.Location = new System.Drawing.Point(710, 0);
|
this.pictureBoxStop.Location = new System.Drawing.Point(710, 0);
|
||||||
this.pictureBoxStop.Name = "pictureBoxStop";
|
this.pictureBoxStop.Name = "pictureBoxStop";
|
||||||
this.pictureBoxStop.Size = new System.Drawing.Size(90, 60);
|
this.pictureBoxStop.Size = new System.Drawing.Size(90, 60);
|
||||||
|
this.pictureBoxStop.Click += new System.EventHandler(this.pictureBoxStop_Click);
|
||||||
//
|
//
|
||||||
// labelUserID
|
// labelUserID
|
||||||
//
|
//
|
||||||
|
|
|
@ -401,6 +401,14 @@ namespace ITC81DB_2.Forms
|
||||||
if (this.labelUserID.Text != id)
|
if (this.labelUserID.Text != id)
|
||||||
this.labelUserID.Text = id;
|
this.labelUserID.Text = id;
|
||||||
}
|
}
|
||||||
|
private bool EquipmentRun(DataStore.DisplayStore currentDisplay)
|
||||||
|
{
|
||||||
|
if (currentDisplay == DataStore.DisplayStore.SystemJudgmentSetting
|
||||||
|
|| currentDisplay == DataStore.DisplayStore.SystemSorterSetting)
|
||||||
|
return true;
|
||||||
|
else
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
private void DisplaySideMenu(DataStore.MenuSide menu)
|
private void DisplaySideMenu(DataStore.MenuSide menu)
|
||||||
{
|
{
|
||||||
|
@ -891,25 +899,21 @@ namespace ITC81DB_2.Forms
|
||||||
this.SelectedSideMenu = DataStore.MenuSide.Basic;
|
this.SelectedSideMenu = DataStore.MenuSide.Basic;
|
||||||
this.DisplaySideMenu(this.SelectedSideMenu);
|
this.DisplaySideMenu(this.SelectedSideMenu);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buttonConfiguration_Click(object sender, EventArgs e)
|
private void buttonConfiguration_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
this.SelectedSideMenu = DataStore.MenuSide.Configuration;
|
this.SelectedSideMenu = DataStore.MenuSide.Configuration;
|
||||||
this.DisplaySideMenu(this.SelectedSideMenu);
|
this.DisplaySideMenu(this.SelectedSideMenu);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buttonSystem_Click(object sender, EventArgs e)
|
private void buttonSystem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
this.SelectedSideMenu = DataStore.MenuSide.System;
|
this.SelectedSideMenu = DataStore.MenuSide.System;
|
||||||
this.DisplaySideMenu(this.SelectedSideMenu);
|
this.DisplaySideMenu(this.SelectedSideMenu);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buttonEquipment_Click(object sender, EventArgs e)
|
private void buttonEquipment_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
this.SelectedSideMenu = DataStore.MenuSide.Equipment;
|
this.SelectedSideMenu = DataStore.MenuSide.Equipment;
|
||||||
this.DisplaySideMenu(this.SelectedSideMenu);
|
this.DisplaySideMenu(this.SelectedSideMenu);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buttonInformation_Click(object sender, EventArgs e)
|
private void buttonInformation_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
this.SelectedSideMenu = DataStore.MenuSide.Information;
|
this.SelectedSideMenu = DataStore.MenuSide.Information;
|
||||||
|
@ -923,12 +927,22 @@ namespace ITC81DB_2.Forms
|
||||||
this.DisplayHiddenMenu(this.ParentForm.CurrentSystemStatus.CurrentDisplay, this.ParentForm.SystemConfig);
|
this.DisplayHiddenMenu(this.ParentForm.CurrentSystemStatus.CurrentDisplay, this.ParentForm.SystemConfig);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buttonMain_Click(object sender, EventArgs e)
|
private void buttonMain_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
this.ParentForm.ChildFormMainDisplay.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
|
this.ParentForm.ChildFormMainDisplay.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
|
||||||
((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormMainDisplay);
|
((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormMainDisplay);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void pictureBoxStop_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (this.EquipmentRun(this.ParentForm.CurrentSystemStatus.CurrentDisplay) == true)
|
||||||
|
this.ParentForm.TransferData(CommunicationCommand.Start, CommunicationID.MainBoard);
|
||||||
|
}
|
||||||
|
private void pictureBoxStart_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (this.EquipmentRun(this.ParentForm.CurrentSystemStatus.CurrentDisplay) == true)
|
||||||
|
this.ParentForm.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard);
|
||||||
|
}
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -30,6 +30,7 @@
|
||||||
- dummy(4), dummy(4) -> 하강지연(4), 상승지연(4)
|
- dummy(4), dummy(4) -> 하강지연(4), 상승지연(4)
|
||||||
- 시스템파일 1열 쓰기 : 9014
|
- 시스템파일 1열 쓰기 : 9014
|
||||||
- 시스템파일 2열 쓰기 : 9017
|
- 시스템파일 2열 쓰기 : 9017
|
||||||
|
- 판정설정, 선별기 설정에서 화면에서 Start/Stop 가능하도록 수정
|
||||||
|
|
||||||
@ Ver 1.9.0 by CJY
|
@ Ver 1.9.0 by CJY
|
||||||
- 2020.06.30
|
- 2020.06.30
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue