- 메인화면 Ethernet 아이콘 변경

- Ethernet - Client 설정 후 메인화면에서 운전 시, 메뉴버튼 클릭하면 Client 연결 조작 메뉴 팝업
 - Client 연결 시나리오 수정
   Booting -> Client ON 시, Timer 실행
   -> Client(중량선별기)가 Server에 연결되면 Timer OFF -> Client 연결 끊김 -> Timer 실행
main
DESKTOP-999R8N3\CJY 2023-12-18 10:58:38 +09:00
parent eed5a62b14
commit dec7152427
12 changed files with 59 additions and 19 deletions

Binary file not shown.

View File

@ -344,7 +344,7 @@
// //
this.pictureBoxEthernetDisconnection.BackColor = System.Drawing.Color.Black; this.pictureBoxEthernetDisconnection.BackColor = System.Drawing.Color.Black;
this.pictureBoxEthernetDisconnection.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetDisconnection.Image"))); this.pictureBoxEthernetDisconnection.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetDisconnection.Image")));
this.pictureBoxEthernetDisconnection.Location = new System.Drawing.Point(306, 3); this.pictureBoxEthernetDisconnection.Location = new System.Drawing.Point(307, 3);
this.pictureBoxEthernetDisconnection.Name = "pictureBoxEthernetDisconnection"; this.pictureBoxEthernetDisconnection.Name = "pictureBoxEthernetDisconnection";
this.pictureBoxEthernetDisconnection.Size = new System.Drawing.Size(30, 25); this.pictureBoxEthernetDisconnection.Size = new System.Drawing.Size(30, 25);
this.pictureBoxEthernetDisconnection.Visible = false; this.pictureBoxEthernetDisconnection.Visible = false;
@ -353,7 +353,7 @@
// //
this.pictureBoxEthernetConnection.BackColor = System.Drawing.Color.Black; this.pictureBoxEthernetConnection.BackColor = System.Drawing.Color.Black;
this.pictureBoxEthernetConnection.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetConnection.Image"))); this.pictureBoxEthernetConnection.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetConnection.Image")));
this.pictureBoxEthernetConnection.Location = new System.Drawing.Point(306, 3); this.pictureBoxEthernetConnection.Location = new System.Drawing.Point(307, 3);
this.pictureBoxEthernetConnection.Name = "pictureBoxEthernetConnection"; this.pictureBoxEthernetConnection.Name = "pictureBoxEthernetConnection";
this.pictureBoxEthernetConnection.Size = new System.Drawing.Size(30, 25); this.pictureBoxEthernetConnection.Size = new System.Drawing.Size(30, 25);
this.pictureBoxEthernetConnection.Visible = false; this.pictureBoxEthernetConnection.Visible = false;

View File

@ -88,6 +88,8 @@ namespace ITC81DB
} }
public void UpdateSpotOrBypassImageVisibleStatus(bool check) public void UpdateSpotOrBypassImageVisibleStatus(bool check)
{ {
this.ParentForm.ParentForm.IsBypassStart = check;
if (check == true) if (check == true)
{ {
this.pictureBoxBypass.Visible = true; this.pictureBoxBypass.Visible = true;

View File

@ -328,7 +328,7 @@
// //
this.pictureBoxEthernetDisable.BackColor = System.Drawing.Color.Black; this.pictureBoxEthernetDisable.BackColor = System.Drawing.Color.Black;
this.pictureBoxEthernetDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetDisable.Image"))); this.pictureBoxEthernetDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetDisable.Image")));
this.pictureBoxEthernetDisable.Location = new System.Drawing.Point(306, 3); this.pictureBoxEthernetDisable.Location = new System.Drawing.Point(307, 3);
this.pictureBoxEthernetDisable.Name = "pictureBoxEthernetDisable"; this.pictureBoxEthernetDisable.Name = "pictureBoxEthernetDisable";
this.pictureBoxEthernetDisable.Size = new System.Drawing.Size(30, 25); this.pictureBoxEthernetDisable.Size = new System.Drawing.Size(30, 25);
this.pictureBoxEthernetDisable.Visible = false; this.pictureBoxEthernetDisable.Visible = false;
@ -337,7 +337,7 @@
// //
this.pictureBoxEthernetConnection.BackColor = System.Drawing.Color.Black; this.pictureBoxEthernetConnection.BackColor = System.Drawing.Color.Black;
this.pictureBoxEthernetConnection.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetConnection.Image"))); this.pictureBoxEthernetConnection.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetConnection.Image")));
this.pictureBoxEthernetConnection.Location = new System.Drawing.Point(306, 3); this.pictureBoxEthernetConnection.Location = new System.Drawing.Point(307, 3);
this.pictureBoxEthernetConnection.Name = "pictureBoxEthernetConnection"; this.pictureBoxEthernetConnection.Name = "pictureBoxEthernetConnection";
this.pictureBoxEthernetConnection.Size = new System.Drawing.Size(30, 25); this.pictureBoxEthernetConnection.Size = new System.Drawing.Size(30, 25);
this.pictureBoxEthernetConnection.Visible = false; this.pictureBoxEthernetConnection.Visible = false;
@ -346,7 +346,7 @@
// //
this.pictureBoxEthernetDisconnection.BackColor = System.Drawing.Color.Black; this.pictureBoxEthernetDisconnection.BackColor = System.Drawing.Color.Black;
this.pictureBoxEthernetDisconnection.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetDisconnection.Image"))); this.pictureBoxEthernetDisconnection.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetDisconnection.Image")));
this.pictureBoxEthernetDisconnection.Location = new System.Drawing.Point(306, 3); this.pictureBoxEthernetDisconnection.Location = new System.Drawing.Point(307, 3);
this.pictureBoxEthernetDisconnection.Name = "pictureBoxEthernetDisconnection"; this.pictureBoxEthernetDisconnection.Name = "pictureBoxEthernetDisconnection";
this.pictureBoxEthernetDisconnection.Size = new System.Drawing.Size(30, 25); this.pictureBoxEthernetDisconnection.Size = new System.Drawing.Size(30, 25);
this.pictureBoxEthernetDisconnection.Visible = false; this.pictureBoxEthernetDisconnection.Visible = false;

View File

@ -89,6 +89,8 @@ namespace ITC81DB.Controls
} }
public void UpdateSpotOrBypassImageVisibleStatus(bool check) public void UpdateSpotOrBypassImageVisibleStatus(bool check)
{ {
this.ParentForm.ParentForm.IsBypassStart = check;
if (check == true) if (check == true)
{ {
this.pictureBoxBypass.Visible = true; this.pictureBoxBypass.Visible = true;

View File

@ -54,6 +54,7 @@ namespace ITC81DB.Forms
public bool IsAlarmOccured; public bool IsAlarmOccured;
public bool IsCountingOutputCrossStatus; public bool IsCountingOutputCrossStatus;
private bool IsSatisfyCounting; private bool IsSatisfyCounting;
public bool IsBypassStart;
// 재전송 기능 // 재전송 기능
public int MissingCommIDCount; public int MissingCommIDCount;
@ -2571,6 +2572,11 @@ namespace ITC81DB.Forms
{ {
this.IsBootingComplete = true; this.IsBootingComplete = true;
this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress.ParameterCount, ""); this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress.ParameterCount, "");
if (this.SystemConfig2.EthernetOperationMode == 2)
{
this.TimerEnabled(true);
}
} }
else else
{ {
@ -8461,8 +8467,8 @@ namespace ITC81DB.Forms
#region Client #region Client
public void TimerEnabled(bool bValue) public void TimerEnabled(bool bValue)
{ {
if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.MainDisplay) // if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.MainDisplay)
if (this.IsEthernetStartMenu == false) // if (this.IsEthernetStartMenu == false)
this.timerClientConnect.Enabled = bValue; this.timerClientConnect.Enabled = bValue;
} }
@ -8670,30 +8676,60 @@ namespace ITC81DB.Forms
this.IsEthernetTransferData = true; this.IsEthernetTransferData = true;
this.EthernetTransferData = strTemp; this.EthernetTransferData = strTemp;
if (this.IsEthernetThreadStart == false) try
this.EthernetClientConnect(); {
else if (this.IsEthernetThreadStart == false)
this.EthernetSendMessage((string)this.EthernetTransferData); {
this.EthernetClientConnect();
this.EthernetSendMessage((string)this.EthernetTransferData);
}
else
this.EthernetSendMessage((string)this.EthernetTransferData);
}
catch
{
}
} }
public void EthernetWeightData(byte[] bytes) public void EthernetWeightData(byte[] bytes)
{ {
this.IsEthernetTransferData = true; this.IsEthernetTransferData = true;
this.EthernetTransferData = bytes; this.EthernetTransferData = bytes;
if (this.IsEthernetThreadStart == false) try
this.EthernetClientConnect(); {
else if (this.IsEthernetThreadStart == false)
this.EthernetSendMessage(bytes); {
this.EthernetClientConnect();
this.EthernetSendMessage(bytes);
}
else
this.EthernetSendMessage(bytes);
}
catch
{
}
} }
public void EthernetWeightDataForModbus(byte[] bytes) public void EthernetWeightDataForModbus(byte[] bytes)
{ {
this.IsEthernetTransferData = true; this.IsEthernetTransferData = true;
this.EthernetTransferData = bytes; this.EthernetTransferData = bytes;
if (this.IsEthernetThreadStart == false) try
this.EthernetClientConnect(); {
else if (this.IsEthernetThreadStart == false)
this.EthernetSendMessage(bytes); {
this.EthernetClientConnect();
this.EthernetSendMessage(bytes);
}
else
this.EthernetSendMessage(bytes);
}
catch
{
}
} }
#endregion #endregion

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.