diff --git a/INT69DC_7C/Controls/ControlMainDisplayTable10.cs b/INT69DC_7C/Controls/ControlMainDisplayTable10.cs index b79b266..73c8d1a 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable10.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable10.cs @@ -17,11 +17,10 @@ namespace INT69DC_7C.Controls #region Field private FormMainDisplay m_ParentForm; - private Color WeightOverColor = Color.Yellow; + private Color WeightOverColor = Color.Red; private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; private Color WeightPassColor = Color.Green; - private Color WeightExNGColor = Color.Blue; /// /// true : total average @@ -291,10 +290,10 @@ namespace INT69DC_7C.Controls labelColor = this.WeightOverColor; else if (judge == DataStore.JudgmentStatus.Under) labelColor = this.WeightUnderColor; - else if (judge == DataStore.JudgmentStatus.EXNg) - labelColor = this.WeightExNGColor; - else + else if (judge == DataStore.JudgmentStatus.Pass) labelColor = this.WeightStandardColor; + else + labelColor = this.WeightOverColor; if (labelTotalCNT == true) { diff --git a/INT69DC_7C/Controls/ControlMainDisplayTable12.cs b/INT69DC_7C/Controls/ControlMainDisplayTable12.cs index 41c19d2..a23cefe 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable12.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable12.cs @@ -18,11 +18,10 @@ namespace INT69DC_7C.Controls #region Field private FormMainDisplay m_ParentForm; - private Color WeightOverColor = Color.Yellow; + private Color WeightOverColor = Color.Red; private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; private Color WeightPassColor = Color.Green; - private Color WeightExNGColor = Color.Blue; /// /// true : total average @@ -338,10 +337,10 @@ namespace INT69DC_7C.Controls labelColor = this.WeightOverColor; else if (judge == DataStore.JudgmentStatus.Under) labelColor = this.WeightUnderColor; - else if (judge == DataStore.JudgmentStatus.EXNg) - labelColor = this.WeightExNGColor; - else + else if (judge == DataStore.JudgmentStatus.Pass) labelColor = this.WeightStandardColor; + else + labelColor = this.WeightOverColor; if (labelTotalCNT == true) { diff --git a/INT69DC_7C/Controls/ControlMainDisplayTable7.cs b/INT69DC_7C/Controls/ControlMainDisplayTable7.cs index 55fd853..7994d55 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable7.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable7.cs @@ -18,11 +18,10 @@ namespace INT69DC_7C.Controls #region Field private FormMainDisplay m_ParentForm; - private Color WeightOverColor = Color.Yellow; + private Color WeightOverColor = Color.Red; private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; private Color WeightPassColor = Color.Green; - private Color WeightExNGColor = Color.Blue; /// /// true : total average @@ -242,10 +241,10 @@ namespace INT69DC_7C.Controls labelColor = this.WeightOverColor; else if (judge == DataStore.JudgmentStatus.Under) labelColor = this.WeightUnderColor; - else if (judge == DataStore.JudgmentStatus.EXNg) - labelColor = this.WeightExNGColor; - else + else if (judge == DataStore.JudgmentStatus.Pass) labelColor = this.WeightStandardColor; + else + labelColor = this.WeightOverColor; if (labelTotalCNT == true) { diff --git a/INT69DC_7C/Controls/ControlMainDisplayTable8.cs b/INT69DC_7C/Controls/ControlMainDisplayTable8.cs index 4fe46f8..b9b860f 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable8.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable8.cs @@ -18,11 +18,10 @@ namespace INT69DC_7C.Controls #region Field private FormMainDisplay m_ParentForm; - private Color WeightOverColor = Color.Yellow; + private Color WeightOverColor = Color.Red; private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; private Color WeightPassColor = Color.Green; - private Color WeightExNGColor = Color.Blue; /// /// true : total average @@ -261,10 +260,10 @@ namespace INT69DC_7C.Controls labelColor = this.WeightOverColor; else if (judge == DataStore.JudgmentStatus.Under) labelColor = this.WeightUnderColor; - else if (judge == DataStore.JudgmentStatus.EXNg) - labelColor = this.WeightExNGColor; - else + else if (judge == DataStore.JudgmentStatus.Pass) labelColor = this.WeightStandardColor; + else + labelColor = this.WeightOverColor; if (labelTotalCNT == true) { diff --git a/INT69DC_7C/Forms/FormInformation.cs b/INT69DC_7C/Forms/FormInformation.cs index 615f99f..7c23e57 100644 --- a/INT69DC_7C/Forms/FormInformation.cs +++ b/INT69DC_7C/Forms/FormInformation.cs @@ -140,7 +140,7 @@ namespace INT69DC_7C.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "11.4.5"; + this.labelDisplayVer.Text = "11.4.6"; if(this.ParentForm.SystemConfig.EquipmentMode == 7) this.labelTitleMainboardName.Text = "INT68M-2A"; else diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt index d3eb290..bd5650c 100644 --- a/INT69DC_7C/Version.txt +++ b/INT69DC_7C/Version.txt @@ -15,6 +15,12 @@ 멀티형 8,10,12열 컨베어/스틱 계량기 */ +@ Ver 11.4.6 by LSJ + - 2025.08.14 + - Ver 11.4.5 Modify + - Framework : SmartX Framework V3.1.1(update: 2019.03.21) + - 리스트 화면 라벨 색상 변경 + @ Ver 11.4.5 by LSJ - 2024.10.10 - Ver 11.4.4 Modify