diff --git a/ITC81DB.suo b/ITC81DB.suo index 9224dd3..3b22b0e 100644 Binary files a/ITC81DB.suo and b/ITC81DB.suo differ diff --git a/ITC81DB/Controls/CenterConfiguration/ControlCenterConfiEthernet.Designer.cs b/ITC81DB/Controls/CenterConfiguration/ControlCenterConfiEthernet.Designer.cs index 98a0dd9..3f35d9a 100644 --- a/ITC81DB/Controls/CenterConfiguration/ControlCenterConfiEthernet.Designer.cs +++ b/ITC81DB/Controls/CenterConfiguration/ControlCenterConfiEthernet.Designer.cs @@ -357,7 +357,7 @@ this.buttonSaveClient.TextLocation = new System.Drawing.Point(0, 0); this.buttonSaveClient.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonSaveClient.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonSaveClient.UpImage"))); - this.buttonSaveClient.Click += new System.EventHandler(this.buttonSave2_Click); + this.buttonSaveClient.Click += new System.EventHandler(this.buttonSaveClient_Click); // // labelLocalPort // diff --git a/ITC81DB/Controls/CenterConfiguration/ControlCenterConfiEthernet.cs b/ITC81DB/Controls/CenterConfiguration/ControlCenterConfiEthernet.cs index 481100b..40dfe3c 100644 --- a/ITC81DB/Controls/CenterConfiguration/ControlCenterConfiEthernet.cs +++ b/ITC81DB/Controls/CenterConfiguration/ControlCenterConfiEthernet.cs @@ -1184,7 +1184,7 @@ namespace ITC81DB.Controls break; } } - private void buttonSave2_Click(object sender, EventArgs e) + private void buttonSaveClient_Click(object sender, EventArgs e) { try { diff --git a/ITC81DB/Controls/MainDisplay/ControlMainStartMenu.Designer.cs b/ITC81DB/Controls/MainDisplay/ControlMainStartMenu.Designer.cs new file mode 100644 index 0000000..856b430 --- /dev/null +++ b/ITC81DB/Controls/MainDisplay/ControlMainStartMenu.Designer.cs @@ -0,0 +1,225 @@ +namespace ITC81DB.Controls +{ + partial class ControlMainStartMenu + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlMainStartMenu)); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.buttonConnect = new SmartX.SmartButton(); + this.buttonDisconnect = new SmartX.SmartButton(); + this.buttonTimerON = new SmartX.SmartButton(); + this.labelTimer = new SmartX.SmartLabel(); + this.buttonTimerOFF = new SmartX.SmartButton(); + this.SuspendLayout(); + // + // pictureBox1 + // + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Location = new System.Drawing.Point(0, 0); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(710, 220); + // + // buttonConnect + // + this.buttonConnect.BackPictureBox = null; + this.buttonConnect.BackPictureBox1 = null; + this.buttonConnect.BackPictureBox2 = null; + this.buttonConnect.ButtonColor = System.Drawing.Color.Gray; + this.buttonConnect.ButtonImageAutoSize = true; + this.buttonConnect.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonConnect.DisableImage = null; + this.buttonConnect.DownImage = null; + this.buttonConnect.GroupID = 0; + this.buttonConnect.InitVisible = true; + this.buttonConnect.Location = new System.Drawing.Point(220, 67); + this.buttonConnect.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.buttonConnect.Name = "buttonConnect"; + this.buttonConnect.NestedClickEventPrevent = false; + this.buttonConnect.OutlinePixel = 1; + this.buttonConnect.RepeatInterval = 200; + this.buttonConnect.RepeatIntervalAccelerate = null; + this.buttonConnect.SafeInterval = 200; + this.buttonConnect.Size = new System.Drawing.Size(95, 84); + this.buttonConnect.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonConnect.TabIndex = 1; + this.buttonConnect.Text = "Connect"; + this.buttonConnect.TextColor = System.Drawing.Color.Black; + this.buttonConnect.TextDownColor = System.Drawing.Color.White; + this.buttonConnect.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonConnect.TextLocation = new System.Drawing.Point(0, 0); + this.buttonConnect.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonConnect.UpImage = null; + this.buttonConnect.Click += new System.EventHandler(this.buttonConnect_Click); + // + // buttonDisconnect + // + this.buttonDisconnect.BackPictureBox = null; + this.buttonDisconnect.BackPictureBox1 = null; + this.buttonDisconnect.BackPictureBox2 = null; + this.buttonDisconnect.ButtonColor = System.Drawing.Color.Gray; + this.buttonDisconnect.ButtonImageAutoSize = true; + this.buttonDisconnect.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonDisconnect.DisableImage = null; + this.buttonDisconnect.DownImage = null; + this.buttonDisconnect.GroupID = 0; + this.buttonDisconnect.InitVisible = true; + this.buttonDisconnect.Location = new System.Drawing.Point(386, 67); + this.buttonDisconnect.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.buttonDisconnect.Name = "buttonDisconnect"; + this.buttonDisconnect.NestedClickEventPrevent = false; + this.buttonDisconnect.OutlinePixel = 1; + this.buttonDisconnect.RepeatInterval = 200; + this.buttonDisconnect.RepeatIntervalAccelerate = null; + this.buttonDisconnect.SafeInterval = 200; + this.buttonDisconnect.Size = new System.Drawing.Size(95, 84); + this.buttonDisconnect.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonDisconnect.TabIndex = 2; + this.buttonDisconnect.Text = "Disconnect"; + this.buttonDisconnect.TextColor = System.Drawing.Color.Black; + this.buttonDisconnect.TextDownColor = System.Drawing.Color.White; + this.buttonDisconnect.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonDisconnect.TextLocation = new System.Drawing.Point(0, 0); + this.buttonDisconnect.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonDisconnect.UpImage = null; + this.buttonDisconnect.Click += new System.EventHandler(this.buttonDisconnect_Click); + // + // buttonTimerON + // + this.buttonTimerON.BackPictureBox = null; + this.buttonTimerON.BackPictureBox1 = null; + this.buttonTimerON.BackPictureBox2 = null; + this.buttonTimerON.ButtonColor = System.Drawing.Color.Gray; + this.buttonTimerON.ButtonImageAutoSize = true; + this.buttonTimerON.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonTimerON.DisableImage = null; + this.buttonTimerON.DownImage = null; + this.buttonTimerON.GroupID = 0; + this.buttonTimerON.InitVisible = true; + this.buttonTimerON.Location = new System.Drawing.Point(594, 55); + this.buttonTimerON.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.buttonTimerON.Name = "buttonTimerON"; + this.buttonTimerON.NestedClickEventPrevent = false; + this.buttonTimerON.OutlinePixel = 1; + this.buttonTimerON.RepeatInterval = 200; + this.buttonTimerON.RepeatIntervalAccelerate = null; + this.buttonTimerON.SafeInterval = 200; + this.buttonTimerON.Size = new System.Drawing.Size(95, 48); + this.buttonTimerON.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonTimerON.TabIndex = 3; + this.buttonTimerON.Text = "Timer ON"; + this.buttonTimerON.TextColor = System.Drawing.Color.Black; + this.buttonTimerON.TextDownColor = System.Drawing.Color.White; + this.buttonTimerON.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonTimerON.TextLocation = new System.Drawing.Point(0, 0); + this.buttonTimerON.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonTimerON.UpImage = null; + this.buttonTimerON.Visible = false; + this.buttonTimerON.Click += new System.EventHandler(this.buttonTimerON_Click); + // + // labelTimer + // + this.labelTimer.BackColor = System.Drawing.Color.White; + this.labelTimer.BackPictureBox = null; + this.labelTimer.BackPictureBox1 = null; + this.labelTimer.BackPictureBox2 = null; + this.labelTimer.BorderColor = System.Drawing.Color.Black; + this.labelTimer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelTimer.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); + this.labelTimer.InitVisible = true; + this.labelTimer.LineSpacing = 0F; + this.labelTimer.Location = new System.Drawing.Point(594, 19); + this.labelTimer.Name = "labelTimer"; + this.labelTimer.Size = new System.Drawing.Size(95, 30); + this.labelTimer.TabIndex = 137; + this.labelTimer.Text = "3000"; + this.labelTimer.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTimer.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTimer.Visible = false; + this.labelTimer.Wordwrap = false; + this.labelTimer.Click += new System.EventHandler(this.labelTimer_Click); + // + // buttonTimerOFF + // + this.buttonTimerOFF.BackPictureBox = null; + this.buttonTimerOFF.BackPictureBox1 = null; + this.buttonTimerOFF.BackPictureBox2 = null; + this.buttonTimerOFF.ButtonColor = System.Drawing.Color.Gray; + this.buttonTimerOFF.ButtonImageAutoSize = true; + this.buttonTimerOFF.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonTimerOFF.DisableImage = null; + this.buttonTimerOFF.DownImage = null; + this.buttonTimerOFF.GroupID = 0; + this.buttonTimerOFF.InitVisible = true; + this.buttonTimerOFF.Location = new System.Drawing.Point(594, 115); + this.buttonTimerOFF.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.buttonTimerOFF.Name = "buttonTimerOFF"; + this.buttonTimerOFF.NestedClickEventPrevent = false; + this.buttonTimerOFF.OutlinePixel = 1; + this.buttonTimerOFF.RepeatInterval = 200; + this.buttonTimerOFF.RepeatIntervalAccelerate = null; + this.buttonTimerOFF.SafeInterval = 200; + this.buttonTimerOFF.Size = new System.Drawing.Size(95, 84); + this.buttonTimerOFF.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonTimerOFF.TabIndex = 139; + this.buttonTimerOFF.Text = "Timer OFF"; + this.buttonTimerOFF.TextColor = System.Drawing.Color.Black; + this.buttonTimerOFF.TextDownColor = System.Drawing.Color.White; + this.buttonTimerOFF.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonTimerOFF.TextLocation = new System.Drawing.Point(0, 0); + this.buttonTimerOFF.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonTimerOFF.UpImage = null; + this.buttonTimerOFF.Visible = false; + this.buttonTimerOFF.Click += new System.EventHandler(this.buttonTimerOFF_Click); + // + // ControlMainStartMenu + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.Controls.Add(this.buttonTimerOFF); + this.Controls.Add(this.labelTimer); + this.Controls.Add(this.buttonTimerON); + this.Controls.Add(this.buttonDisconnect); + this.Controls.Add(this.buttonConnect); + this.Controls.Add(this.pictureBox1); + this.Name = "ControlMainStartMenu"; + this.Size = new System.Drawing.Size(710, 220); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.PictureBox pictureBox1; + private SmartX.SmartButton buttonConnect; + private SmartX.SmartButton buttonDisconnect; + private SmartX.SmartButton buttonTimerON; + public SmartX.SmartLabel labelTimer; + private SmartX.SmartButton buttonTimerOFF; + + } +} diff --git a/ITC81DB/Controls/MainDisplay/ControlMainStartMenu.cs b/ITC81DB/Controls/MainDisplay/ControlMainStartMenu.cs new file mode 100644 index 0000000..93f1f2f --- /dev/null +++ b/ITC81DB/Controls/MainDisplay/ControlMainStartMenu.cs @@ -0,0 +1,131 @@ +using System; +using System.Linq; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Text; +using System.Windows.Forms; + +using SmartX; +using ITC81DB.DialogForms; +using ITC81DB.Forms; +using ITC81DB_ImageDll; + +namespace ITC81DB.Controls +{ + public partial class ControlMainStartMenu : UserControl + { + #region Field + private FormMainDisplay m_ParentForm; + #endregion + + #region Constructor + public ControlMainStartMenu(FormMainDisplay parent) + { + InitializeComponent(); + + this.ParentForm = parent; + + this.InitializeDesign(); + this.DefaultSetting(); + } + #endregion + + #region Property + public FormMainDisplay ParentForm + { + get { return this.m_ParentForm; } + set { this.m_ParentForm = value; } + } + #endregion + + #region Method + public void InitializeDesign() + { + Class1 images = new Class1(); + + if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + { + } + else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + { + } + else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Russian) + { + } + else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.German) + { + } + else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + { + } + else + { + } + } + private void DefaultSetting() + { + + } + + public void DisplayRefresh(SystemStatus status) + { + + } + #endregion + + #region Event Handler + private void buttonConnect_Click(object sender, EventArgs e) + { + // 이더넷 + if (this.ParentForm.ParentForm.SystemConfig2.EthernetOperationMode == 2) + { + this.ParentForm.ParentForm.EthernetClientConnect(); + } + } + private void buttonDisconnect_Click(object sender, EventArgs e) + { + // 이더넷 + if (this.ParentForm.ParentForm.SystemConfig2.EthernetOperationMode == 2) + { + this.ParentForm.ParentForm.IsEthernetTransferData = false; + this.ParentForm.ParentForm.EthernetClientDisconnect(); + } + } + + private void labelTimer_Click(object sender, EventArgs e) + { + string value = ""; + + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelTimer.Text, 4, 0, false, this.ParentForm.ParentForm.SystemConfig1.Language); + + if (myKeyPad.ShowDialog() == DialogResult.OK) + { + if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 9999) + { + // 입력범위를 확인하세요 + DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.ParentForm.SystemConfig1.Language); + myMsg.ShowDialog(); + } + else + { + this.labelTimer.Text = myKeyPad.StringValue; + } + } + } + private void buttonTimerON_Click(object sender, EventArgs e) + { + this.ParentForm.ParentForm.TimerEnabled(false); + + this.ParentForm.ParentForm.timerClientConnect.Interval = int.Parse(this.labelTimer.Text); + + this.ParentForm.ParentForm.TimerEnabled(true); + } + private void buttonTimerOFF_Click(object sender, EventArgs e) + { + this.ParentForm.ParentForm.TimerEnabled(false); + } + #endregion + } +} diff --git a/ITC81DB/Controls/MainDisplay/ControlMainStartMenu.resx b/ITC81DB/Controls/MainDisplay/ControlMainStartMenu.resx new file mode 100644 index 0000000..9286964 --- /dev/null +++ b/ITC81DB/Controls/MainDisplay/ControlMainStartMenu.resx @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + 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 + AGC0atsijAEAGK3atghjAABGq7YtwhgAgNGqbYswBgBgtGrbIowBABit2rYIYwAARqu2LcIYAIDRqm2L + MAYAYLRq2yKMAQAYrdq2CGMAAEarti3CGACA0aptizAGAGC0atsijAEAGK3atghjAABGq7YtwhgAgNGq + bYswBgBgtGrbIowBABit2rYIYwAARqu2LcIYAIDRqm2LMAYAYLRq2yKMAQAYrdq2CGMAAEarti3CGACA + 0aptizAGAGC0atsijAEAGK3atghjAABGq7YtwhgAgNGqbYswBgBgtGrbIowBABit2rYIYwAARqu2LcIY + AIDRqm2LMAYAYLRq2yKMAQAYrdq2CGMAAEarti3CGACA0aptizAGAGC0atsijAEAGK3atghjAABGq7Yt + whgAgNGqbYswBgBgtGrbIowBABit2rYIYwAARqu2LcIYAIDRqm2LMAYAYLRq2yKMAQAYrdq2CGMAAEar + ti3CGACA0aptizAGAGC0atsijAEAGK3atghjAABGq7YtwhgAgNGqbYswBgBgtGrbIowBABit2rYIYwAA + Rqu2LcIYAIDRqm2LMAYAYLRq2yKMAQAYrdq2CGMAAEarti3CGACA0aptizAGAGC0atsijAEAGK3atghj + AABGq7YtwhgAgNGqbYswBgBgtGrbIowBABit2rYIYwAARqu2LcIYAIDRqm2LMAYAYLRq2yKMAQAYrdq2 + CGMAAEarti3CGACA0aptizAGAGC0atsijAEAGK3atghjAABGq7YtwhgAgNGqbYswBgBgtGrbIowBABit + 2rYIYwAARqu2LcIYAIDRqm2LMAYAYLRq2yKMAQAYrdq2CGMAAEarti3CGACA0aptizAGAGC0atsijAEA + GK3atghjAABGq7YtwhgAgNGqbYswBgBgtGrbIowBABit2rYIYwAARqu2LcIYAIDRqm2LMAYAYLRq2yKM + AQAYrdq2CGMAAEarti3CGACA0aptizAGAGC0atsijAEAGK3atghjAABGq7YtwhgAgNGqbYswBgBgtGrb + IowBABit2rYIYwAARqu2LcIYAIDRqm2LMAYAYLRq2yKMAQAYrdq2CGMAAEarti3CGACA0aptizAGAGC0 + atsijAEAGK3atghjAABGq7YtwhgAgNGqbYswBgBgtGrbIowBABit2rYIYwAARqu2LcIYAIDRqm2LMAYA + YLRq27JzGJ+cnORCAABwrJ4+fZptW3YO4+fPn+diAABwrNbUQ7Vt2TmMX758mYsBAMCxOjs7y7YtO4fx + mzdvcjEAADhW5+fn2bZl5zD+8OFDLgYAAMfq8vIy27bsHMY3Nze5GAAAHKurq6ts27JzGC/mjAEA+K94 + 8eJFNu1d9gpj4xQAAPxXvH//Ppv2LnuF8XJ6epoLAwDAsVjXtN3e3mbP3mXvMHZqDADAsdv3tHjZO4yX + dR9cbQAAAP60fWeLf7pXGK+v+9bxdG0EAAD+lNWo3759y4b9lXuF8fLly5cfb0/XhgAA4E/4/Plztusu + 7h3Gi3ljAACOxX3miv/poDBePn786OQYAIA/ZrXoPi/c3eXgMF6+fv26OTk5yY0CAMBjWTPFa8S3GnVf + DxLGy/X19ebVq1e5YQAAeGjrVeZ9nnz+lQcL45/WwLPr3AAAeCzrOrY1zlsteogHD+Of1pH2xcWFa90A + ADjYasrz8/ODbp34lUcL439ad8mtgej1peCK5fWnVukDAMD/Wq24mnG142rI9T1bNeZD+y1hDAAAx04Y + AwDAljAGAIAtYQwAAFvCGAAAtoQxAABsCWMAANgSxgAAsCWMAQBgSxgDAMD375u/Af2HmYII0fD1AAAA + AElFTkSuQmCC + + + + WEBPAD + + \ No newline at end of file diff --git a/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.Designer.cs b/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.Designer.cs index 117b005..1edc60c 100644 --- a/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.Designer.cs +++ b/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.Designer.cs @@ -271,42 +271,42 @@ // pictureBoxDoorCheckEnable // this.pictureBoxDoorCheckEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxDoorCheckEnable.Image"))); - this.pictureBoxDoorCheckEnable.Location = new System.Drawing.Point(427, 3); + this.pictureBoxDoorCheckEnable.Location = new System.Drawing.Point(432, 3); this.pictureBoxDoorCheckEnable.Name = "pictureBoxDoorCheckEnable"; this.pictureBoxDoorCheckEnable.Size = new System.Drawing.Size(30, 25); // // pictureBoxDoorCheckDisable // this.pictureBoxDoorCheckDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxDoorCheckDisable.Image"))); - this.pictureBoxDoorCheckDisable.Location = new System.Drawing.Point(427, 3); + this.pictureBoxDoorCheckDisable.Location = new System.Drawing.Point(432, 3); this.pictureBoxDoorCheckDisable.Name = "pictureBoxDoorCheckDisable"; this.pictureBoxDoorCheckDisable.Size = new System.Drawing.Size(30, 25); // // pictureBoxDischargeEnable // this.pictureBoxDischargeEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxDischargeEnable.Image"))); - this.pictureBoxDischargeEnable.Location = new System.Drawing.Point(367, 3); + this.pictureBoxDischargeEnable.Location = new System.Drawing.Point(372, 3); this.pictureBoxDischargeEnable.Name = "pictureBoxDischargeEnable"; this.pictureBoxDischargeEnable.Size = new System.Drawing.Size(24, 25); // // pictureBoxDischargeDisable // this.pictureBoxDischargeDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxDischargeDisable.Image"))); - this.pictureBoxDischargeDisable.Location = new System.Drawing.Point(367, 3); + this.pictureBoxDischargeDisable.Location = new System.Drawing.Point(372, 3); this.pictureBoxDischargeDisable.Name = "pictureBoxDischargeDisable"; this.pictureBoxDischargeDisable.Size = new System.Drawing.Size(24, 25); // // pictureBoxAirCheckEnable // this.pictureBoxAirCheckEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxAirCheckEnable.Image"))); - this.pictureBoxAirCheckEnable.Location = new System.Drawing.Point(337, 3); + this.pictureBoxAirCheckEnable.Location = new System.Drawing.Point(342, 3); this.pictureBoxAirCheckEnable.Name = "pictureBoxAirCheckEnable"; this.pictureBoxAirCheckEnable.Size = new System.Drawing.Size(24, 25); // // pictureBoxAirCheckDisable // this.pictureBoxAirCheckDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxAirCheckDisable.Image"))); - this.pictureBoxAirCheckDisable.Location = new System.Drawing.Point(337, 3); + this.pictureBoxAirCheckDisable.Location = new System.Drawing.Point(342, 3); this.pictureBoxAirCheckDisable.Name = "pictureBoxAirCheckDisable"; this.pictureBoxAirCheckDisable.Size = new System.Drawing.Size(24, 25); // @@ -314,14 +314,14 @@ // this.pictureBoxFeedbackEnable.BackColor = System.Drawing.Color.Black; this.pictureBoxFeedbackEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxFeedbackEnable.Image"))); - this.pictureBoxFeedbackEnable.Location = new System.Drawing.Point(397, 3); + this.pictureBoxFeedbackEnable.Location = new System.Drawing.Point(402, 3); this.pictureBoxFeedbackEnable.Name = "pictureBoxFeedbackEnable"; this.pictureBoxFeedbackEnable.Size = new System.Drawing.Size(24, 25); // // pictureBoxFeedbackDisable // this.pictureBoxFeedbackDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxFeedbackDisable.Image"))); - this.pictureBoxFeedbackDisable.Location = new System.Drawing.Point(397, 3); + this.pictureBoxFeedbackDisable.Location = new System.Drawing.Point(402, 3); this.pictureBoxFeedbackDisable.Name = "pictureBoxFeedbackDisable"; this.pictureBoxFeedbackDisable.Size = new System.Drawing.Size(24, 25); // @@ -329,14 +329,14 @@ // this.pictureBoxCountingOutputEnable.BackColor = System.Drawing.Color.Black; this.pictureBoxCountingOutputEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxCountingOutputEnable.Image"))); - this.pictureBoxCountingOutputEnable.Location = new System.Drawing.Point(463, 3); + this.pictureBoxCountingOutputEnable.Location = new System.Drawing.Point(468, 3); this.pictureBoxCountingOutputEnable.Name = "pictureBoxCountingOutputEnable"; this.pictureBoxCountingOutputEnable.Size = new System.Drawing.Size(30, 25); // // pictureBoxCountingOutputDisable // this.pictureBoxCountingOutputDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxCountingOutputDisable.Image"))); - this.pictureBoxCountingOutputDisable.Location = new System.Drawing.Point(463, 3); + this.pictureBoxCountingOutputDisable.Location = new System.Drawing.Point(468, 3); this.pictureBoxCountingOutputDisable.Name = "pictureBoxCountingOutputDisable"; this.pictureBoxCountingOutputDisable.Size = new System.Drawing.Size(30, 25); // @@ -344,18 +344,18 @@ // this.pictureBoxEthernetDisconnection.BackColor = System.Drawing.Color.Black; this.pictureBoxEthernetDisconnection.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetDisconnection.Image"))); - this.pictureBoxEthernetDisconnection.Location = new System.Drawing.Point(307, 3); + this.pictureBoxEthernetDisconnection.Location = new System.Drawing.Point(306, 3); this.pictureBoxEthernetDisconnection.Name = "pictureBoxEthernetDisconnection"; - this.pictureBoxEthernetDisconnection.Size = new System.Drawing.Size(24, 25); + this.pictureBoxEthernetDisconnection.Size = new System.Drawing.Size(30, 25); this.pictureBoxEthernetDisconnection.Visible = false; // // pictureBoxEthernetConnection // this.pictureBoxEthernetConnection.BackColor = System.Drawing.Color.Black; this.pictureBoxEthernetConnection.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetConnection.Image"))); - this.pictureBoxEthernetConnection.Location = new System.Drawing.Point(307, 3); + this.pictureBoxEthernetConnection.Location = new System.Drawing.Point(306, 3); this.pictureBoxEthernetConnection.Name = "pictureBoxEthernetConnection"; - this.pictureBoxEthernetConnection.Size = new System.Drawing.Size(24, 25); + this.pictureBoxEthernetConnection.Size = new System.Drawing.Size(30, 25); this.pictureBoxEthernetConnection.Visible = false; // // pictureBoxEthernetDisable @@ -364,7 +364,7 @@ this.pictureBoxEthernetDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetDisable.Image"))); this.pictureBoxEthernetDisable.Location = new System.Drawing.Point(307, 3); this.pictureBoxEthernetDisable.Name = "pictureBoxEthernetDisable"; - this.pictureBoxEthernetDisable.Size = new System.Drawing.Size(24, 25); + this.pictureBoxEthernetDisable.Size = new System.Drawing.Size(30, 25); this.pictureBoxEthernetDisable.Visible = false; // // smartGroupBox1 @@ -455,14 +455,14 @@ // this.pictureBoxAverageTrackingEnable.BackColor = System.Drawing.Color.Black; this.pictureBoxAverageTrackingEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxAverageTrackingEnable.Image"))); - this.pictureBoxAverageTrackingEnable.Location = new System.Drawing.Point(589, 3); + this.pictureBoxAverageTrackingEnable.Location = new System.Drawing.Point(594, 3); this.pictureBoxAverageTrackingEnable.Name = "pictureBoxAverageTrackingEnable"; this.pictureBoxAverageTrackingEnable.Size = new System.Drawing.Size(24, 25); // // pictureBoxAverageTrackingDisable // this.pictureBoxAverageTrackingDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxAverageTrackingDisable.Image"))); - this.pictureBoxAverageTrackingDisable.Location = new System.Drawing.Point(589, 3); + this.pictureBoxAverageTrackingDisable.Location = new System.Drawing.Point(594, 3); this.pictureBoxAverageTrackingDisable.Name = "pictureBoxAverageTrackingDisable"; this.pictureBoxAverageTrackingDisable.Size = new System.Drawing.Size(24, 25); // @@ -487,14 +487,14 @@ // this.pictureBoxRFIDEnable.BackColor = System.Drawing.Color.Black; this.pictureBoxRFIDEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxRFIDEnable.Image"))); - this.pictureBoxRFIDEnable.Location = new System.Drawing.Point(559, 3); + this.pictureBoxRFIDEnable.Location = new System.Drawing.Point(564, 3); this.pictureBoxRFIDEnable.Name = "pictureBoxRFIDEnable"; this.pictureBoxRFIDEnable.Size = new System.Drawing.Size(24, 25); // // pictureBoxRFIDDisable // this.pictureBoxRFIDDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxRFIDDisable.Image"))); - this.pictureBoxRFIDDisable.Location = new System.Drawing.Point(559, 3); + this.pictureBoxRFIDDisable.Location = new System.Drawing.Point(564, 3); this.pictureBoxRFIDDisable.Name = "pictureBoxRFIDDisable"; this.pictureBoxRFIDDisable.Size = new System.Drawing.Size(24, 25); // @@ -510,14 +510,14 @@ // this.pictureBoxWindProofEnable.BackColor = System.Drawing.Color.Black; this.pictureBoxWindProofEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWindProofEnable.Image"))); - this.pictureBoxWindProofEnable.Location = new System.Drawing.Point(529, 3); + this.pictureBoxWindProofEnable.Location = new System.Drawing.Point(534, 3); this.pictureBoxWindProofEnable.Name = "pictureBoxWindProofEnable"; this.pictureBoxWindProofEnable.Size = new System.Drawing.Size(24, 25); // // pictureBoxWindProofDisable // this.pictureBoxWindProofDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWindProofDisable.Image"))); - this.pictureBoxWindProofDisable.Location = new System.Drawing.Point(529, 3); + this.pictureBoxWindProofDisable.Location = new System.Drawing.Point(534, 3); this.pictureBoxWindProofDisable.Name = "pictureBoxWindProofDisable"; this.pictureBoxWindProofDisable.Size = new System.Drawing.Size(24, 25); // @@ -581,14 +581,14 @@ // this.pictureBoxRandomModeEnable.BackColor = System.Drawing.Color.Black; this.pictureBoxRandomModeEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxRandomModeEnable.Image"))); - this.pictureBoxRandomModeEnable.Location = new System.Drawing.Point(499, 3); + this.pictureBoxRandomModeEnable.Location = new System.Drawing.Point(504, 3); this.pictureBoxRandomModeEnable.Name = "pictureBoxRandomModeEnable"; this.pictureBoxRandomModeEnable.Size = new System.Drawing.Size(24, 25); // // pictureBoxRandomModeDisable // this.pictureBoxRandomModeDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxRandomModeDisable.Image"))); - this.pictureBoxRandomModeDisable.Location = new System.Drawing.Point(499, 3); + this.pictureBoxRandomModeDisable.Location = new System.Drawing.Point(504, 3); this.pictureBoxRandomModeDisable.Name = "pictureBoxRandomModeDisable"; this.pictureBoxRandomModeDisable.Size = new System.Drawing.Size(24, 25); // @@ -687,12 +687,12 @@ this.labelWeight.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelWeight.Wordwrap = false; // - // ControlMainDisplayWeightBigScreen + // ControlMainWeightBigScreen // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.smartGroupBox1); - this.Name = "ControlMainDisplayWeightBigScreen"; + this.Name = "ControlMainWeightBigScreen"; this.Size = new System.Drawing.Size(710, 248); this.smartGroupBox1.ResumeLayout(false); this.ResumeLayout(false); diff --git a/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.cs b/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.cs index 06094d9..789cd49 100644 --- a/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.cs +++ b/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.cs @@ -320,8 +320,33 @@ namespace ITC81DB if (this.ParentForm.ParentForm.SystemConfig2.IsEthernetEnable == true) { this.pictureBoxEthernetDisable.Visible = false; - this.pictureBoxEthernetDisconnection.Visible = true; - this.pictureBoxEthernetConnection.Visible = false; + + if (this.ParentForm.ParentForm.SystemConfig2.EthernetOperationMode == 1) + { + if (this.ParentForm.ParentForm.smartTCPMultiServer.ClientInfoList.Length != 0) + { + this.pictureBoxEthernetDisconnection.Visible = false; + this.pictureBoxEthernetConnection.Visible = true; + } + else + { + this.pictureBoxEthernetDisconnection.Visible = true; + this.pictureBoxEthernetConnection.Visible = false; + } + } + else if (this.ParentForm.ParentForm.SystemConfig2.EthernetOperationMode == 2) + { + if (this.ParentForm.ParentForm.IsEthernetThreadStart == true) + { + this.pictureBoxEthernetDisconnection.Visible = false; + this.pictureBoxEthernetConnection.Visible = true; + } + else + { + this.pictureBoxEthernetDisconnection.Visible = true; + this.pictureBoxEthernetConnection.Visible = false; + } + } } else { diff --git a/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.resx b/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.resx index 0a068b2..09f10c3 100644 --- a/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.resx +++ b/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.resx @@ -2020,7 +2020,7 @@ - iVBORw0KGgoAAAANSUhEUgAAABgAAAAZCAYAAAArK+5dAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAZCAYAAAAmNZ4aAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs @@ -2065,18 +2065,16 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOvAAADrwBlbxySQAAATJJREFUSEtjkJOT+09L - DLcgNKPwf33PJILYOzoZwxB8GG5Bd1///97eXoK4sWcihiH4MNwCbIZhw629oxYQwGRbQCsMtwBbksSG - y9v7MQzBh+EWgJIftiBBx5UdEzAMwYfhFqioafz3T8z6H55ZhBP7xKb+V1JRxTAEH8YaB0bWDiiudvAN - gcupGVv9t06v/W+b3YwXa9m4gdVjtQBmcOD8Y3C2gqIiWM69fRlYnBD2n7nvv7yCAnYLYBikEF3Me8Im - DMNwYUVgsI9agBcTZQE6tkwqx5pqsGEFZRX8FmDDNLfApX4OVp+hY5/J28DqSbZASV3rv6F/7H+joES8 - WEXXCKyeZAuQsZKmzn+brMb/7q1LwFjXxR9DDUUW6HuEooQ5yDJQykFWQ5EFxGAaWyD3HwCOpzb6PKgt - jgAAAABJRU5ErkJggg== + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOxAAADsQBlSsOGwAAANdJREFUSEvtljEKwjAY + hb1D6Zo4SPYsmTNpx0qPpKC3EFz0Iu21fm0l8ZFEqjY1WDp8BNpHP/og+bNgjFEKOvFyJag4Xml7qu80 + I1F3jtZlxcXhEgiOw3p3fopj/mmWZZTnuUUI4WRqFOOLYXDOSUpp0Vp7mWmITcUhsVt5VLERhsRmNdlp + iZVSVJalpaqq34hfMYvTimPwjhjzqasePiTcbeTSbqtHFoZE7LFojk9/MjW02cNYjH0RMLVjve23vYvA + J6AAwQyK8Tkyiz1Ckj7+W/wN/WJGNzHmNvHPmRG6AAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAABgAAAAZCAYAAAArK+5dAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAZCAYAAAAmNZ4aAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs @@ -2121,16 +2119,16 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOvAAADrwBlbxySQAAAOhJREFUSEvtk6sOwkAQ - RfmSbXkJTJs0OByPlICAgkASPoMES4LEIMBgEGi+AMVvDSnJTEp3Ou2kqas4Zndzz2Z3bsMYA1VCgmC5 - hfD4yMWbRFaIBAkWtzdE908u09PTCpEgARfGMT+/rBCJWpALCaqCBNxIcgz3FytEggTx+HFPkmZ0uFoh - EiRw2x3wZxsIVrtMvHANTrNlhUiwf9D1+3+37g3GtKdtPCtIhiOO6/72tI1nBUh8kFsrAo5zLciksCAN - d05CFHBwI8mBjVcLtI1XC7SNVwuSSI1HSgmS4Qg2HiklKELFAgNfvKkyywPtOBoAAAAASUVORK5CYII= + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOxAAADsQBlSsOGwAAANFJREFUSEvtllEKAiEQ + hj2JFET36KX2ta5UULcIeqmLuNeyRpjt35pWR41lYR++1XVGPxRkNNZaPwZBvFitfXN5+P3VvWj/hAsO + cnXi5nwXEvUsNwdvjPmCxjlne7y9xbV2SpL4uENxPzGXNHFbT4xHLMU5xkdeTczCITG2szib0cWxe0x9 + aquLY8zi0ClBI+7m0EdK0pC949IioRNDkSgti7+u0SeUtztBWaz5ECCB/C88BDTgogjHJTHO7/KkwSFw + UYTj0xfjIilMX6wlTWz9E6PAYi/MddXpAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAABgAAAAZCAYAAAArK+5dAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAZCAYAAAAmNZ4aAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs @@ -2175,13 +2173,13 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOvAAADrwBlbxySQAAASxJREFUSEvtk8tqhEAQ - RfMPIrhSEOMkOElUfGxcCD6iTHygk///lAqVoStiN63NxEUgi4PQjPe0NXUfTNOEIyGBpmmg6/om7unE - hcgggWVZEATBJnmecyEy/gWbkCBJEhjHcZN5nrkQGSQ4ChLsXlPX5UJkkMBxHIiiSDh3Bs6/bVsuRAYJ - ns6vcLl8QFEUkKYphGH4HYrPqqpgGAao63dwnz0uRIbwPzgHIfi+Tzevm59b45cahiEc3xLWeKEAR5Vl - GTRNA33fwzRN8OjeXlBdZ6GAgYL12a8K8Ifrs78lsG2bO4vjWNjwNazxUgGGlWVJt/I8tRVFpAIR+FWi - tVzDGq8sUG28smBP46/XT3h5uy2IsmCJrPGMuwQ4qq7raHOWjWfcJdjDwQITvgAnx1xAevGfCwAAAABJ - RU5ErkJggg== + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAUBJREFUSEvtlsuqgzAQ + QO8fuFAXgi9cuFLxgYK4URBEEBX8/2+ZMoGkiVqatpFCuYtDMJnkxIkm+XNdF74BETuOA5qmga7rYJrm + JRiGQUpBjELf9yFJEsiy7BLSNIUoioiHiW3bVibdZy0MQ9aG8qZp7mLP84TOn7Afq23bw/NviGmKz8R8 + ypWL6RiP3pgvf0tcVRWs68rYto3UXy5+xL+YiPfr8g4yYozDNWdiFciI+XgiVnEqyYgxDjcSJsZOeZ6f + dpDl2XJhijFGWGM8j7HyUzmFZpA/mcqyhGEYoK7ruxgpigKmaTqdLQVniwPwEqTve5jnmcXRtNMPClmW + BbquI22CWJY4jg/icRyFGF7M1/O8LD77iPaCS8R4W9mL8WbBxygR87+aZVkQBMFBjHcprKdxSsTv7GqX + pFqG52IXblgWas7RDhsXAAAAAElFTkSuQmCC diff --git a/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.Designer.cs b/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.Designer.cs index 27c5cdb..7b4d8ad 100644 --- a/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.Designer.cs +++ b/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.Designer.cs @@ -123,42 +123,42 @@ // pictureBoxDoorCheckEnable // this.pictureBoxDoorCheckEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxDoorCheckEnable.Image"))); - this.pictureBoxDoorCheckEnable.Location = new System.Drawing.Point(427, 3); + this.pictureBoxDoorCheckEnable.Location = new System.Drawing.Point(432, 3); this.pictureBoxDoorCheckEnable.Name = "pictureBoxDoorCheckEnable"; this.pictureBoxDoorCheckEnable.Size = new System.Drawing.Size(30, 25); // // pictureBoxDoorCheckDisable // this.pictureBoxDoorCheckDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxDoorCheckDisable.Image"))); - this.pictureBoxDoorCheckDisable.Location = new System.Drawing.Point(427, 3); + this.pictureBoxDoorCheckDisable.Location = new System.Drawing.Point(432, 3); this.pictureBoxDoorCheckDisable.Name = "pictureBoxDoorCheckDisable"; this.pictureBoxDoorCheckDisable.Size = new System.Drawing.Size(30, 25); // // pictureBoxDischargeEnable // this.pictureBoxDischargeEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxDischargeEnable.Image"))); - this.pictureBoxDischargeEnable.Location = new System.Drawing.Point(367, 3); + this.pictureBoxDischargeEnable.Location = new System.Drawing.Point(372, 3); this.pictureBoxDischargeEnable.Name = "pictureBoxDischargeEnable"; this.pictureBoxDischargeEnable.Size = new System.Drawing.Size(24, 25); // // pictureBoxDischargeDisable // this.pictureBoxDischargeDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxDischargeDisable.Image"))); - this.pictureBoxDischargeDisable.Location = new System.Drawing.Point(367, 3); + this.pictureBoxDischargeDisable.Location = new System.Drawing.Point(372, 3); this.pictureBoxDischargeDisable.Name = "pictureBoxDischargeDisable"; this.pictureBoxDischargeDisable.Size = new System.Drawing.Size(24, 25); // // pictureBoxAirCheckEnable // this.pictureBoxAirCheckEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxAirCheckEnable.Image"))); - this.pictureBoxAirCheckEnable.Location = new System.Drawing.Point(337, 3); + this.pictureBoxAirCheckEnable.Location = new System.Drawing.Point(342, 3); this.pictureBoxAirCheckEnable.Name = "pictureBoxAirCheckEnable"; this.pictureBoxAirCheckEnable.Size = new System.Drawing.Size(24, 25); // // pictureBoxAirCheckDisable // this.pictureBoxAirCheckDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxAirCheckDisable.Image"))); - this.pictureBoxAirCheckDisable.Location = new System.Drawing.Point(337, 3); + this.pictureBoxAirCheckDisable.Location = new System.Drawing.Point(342, 3); this.pictureBoxAirCheckDisable.Name = "pictureBoxAirCheckDisable"; this.pictureBoxAirCheckDisable.Size = new System.Drawing.Size(24, 25); // @@ -166,14 +166,14 @@ // this.pictureBoxFeedbackEnable.BackColor = System.Drawing.Color.Black; this.pictureBoxFeedbackEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxFeedbackEnable.Image"))); - this.pictureBoxFeedbackEnable.Location = new System.Drawing.Point(397, 3); + this.pictureBoxFeedbackEnable.Location = new System.Drawing.Point(402, 3); this.pictureBoxFeedbackEnable.Name = "pictureBoxFeedbackEnable"; this.pictureBoxFeedbackEnable.Size = new System.Drawing.Size(24, 25); // // pictureBoxFeedbackDisable // this.pictureBoxFeedbackDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxFeedbackDisable.Image"))); - this.pictureBoxFeedbackDisable.Location = new System.Drawing.Point(397, 3); + this.pictureBoxFeedbackDisable.Location = new System.Drawing.Point(402, 3); this.pictureBoxFeedbackDisable.Name = "pictureBoxFeedbackDisable"; this.pictureBoxFeedbackDisable.Size = new System.Drawing.Size(24, 25); // @@ -181,7 +181,7 @@ // this.pictureBoxCountingOutputEnable.BackColor = System.Drawing.Color.Black; this.pictureBoxCountingOutputEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxCountingOutputEnable.Image"))); - this.pictureBoxCountingOutputEnable.Location = new System.Drawing.Point(463, 3); + this.pictureBoxCountingOutputEnable.Location = new System.Drawing.Point(468, 3); this.pictureBoxCountingOutputEnable.Name = "pictureBoxCountingOutputEnable"; this.pictureBoxCountingOutputEnable.Size = new System.Drawing.Size(30, 25); this.pictureBoxCountingOutputEnable.Visible = false; @@ -189,7 +189,7 @@ // pictureBoxCountingOutputDisable // this.pictureBoxCountingOutputDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxCountingOutputDisable.Image"))); - this.pictureBoxCountingOutputDisable.Location = new System.Drawing.Point(463, 3); + this.pictureBoxCountingOutputDisable.Location = new System.Drawing.Point(468, 3); this.pictureBoxCountingOutputDisable.Name = "pictureBoxCountingOutputDisable"; this.pictureBoxCountingOutputDisable.Size = new System.Drawing.Size(30, 25); this.pictureBoxCountingOutputDisable.Visible = false; @@ -328,27 +328,27 @@ // this.pictureBoxEthernetDisable.BackColor = System.Drawing.Color.Black; this.pictureBoxEthernetDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetDisable.Image"))); - this.pictureBoxEthernetDisable.Location = new System.Drawing.Point(307, 3); + this.pictureBoxEthernetDisable.Location = new System.Drawing.Point(306, 3); this.pictureBoxEthernetDisable.Name = "pictureBoxEthernetDisable"; - this.pictureBoxEthernetDisable.Size = new System.Drawing.Size(24, 25); + this.pictureBoxEthernetDisable.Size = new System.Drawing.Size(30, 25); this.pictureBoxEthernetDisable.Visible = false; // // pictureBoxEthernetConnection // this.pictureBoxEthernetConnection.BackColor = System.Drawing.Color.Black; this.pictureBoxEthernetConnection.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetConnection.Image"))); - this.pictureBoxEthernetConnection.Location = new System.Drawing.Point(307, 3); + this.pictureBoxEthernetConnection.Location = new System.Drawing.Point(306, 3); this.pictureBoxEthernetConnection.Name = "pictureBoxEthernetConnection"; - this.pictureBoxEthernetConnection.Size = new System.Drawing.Size(24, 25); + this.pictureBoxEthernetConnection.Size = new System.Drawing.Size(30, 25); this.pictureBoxEthernetConnection.Visible = false; // // pictureBoxEthernetDisconnection // this.pictureBoxEthernetDisconnection.BackColor = System.Drawing.Color.Black; this.pictureBoxEthernetDisconnection.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetDisconnection.Image"))); - this.pictureBoxEthernetDisconnection.Location = new System.Drawing.Point(307, 3); + this.pictureBoxEthernetDisconnection.Location = new System.Drawing.Point(306, 3); this.pictureBoxEthernetDisconnection.Name = "pictureBoxEthernetDisconnection"; - this.pictureBoxEthernetDisconnection.Size = new System.Drawing.Size(24, 25); + this.pictureBoxEthernetDisconnection.Size = new System.Drawing.Size(30, 25); this.pictureBoxEthernetDisconnection.Visible = false; // // smartGroupBox1 @@ -437,14 +437,14 @@ // this.pictureBoxAverageTrackingEnable.BackColor = System.Drawing.Color.Black; this.pictureBoxAverageTrackingEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxAverageTrackingEnable.Image"))); - this.pictureBoxAverageTrackingEnable.Location = new System.Drawing.Point(589, 3); + this.pictureBoxAverageTrackingEnable.Location = new System.Drawing.Point(594, 3); this.pictureBoxAverageTrackingEnable.Name = "pictureBoxAverageTrackingEnable"; this.pictureBoxAverageTrackingEnable.Size = new System.Drawing.Size(24, 25); // // pictureBoxAverageTrackingDisable // this.pictureBoxAverageTrackingDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxAverageTrackingDisable.Image"))); - this.pictureBoxAverageTrackingDisable.Location = new System.Drawing.Point(589, 3); + this.pictureBoxAverageTrackingDisable.Location = new System.Drawing.Point(594, 3); this.pictureBoxAverageTrackingDisable.Name = "pictureBoxAverageTrackingDisable"; this.pictureBoxAverageTrackingDisable.Size = new System.Drawing.Size(24, 25); // @@ -469,14 +469,14 @@ // this.pictureBoxRFIDEnable.BackColor = System.Drawing.Color.Black; this.pictureBoxRFIDEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxRFIDEnable.Image"))); - this.pictureBoxRFIDEnable.Location = new System.Drawing.Point(559, 3); + this.pictureBoxRFIDEnable.Location = new System.Drawing.Point(564, 3); this.pictureBoxRFIDEnable.Name = "pictureBoxRFIDEnable"; this.pictureBoxRFIDEnable.Size = new System.Drawing.Size(24, 25); // // pictureBoxRFIDDisable // this.pictureBoxRFIDDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxRFIDDisable.Image"))); - this.pictureBoxRFIDDisable.Location = new System.Drawing.Point(559, 3); + this.pictureBoxRFIDDisable.Location = new System.Drawing.Point(564, 3); this.pictureBoxRFIDDisable.Name = "pictureBoxRFIDDisable"; this.pictureBoxRFIDDisable.Size = new System.Drawing.Size(24, 25); // @@ -492,14 +492,14 @@ // this.pictureBoxWindProofEnable.BackColor = System.Drawing.Color.Black; this.pictureBoxWindProofEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWindProofEnable.Image"))); - this.pictureBoxWindProofEnable.Location = new System.Drawing.Point(529, 3); + this.pictureBoxWindProofEnable.Location = new System.Drawing.Point(534, 3); this.pictureBoxWindProofEnable.Name = "pictureBoxWindProofEnable"; this.pictureBoxWindProofEnable.Size = new System.Drawing.Size(24, 25); // // pictureBoxWindProofDisable // this.pictureBoxWindProofDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWindProofDisable.Image"))); - this.pictureBoxWindProofDisable.Location = new System.Drawing.Point(529, 3); + this.pictureBoxWindProofDisable.Location = new System.Drawing.Point(534, 3); this.pictureBoxWindProofDisable.Name = "pictureBoxWindProofDisable"; this.pictureBoxWindProofDisable.Size = new System.Drawing.Size(24, 25); // @@ -542,7 +542,7 @@ // this.pictureBoxRandomModeEnable.BackColor = System.Drawing.Color.Black; this.pictureBoxRandomModeEnable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxRandomModeEnable.Image"))); - this.pictureBoxRandomModeEnable.Location = new System.Drawing.Point(499, 3); + this.pictureBoxRandomModeEnable.Location = new System.Drawing.Point(504, 3); this.pictureBoxRandomModeEnable.Name = "pictureBoxRandomModeEnable"; this.pictureBoxRandomModeEnable.Size = new System.Drawing.Size(24, 25); // @@ -572,7 +572,7 @@ // pictureBoxRandomModeDisable // this.pictureBoxRandomModeDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxRandomModeDisable.Image"))); - this.pictureBoxRandomModeDisable.Location = new System.Drawing.Point(499, 3); + this.pictureBoxRandomModeDisable.Location = new System.Drawing.Point(504, 3); this.pictureBoxRandomModeDisable.Name = "pictureBoxRandomModeDisable"; this.pictureBoxRandomModeDisable.Size = new System.Drawing.Size(24, 25); // @@ -669,12 +669,12 @@ this.labelWeight.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelWeight.Wordwrap = false; // - // ControlMainDisplayWeightSmall + // ControlMainWeightSmallScreen // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.smartGroupBox1); - this.Name = "ControlMainDisplayWeightSmall"; + this.Name = "ControlMainWeightSmallScreen"; this.Size = new System.Drawing.Size(710, 148); this.smartGroupBox1.ResumeLayout(false); this.ResumeLayout(false); diff --git a/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.cs b/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.cs index 727653d..92ee7be 100644 --- a/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.cs +++ b/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.cs @@ -321,8 +321,33 @@ namespace ITC81DB.Controls if (this.ParentForm.ParentForm.SystemConfig2.IsEthernetEnable == true) { this.pictureBoxEthernetDisable.Visible = false; - this.pictureBoxEthernetDisconnection.Visible = true; - this.pictureBoxEthernetConnection.Visible = false; + + if (this.ParentForm.ParentForm.SystemConfig2.EthernetOperationMode == 1) + { + if (this.ParentForm.ParentForm.smartTCPMultiServer.ClientInfoList.Length != 0) + { + this.pictureBoxEthernetDisconnection.Visible = false; + this.pictureBoxEthernetConnection.Visible = true; + } + else + { + this.pictureBoxEthernetDisconnection.Visible = true; + this.pictureBoxEthernetConnection.Visible = false; + } + } + else if (this.ParentForm.ParentForm.SystemConfig2.EthernetOperationMode == 2) + { + if (this.ParentForm.ParentForm.IsEthernetThreadStart == true) + { + this.pictureBoxEthernetDisconnection.Visible = false; + this.pictureBoxEthernetConnection.Visible = true; + } + else + { + this.pictureBoxEthernetDisconnection.Visible = true; + this.pictureBoxEthernetConnection.Visible = false; + } + } } else { diff --git a/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.resx b/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.resx index c4738aa..590704c 100644 --- a/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.resx +++ b/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.resx @@ -2019,7 +2019,7 @@ - iVBORw0KGgoAAAANSUhEUgAAABgAAAAZCAYAAAArK+5dAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAZCAYAAAAmNZ4aAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs @@ -2064,18 +2064,18 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOvAAADrwBlbxySQAAASxJREFUSEvtk8tqhEAQ - RfMPIrhSEOMkOElUfGxcCD6iTHygk///lAqVoStiN63NxEUgi4PQjPe0NXUfTNOEIyGBpmmg6/om7unE - hcgggWVZEATBJnmecyEy/gWbkCBJEhjHcZN5nrkQGSQ4ChLsXlPX5UJkkMBxHIiiSDh3Bs6/bVsuRAYJ - ns6vcLl8QFEUkKYphGH4HYrPqqpgGAao63dwnz0uRIbwPzgHIfi+Tzevm59b45cahiEc3xLWeKEAR5Vl - GTRNA33fwzRN8OjeXlBdZ6GAgYL12a8K8Ifrs78lsG2bO4vjWNjwNazxUgGGlWVJt/I8tRVFpAIR+FWi - tVzDGq8sUG28smBP46/XT3h5uy2IsmCJrPGMuwQ4qq7raHOWjWfcJdjDwQITvgAnx1xAevGfCwAAAABJ - RU5ErkJggg== + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAUBJREFUSEvtlsuqgzAQ + QO8fuFAXgi9cuFLxgYK4URBEEBX8/2+ZMoGkiVqatpFCuYtDMJnkxIkm+XNdF74BETuOA5qmga7rYJrm + JRiGQUpBjELf9yFJEsiy7BLSNIUoioiHiW3bVibdZy0MQ9aG8qZp7mLP84TOn7Afq23bw/NviGmKz8R8 + ypWL6RiP3pgvf0tcVRWs68rYto3UXy5+xL+YiPfr8g4yYozDNWdiFciI+XgiVnEqyYgxDjcSJsZOeZ6f + dpDl2XJhijFGWGM8j7HyUzmFZpA/mcqyhGEYoK7ruxgpigKmaTqdLQVniwPwEqTve5jnmcXRtNMPClmW + BbquI22CWJY4jg/icRyFGF7M1/O8LD77iPaCS8R4W9mL8WbBxygR87+aZVkQBMFBjHcprKdxSsTv7GqX + pFqG52IXblgWas7RDhsXAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAABgAAAAZCAYAAAArK+5dAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAZCAYAAAAmNZ4aAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs @@ -2120,16 +2120,16 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOvAAADrwBlbxySQAAAOhJREFUSEvtk6sOwkAQ - RfmSbXkJTJs0OByPlICAgkASPoMES4LEIMBgEGi+AMVvDSnJTEp3Ou2kqas4Zndzz2Z3bsMYA1VCgmC5 - hfD4yMWbRFaIBAkWtzdE908u09PTCpEgARfGMT+/rBCJWpALCaqCBNxIcgz3FytEggTx+HFPkmZ0uFoh - EiRw2x3wZxsIVrtMvHANTrNlhUiwf9D1+3+37g3GtKdtPCtIhiOO6/72tI1nBUh8kFsrAo5zLciksCAN - d05CFHBwI8mBjVcLtI1XC7SNVwuSSI1HSgmS4Qg2HiklKELFAgNfvKkyywPtOBoAAAAASUVORK5CYII= + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOxAAADsQBlSsOGwAAANFJREFUSEvtllEKAiEQ + hj2JFET36KX2ta5UULcIeqmLuNeyRpjt35pWR41lYR++1XVGPxRkNNZaPwZBvFitfXN5+P3VvWj/hAsO + cnXi5nwXEvUsNwdvjPmCxjlne7y9xbV2SpL4uENxPzGXNHFbT4xHLMU5xkdeTczCITG2szib0cWxe0x9 + aquLY8zi0ClBI+7m0EdK0pC949IioRNDkSgti7+u0SeUtztBWaz5ECCB/C88BDTgogjHJTHO7/KkwSFw + UYTj0xfjIilMX6wlTWz9E6PAYi/MddXpAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAABgAAAAZCAYAAAArK+5dAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAZCAYAAAAmNZ4aAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs @@ -2174,13 +2174,11 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOvAAADrwBlbxySQAAATJJREFUSEtjkJOT+09L - DLcgNKPwf33PJILYOzoZwxB8GG5Bd1///97eXoK4sWcihiH4MNwCbIZhw629oxYQwGRbQCsMtwBbksSG - y9v7MQzBh+EWgJIftiBBx5UdEzAMwYfhFqioafz3T8z6H55ZhBP7xKb+V1JRxTAEH8YaB0bWDiiudvAN - gcupGVv9t06v/W+b3YwXa9m4gdVjtQBmcOD8Y3C2gqIiWM69fRlYnBD2n7nvv7yCAnYLYBikEF3Me8Im - DMNwYUVgsI9agBcTZQE6tkwqx5pqsGEFZRX8FmDDNLfApX4OVp+hY5/J28DqSbZASV3rv6F/7H+joES8 - WEXXCKyeZAuQsZKmzn+brMb/7q1LwFjXxR9DDUUW6HuEooQ5yDJQykFWQ5EFxGAaWyD3HwCOpzb6PKgt - jgAAAABJRU5ErkJggg== + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOxAAADsQBlSsOGwAAANdJREFUSEvtljEKwjAY + hb1D6Zo4SPYsmTNpx0qPpKC3EFz0Iu21fm0l8ZFEqjY1WDp8BNpHP/og+bNgjFEKOvFyJag4Xml7qu80 + I1F3jtZlxcXhEgiOw3p3fopj/mmWZZTnuUUI4WRqFOOLYXDOSUpp0Vp7mWmITcUhsVt5VLERhsRmNdlp + iZVSVJalpaqq34hfMYvTimPwjhjzqasePiTcbeTSbqtHFoZE7LFojk9/MjW02cNYjH0RMLVjve23vYvA + J6AAwQyK8Tkyiz1Ckj7+W/wN/WJGNzHmNvHPmRG6AAAAAElFTkSuQmCC diff --git a/ITC81DB/DataStore.cs b/ITC81DB/DataStore.cs index b0e0f3d..b201da7 100644 --- a/ITC81DB/DataStore.cs +++ b/ITC81DB/DataStore.cs @@ -97,6 +97,7 @@ namespace ITC81DB DataStat, SpotCheck, SubMenu, + StartMenu, Feedback, AverageTracking, Modbus, diff --git a/ITC81DB/Forms/FormMain.Designer.cs b/ITC81DB/Forms/FormMain.Designer.cs index 97b880a..1c1d406 100644 --- a/ITC81DB/Forms/FormMain.Designer.cs +++ b/ITC81DB/Forms/FormMain.Designer.cs @@ -48,6 +48,8 @@ this.smartFileBarcodeLog = new SmartX.SmartFile(); this.smartThreadSerialPort2OverRun = new SmartX.SmartThread(this.components); this.smartThreadSerialPort2Read = new SmartX.SmartThread(this.components); + this.timerClientConnect = new System.Windows.Forms.Timer(); + this.smartFile1 = new SmartX.SmartFile(); ((System.ComponentModel.ISupportInitialize)(this.smartForm)).BeginInit(); this.SuspendLayout(); // @@ -211,6 +213,15 @@ this.smartThreadSerialPort2Read.Priority = System.Threading.ThreadPriority.Normal; this.smartThreadSerialPort2Read.UIThreadFunction += new SmartX.SmartThread.UIThreadHandler(this.smartThreadSerialPort2Read_UIThreadFunction); // + // timerClientConnect + // + this.timerClientConnect.Interval = 3000; + this.timerClientConnect.Tick += new System.EventHandler(this.timerClientConnect_Tick); + // + // smartFile1 + // + this.smartFile1.FilePathName = null; + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -246,6 +257,8 @@ public SmartX.SmartFile smartFileBarcodeLog; private SmartX.SmartThread smartThreadSerialPort2OverRun; private SmartX.SmartThread smartThreadSerialPort2Read; + public SmartX.SmartFile smartFile1; + public System.Windows.Forms.Timer timerClientConnect; } } diff --git a/ITC81DB/Forms/FormMain.cs b/ITC81DB/Forms/FormMain.cs index b34dc7d..e32feba 100644 --- a/ITC81DB/Forms/FormMain.cs +++ b/ITC81DB/Forms/FormMain.cs @@ -24,8 +24,8 @@ namespace ITC81DB.Forms public partial class FormMain : Form { #region Field - public static string DisplayVersion = "8.18.0"; - public static string ReleaseDate = "2023.11.24"; + public static string DisplayVersion = "8.19.0"; + public static string ReleaseDate = "2023.12.06"; public SmartSplash SmartSplashProgramLoad; public bool IsCommunicationLogOpen; @@ -211,8 +211,9 @@ namespace ITC81DB.Forms private int HMEthernet_Step; // Ethernet - private bool IsEthernetThreadStop; - private bool IsEthernetTransferData; + public bool IsEthernetThreadStart = false; + public bool IsEthernetTransferData; + public bool IsEthernetStartMenu = false; public object EthernetTransferData; @@ -576,7 +577,9 @@ namespace ITC81DB.Forms } } else if (this.SystemConfig2.EthernetOperationMode == 2) - this.EthernetClientDisconnect(); + { + this.TimerEnabled(true); + } if (this.SystemConfig2.EthernetCommMode != (int)DataStore.EthernetMode.f0_None) { @@ -1652,6 +1655,13 @@ namespace ITC81DB.Forms //this.smartFileBarcodeLog.Open(); //this.IsBarcodeLogOpen = true; #endregion + + #region Client 용 통신 로그 + fullPath = this.PathDataBackupFolder + string.Format("{0:yyMMdd}_", dt) + this.SystemConfig1.EquipmentID + "_ClientConnection.txt"; + this.smartFile1.FilePathName = fullPath; + //this.timer1.Enabled = true; + //this.smartFile1.Open(); + #endregion } public void CloseSmartSerialPort2() { @@ -2086,10 +2096,6 @@ namespace ITC81DB.Forms this.IndexOverRun = 0; this.ChildFormMainDisplay.labelOverrun.Text = "0"; - // 이더넷 - if (this.SystemConfig2.EthernetOperationMode == 2) - this.EthernetClientConnect(); - if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.MainDisplay) { if (this.ChildFormMainDisplay != null) @@ -2120,7 +2126,7 @@ namespace ITC81DB.Forms this.smartFileStartStopLog.WriteString(string.Format("Receive Stop ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, strTemp)); this.CommID = 0; - + this.CurrentSystemStatus.Equipment = DataStore.EquipmentStatus.Stop; this.Update30000ModbusItem(); @@ -2187,13 +2193,6 @@ namespace ITC81DB.Forms // 통신 지연용 Queue Clear this.ClearQueue(); - // 이더넷 - if (this.SystemConfig2.EthernetOperationMode == 2) - { - this.IsEthernetTransferData = false; - this.EthernetClientDisconnect(); - } - if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.MainDisplay) { if (this.ChildFormMainDisplay != null) @@ -8460,9 +8459,16 @@ namespace ITC81DB.Forms } #region Client + public void TimerEnabled(bool bValue) + { + if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.MainDisplay) + if (this.IsEthernetStartMenu == false) + this.timerClientConnect.Enabled = bValue; + } + public void EthernetClientConnect() { - if (this.IsEthernetThreadStop == false) + if (this.IsEthernetThreadStart == true) return; // Online 경우 if (this.SystemConfig2.IsEthernetEnable == false) { @@ -8495,7 +8501,6 @@ namespace ITC81DB.Forms { this.IsUsingTimerEthernetPing(false); - this.IsEthernetThreadStop = true; this.DelegateUISeverStatus(false); if (null != this.EthernetStmReader) this.EthernetStmReader.Close(); @@ -8510,6 +8515,9 @@ namespace ITC81DB.Forms this.EthernetTcpClient.Close(); this.DelegateTextStatusOut(">Disconnected"); + + this.IsEthernetThreadStart = false; + this.TimerEnabled(true); } private void EthernetClientReceiveThread() @@ -8526,8 +8534,9 @@ namespace ITC81DB.Forms this.DelegateUISeverStatus(true); this.DelegateTextStatusOut(">Connected Server"); - - this.IsEthernetThreadStop = false; + + this.IsEthernetThreadStart = true; + this.TimerEnabled(false); // 판정 데이터 전송 if (this.IsEthernetTransferData == true) @@ -8542,14 +8551,17 @@ namespace ITC81DB.Forms this.DelegateTransferData((byte)this.EthernetTransferData); } - while (this.IsEthernetThreadStop == false) + while (this.IsEthernetThreadStart == true) { string strRecvMsg = this.EthernetStmReader.ReadLine(); if (null == strRecvMsg) { this.DelegateTextStatusOut(">Server Out"); - this.IsEthernetThreadStop = true; + + this.IsEthernetThreadStart = false; + this.TimerEnabled(true); + break; } @@ -8562,7 +8574,6 @@ namespace ITC81DB.Forms } finally { - this.IsEthernetThreadStop = true; this.DelegateUISeverStatus(false); this.DelegateTextStatusOut(">Disconnected"); if (null != this.EthernetStmReader) @@ -8576,6 +8587,9 @@ namespace ITC81DB.Forms if (null != this.EthernetTcpClient) this.EthernetTcpClient.Close(); + + this.IsEthernetThreadStart = false; + this.TimerEnabled(true); } return; @@ -8656,7 +8670,7 @@ namespace ITC81DB.Forms this.IsEthernetTransferData = true; this.EthernetTransferData = strTemp; - if (this.IsEthernetThreadStop == true) + if (this.IsEthernetThreadStart == false) this.EthernetClientConnect(); else this.EthernetSendMessage((string)this.EthernetTransferData); @@ -8666,7 +8680,7 @@ namespace ITC81DB.Forms this.IsEthernetTransferData = true; this.EthernetTransferData = bytes; - if (this.IsEthernetThreadStop == true) + if (this.IsEthernetThreadStart == false) this.EthernetClientConnect(); else this.EthernetSendMessage(bytes); @@ -8676,7 +8690,7 @@ namespace ITC81DB.Forms this.IsEthernetTransferData = true; this.EthernetTransferData = bytes; - if (this.IsEthernetThreadStop == true) + if (this.IsEthernetThreadStart == false) this.EthernetClientConnect(); else this.EthernetSendMessage(bytes); @@ -16134,6 +16148,14 @@ namespace ITC81DB.Forms this.ChildFormMainDisplay.UpdateDisplayOverRun(this.QueueOverRun.Dequeue()); } + private void timerClientConnect_Tick(object sender, EventArgs e) + { + if (this.IsEthernetThreadStart == false) + { + this.EthernetClientConnect(); + } + } + //private void timerRFIDRead_Tick(object sender, EventArgs e) //{ // this.TimerRFIDRead.Stop(); diff --git a/ITC81DB/Forms/FormMain.resx b/ITC81DB/Forms/FormMain.resx index 9267528..7b857d5 100644 --- a/ITC81DB/Forms/FormMain.resx +++ b/ITC81DB/Forms/FormMain.resx @@ -171,6 +171,12 @@ 965, 91 + + 580, 93 + + + 463, 93 + WEBPAD diff --git a/ITC81DB/Forms/FormMainDisplay.cs b/ITC81DB/Forms/FormMainDisplay.cs index 3bc8800..840ef83 100644 --- a/ITC81DB/Forms/FormMainDisplay.cs +++ b/ITC81DB/Forms/FormMainDisplay.cs @@ -34,6 +34,7 @@ namespace ITC81DB.Forms public ControlMainModbus MainModbus; public ControlMainSpotCheck MainSpotCheck; public ControlMainSubMenu MainSubMenu; + public ControlMainStartMenu MainStartMenu; public ControlMainWeightBigScreen MainWeightBigScreen; public ControlMainWeightSmallScreen MainWeightSmallScreen; #endregion @@ -188,6 +189,7 @@ namespace ITC81DB.Forms this.MainList = new ControlMainList(this); this.MainModbus = new ControlMainModbus(this); this.MainSubMenu = new ControlMainSubMenu(this); + this.MainStartMenu = new ControlMainStartMenu(this); this.MainAlarm = new ControlMainAlarm(); this.MainFeedback = new ControlMainFeedback(this); this.MainSpotCheck = new ControlMainSpotCheck(this); @@ -201,6 +203,7 @@ namespace ITC81DB.Forms this.MainLineGraph.Location = new Point(0, 313); this.MainList.Location = new Point(0, 213); this.MainSubMenu.Location = new Point(0, 213); + this.MainStartMenu.Location = new Point(0, 313); this.MainAlarm.Location = new Point(390, 60); this.MainFeedback.Location = new Point(0, 313); this.MainSpotCheck.Location = new Point(0, 313); @@ -215,6 +218,7 @@ namespace ITC81DB.Forms this.Controls.Add(this.MainLineGraph); this.Controls.Add(this.MainList); this.Controls.Add(this.MainSubMenu); + this.Controls.Add(this.MainStartMenu); this.Controls.Add(this.MainAlarm); this.Controls.Add(this.MainFeedback); this.Controls.Add(this.MainSpotCheck); @@ -868,8 +872,11 @@ namespace ITC81DB.Forms this.labelProductName.Enabled = true; } - //this.CurrentDisplay = DataStore.MainDisplayStore.DisplayStartBarGraph; - //this.DisplayBottomMain(this.CurrentDisplay); + if (this.CurrentDisplay == DataStore.MainDisplayStore.StartMenu) + { + this.CurrentDisplay = DataStore.MainDisplayStore.BarGraph; + this.DisplayBottomMain(this.CurrentDisplay); + } } this.MainBarGraph.UpdateEquipmentStatusDisplay(status); @@ -1088,6 +1095,8 @@ namespace ITC81DB.Forms } public void DisplayBottomMain(DataStore.MainDisplayStore main) { + this.ParentForm.IsEthernetStartMenu = false; + switch (main) { case DataStore.MainDisplayStore.SubMenu: @@ -1096,6 +1105,13 @@ namespace ITC81DB.Forms this.MainSubMenu.BringToFront(); this.MainWeightSmallScreen.BringToFront(); break; + case DataStore.MainDisplayStore.StartMenu: + this.ParentForm.IsEthernetStartMenu = true; + this.UpdateDisplayMenuButton(DataStore.MainDisplayStore.StartMenu); + this.MainStartMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus); + this.MainStartMenu.BringToFront(); + this.MainWeightBigScreen.BringToFront(); + break; case DataStore.MainDisplayStore.BarGraph: this.UpdateDisplayMenuButton(DataStore.MainDisplayStore.BarGraph); this.MainBarGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); @@ -1223,6 +1239,8 @@ namespace ITC81DB.Forms this.DisplayBottomMain(this.CurrentDisplay); + this.ParentForm.TimerEnabled(true); + //this.CurrentDisplay = DataStore.MainDisplayStore.DisplayStartBarGraph; //this.DisplayBottomMain(this.CurrentDisplay); this.MainWeightBigScreen.DisplayRefresh(status); @@ -1551,9 +1569,20 @@ namespace ITC81DB.Forms { if (this.ParentForm.CurrentSystemStatus.Equipment == DataStore.EquipmentStatus.Stop) { + this.ParentForm.TimerEnabled(false); + this.ParentForm.ChildFormMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus); ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormMenu); } + else + { + if (this.ParentForm.SystemConfig2.EthernetOperationMode == 2) + { + this.CurrentDisplay = DataStore.MainDisplayStore.StartMenu; + + this.DisplayBottomMain(this.CurrentDisplay); + } + } } private void buttonStop_Click(object sender, EventArgs e) diff --git a/ITC81DB/Forms/FormMenu.cs b/ITC81DB/Forms/FormMenu.cs index e72fbe8..326ca53 100644 --- a/ITC81DB/Forms/FormMenu.cs +++ b/ITC81DB/Forms/FormMenu.cs @@ -1805,9 +1805,6 @@ namespace ITC81DB.Forms this.ParentForm.ChildFormMainDisplay.DisplayHiddenMenu(false); - if (this.ParentForm.SystemConfig2.EthernetOperationMode == 2) - this.ParentForm.EthernetClientDisconnect(); - if (this.ParentForm.ChildFormMainDisplay.MainFeedback.IsUsingFeedback() == true) { string feedbackValue = ""; diff --git a/ITC81DB/ITC81DB.csproj b/ITC81DB/ITC81DB.csproj index d436e23..45b5d84 100644 --- a/ITC81DB/ITC81DB.csproj +++ b/ITC81DB/ITC81DB.csproj @@ -474,6 +474,12 @@ ControlBasicProductLotSetting.cs + + UserControl + + + ControlMainStartMenu.cs + Form @@ -809,6 +815,10 @@ ControlBasicProductLotSetting.cs Designer + + ControlMainStartMenu.cs + Designer + DialogFormLogOn.cs Designer diff --git a/ITC81DB/Version.txt b/ITC81DB/Version.txt index 89d2562..b1736b0 100644 Binary files a/ITC81DB/Version.txt and b/ITC81DB/Version.txt differ diff --git a/ITC81DB/bin/Release/ITC81DB.exe b/ITC81DB/bin/Release/ITC81DB.exe index db98053..91c1776 100644 Binary files a/ITC81DB/bin/Release/ITC81DB.exe and b/ITC81DB/bin/Release/ITC81DB.exe differ diff --git a/ITC81DB/bin/Release/ITC81DB.pdb b/ITC81DB/bin/Release/ITC81DB.pdb index d06db85..6f92ca1 100644 Binary files a/ITC81DB/bin/Release/ITC81DB.pdb and b/ITC81DB/bin/Release/ITC81DB.pdb differ diff --git a/ITC81DB/obj/Release/ITC81DB.ControlMainWeightBigScreen.resources b/ITC81DB/obj/Release/ITC81DB.ControlMainWeightBigScreen.resources index fe64647..166ee51 100644 Binary files a/ITC81DB/obj/Release/ITC81DB.ControlMainWeightBigScreen.resources and b/ITC81DB/obj/Release/ITC81DB.ControlMainWeightBigScreen.resources differ diff --git a/ITC81DB/obj/Release/ITC81DB.Controls.ControlMainWeightSmallScreen.resources b/ITC81DB/obj/Release/ITC81DB.Controls.ControlMainWeightSmallScreen.resources index dc4421c..d7fd7e8 100644 Binary files a/ITC81DB/obj/Release/ITC81DB.Controls.ControlMainWeightSmallScreen.resources and b/ITC81DB/obj/Release/ITC81DB.Controls.ControlMainWeightSmallScreen.resources differ diff --git a/ITC81DB/obj/Release/ITC81DB.csproj.FileListAbsolute.txt b/ITC81DB/obj/Release/ITC81DB.csproj.FileListAbsolute.txt index 9c26dc9..ac88f38 100644 --- a/ITC81DB/obj/Release/ITC81DB.csproj.FileListAbsolute.txt +++ b/ITC81DB/obj/Release/ITC81DB.csproj.FileListAbsolute.txt @@ -3489,3 +3489,4 @@ C:\Users\CJY\Desktop\ITC81DB_V8.18.0\ITC81DB\obj\Release\ITC81DB.Properties.Reso C:\Users\CJY\Desktop\ITC81DB_V8.18.0\ITC81DB\obj\Release\ITC81DB.csproj.GenerateResource.Cache C:\Users\CJY\Desktop\ITC81DB_V8.18.0\ITC81DB\obj\Release\ITC81DB.exe C:\Users\CJY\Desktop\ITC81DB_V8.18.0\ITC81DB\obj\Release\ITC81DB.pdb +D:\Laboratory\ITC81DB_V8\ITC81DB\obj\Release\ITC81DB.Controls.ControlMainStartMenu.resources diff --git a/ITC81DB/obj/Release/ITC81DB.csproj.GenerateResource.Cache b/ITC81DB/obj/Release/ITC81DB.csproj.GenerateResource.Cache index f5d696f..51d05bc 100644 Binary files a/ITC81DB/obj/Release/ITC81DB.csproj.GenerateResource.Cache and b/ITC81DB/obj/Release/ITC81DB.csproj.GenerateResource.Cache differ diff --git a/ITC81DB/obj/Release/ITC81DB.exe b/ITC81DB/obj/Release/ITC81DB.exe index db98053..91c1776 100644 Binary files a/ITC81DB/obj/Release/ITC81DB.exe and b/ITC81DB/obj/Release/ITC81DB.exe differ diff --git a/ITC81DB/obj/Release/ITC81DB.pdb b/ITC81DB/obj/Release/ITC81DB.pdb index d06db85..6f92ca1 100644 Binary files a/ITC81DB/obj/Release/ITC81DB.pdb and b/ITC81DB/obj/Release/ITC81DB.pdb differ diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/obj/Release/Refactor/ITC81DB_ImageDll.dll b/ITC81DB_ImageDll/ITC81DB_ImageDll/obj/Release/Refactor/ITC81DB_ImageDll.dll index d0ac199..42bfab6 100644 Binary files a/ITC81DB_ImageDll/ITC81DB_ImageDll/obj/Release/Refactor/ITC81DB_ImageDll.dll and b/ITC81DB_ImageDll/ITC81DB_ImageDll/obj/Release/Refactor/ITC81DB_ImageDll.dll differ