SJ84
/
INT63DC_2C
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'B_8.7.0' 

# Conflicts:
#	INT63DC_2C/DataStore.cs
#	INT63DC_2C/Forms/FormMenu.cs
master
DESKTOP-S459P9R\LSJ 2025-10-20 09:41:58 +09:00
parent 0a2d41bfe6 7edf0a1e97
commit 87a9b03411
12 changed files with 688 additions and 688 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
INT63DC_2C.suo
View File

Binary file not shown.

21
INT63DC_2C/DataStore.cs
View File

@ -807,6 +807,7 @@ namespace INT63DC_2C
private bool m_IsLeakSamplingRun; private bool m_IsLeakSamplingRun;
private bool m_IsLeakSamplingOnce; private bool m_IsLeakSamplingOnce;
private bool m_IsOptPart11; private bool m_IsOptPart11;
private bool m_IsSorterCheckEnable;
private int m_DecimalPlaces; private int m_DecimalPlaces;
private int m_EquipmentColumns; private int m_EquipmentColumns;
@ -932,6 +933,11 @@ namespace INT63DC_2C
get { return this.m_IsOptPart11; } get { return this.m_IsOptPart11; }
set { this.m_IsOptPart11 = value; } set { this.m_IsOptPart11 = value; }
} }
public bool IsSorterCheckEnable
{
get { return this.m_IsSorterCheckEnable; }
set { this.m_IsSorterCheckEnable = value; }
}
public int DecimalPlaces public int DecimalPlaces
{ {
@ -1116,6 +1122,7 @@ namespace INT63DC_2C
this.IsLeakSamplingRun = false; this.IsLeakSamplingRun = false;
this.IsLeakSamplingOnce = true; this.IsLeakSamplingOnce = true;
this.IsOptPart11 = false; this.IsOptPart11 = false;
this.IsSorterCheckEnable = false;
this.DecimalPlaces = 1; this.DecimalPlaces = 1;
this.EquipmentColumns = 10; this.EquipmentColumns = 10;
@ -1165,7 +1172,7 @@ namespace INT63DC_2C
public bool IsLogin; public bool IsLogin;
public bool IsWeightViewForward; public bool IsWeightViewForward;
public bool IsOptDataStatistics; public bool IsOptDataStatistics;
public bool DummyBool5; public bool IsSorterCheckEnable;
public bool DummyBool6; public bool DummyBool6;
public bool DummyBool7; public bool DummyBool7;
@ -2715,11 +2722,11 @@ namespace INT63DC_2C
else else
this.IsAlignError = true; this.IsAlignError = true;
#endregion #endregion
#region 알람 14-선별기2 에러 #region 알람 14-선별기1 에러
if (sValue4[2] == '0') if (sValue4[2] == '0')
this.IsSorter2Error = false; this.IsSorter1Error = false;
else else
this.IsSorter2Error = true; this.IsSorter1Error = true;
#endregion #endregion
#region 알람 13- #region 알람 13-
if (sValue4[3] == '0') if (sValue4[3] == '0')
@ -2759,11 +2766,11 @@ namespace INT63DC_2C
else else
this.IsEmergencyStop = true; this.IsEmergencyStop = true;
#endregion #endregion
#region 알람 7-선별기1 에러 #region 알람 7-선별기2 에러
if (sValue2[1] == '0') if (sValue2[1] == '0')
this.IsSorter1Error = false; this.IsSorter2Error = false;
else else
this.IsSorter1Error = true; this.IsSorter2Error = true;
#endregion #endregion
#region 알람 6- #region 알람 6-
if (sValue2[2] == '0') if (sValue2[2] == '0')

2
INT63DC_2C/Forms/FormFactoryInitialize.cs
View File

@ -130,7 +130,7 @@ namespace INT63DC_2C.Forms
structItem1.IsLogin = this.ParentForm.SystemConfig.IsLogin; structItem1.IsLogin = this.ParentForm.SystemConfig.IsLogin;
structItem1.IsWeightViewForward = this.ParentForm.SystemConfig.IsWeightViewForward; structItem1.IsWeightViewForward = this.ParentForm.SystemConfig.IsWeightViewForward;
structItem1.IsOptDataStatistics = this.ParentForm.SystemConfig.IsOptDataStatistics; structItem1.IsOptDataStatistics = this.ParentForm.SystemConfig.IsOptDataStatistics;
structItem1.DummyBool5 = false; structItem1.IsSorterCheckEnable = false;
structItem1.DummyBool6 = false; structItem1.DummyBool6 = false;
structItem1.DummyBool7 = false; structItem1.DummyBool7 = false;

2
INT63DC_2C/Forms/FormInformation.cs
View File

@ -154,7 +154,7 @@ namespace INT63DC_2C.Forms
} }
private void DefaultSetting() private void DefaultSetting()
{ {
this.labelDisplayVer.Text = "8.7.0"; this.labelDisplayVer.Text = "8.8.0";
this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber; this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber;
this.textBoxSerialNo.Location = new Point(395, 225); this.textBoxSerialNo.Location = new Point(395, 225);
this.textBoxSerialNo.Visible = false; this.textBoxSerialNo.Visible = false;

12
INT63DC_2C/Forms/FormMain.cs
View File

@ -513,8 +513,11 @@ namespace INT63DC_2C.Forms
sb.Append(Helper.StringZeroFillDigits4(item.EmptyWeight)); sb.Append(Helper.StringZeroFillDigits4(item.EmptyWeight));
// 모터 // 모터
sb.Append(Helper.StringZeroFillDigits4(item.MotorSelect.ToString())); sb.Append(Helper.StringZeroFillDigits4(item.MotorSelect.ToString()));
// Dummy // 선별부 동작감지 사용 여부
sb.Append(Helper.StringZeroFillDigits4("0")); if (item.IsSorterCheckEnable == false)
sb.Append(Helper.StringZeroFillDigits4("0"));
else
sb.Append(Helper.StringZeroFillDigits4("1"));
// Dummy // Dummy
sb.Append(Helper.StringZeroFillDigits4("0")); sb.Append(Helper.StringZeroFillDigits4("0"));
// 인버터 토크 // 인버터 토크
@ -2297,7 +2300,7 @@ namespace INT63DC_2C.Forms
structItem.IsLogin = this.SystemConfig.IsLogin; structItem.IsLogin = this.SystemConfig.IsLogin;
structItem.IsWeightViewForward = this.SystemConfig.IsWeightViewForward; structItem.IsWeightViewForward = this.SystemConfig.IsWeightViewForward;
structItem.IsOptDataStatistics = this.SystemConfig.IsOptDataStatistics; structItem.IsOptDataStatistics = this.SystemConfig.IsOptDataStatistics;
structItem.DummyBool5 = false; structItem.IsSorterCheckEnable = this.SystemConfig.IsSorterCheckEnable;
structItem.DummyBool6 = false; structItem.DummyBool6 = false;
structItem.DummyBool7 = false; structItem.DummyBool7 = false;
@ -2359,7 +2362,7 @@ namespace INT63DC_2C.Forms
structItem.IsLogin = item.IsLogin; structItem.IsLogin = item.IsLogin;
structItem.IsWeightViewForward = item.IsWeightViewForward; structItem.IsWeightViewForward = item.IsWeightViewForward;
structItem.IsOptDataStatistics = item.IsOptDataStatistics; structItem.IsOptDataStatistics = item.IsOptDataStatistics;
structItem.DummyBool5 = false; structItem.IsSorterCheckEnable = item.IsSorterCheckEnable;
structItem.DummyBool6 = false; structItem.DummyBool6 = false;
structItem.DummyBool7 = false; structItem.DummyBool7 = false;
@ -2426,6 +2429,7 @@ namespace INT63DC_2C.Forms
this.SystemConfig.IsLogin = structItem.IsLogin; this.SystemConfig.IsLogin = structItem.IsLogin;
this.SystemConfig.IsWeightViewForward = structItem.IsWeightViewForward; this.SystemConfig.IsWeightViewForward = structItem.IsWeightViewForward;
this.SystemConfig.IsOptDataStatistics = structItem.IsOptDataStatistics; this.SystemConfig.IsOptDataStatistics = structItem.IsOptDataStatistics;
this.SystemConfig.IsSorterCheckEnable = structItem.IsSorterCheckEnable;
this.SystemConfig.DecimalPlaces = structItem.DecimalPlaces; this.SystemConfig.DecimalPlaces = structItem.DecimalPlaces;
this.SystemConfig.EquipmentColumns = structItem.EquipmentColumns; this.SystemConfig.EquipmentColumns = structItem.EquipmentColumns;

5
INT63DC_2C/Forms/FormMenu.cs
View File

@ -676,6 +676,9 @@ namespace INT63DC_2C.Forms
#region Event Handler #region Event Handler
private void buttonBack_Click(object sender, EventArgs e) private void buttonBack_Click(object sender, EventArgs e)
{ {
if (this.ParentForm.SystemConfig.IsLogin == false)
this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.NotLogin;
this.ParentForm.ChildFormMainDisplay.DisplayRefresh(); this.ParentForm.ChildFormMainDisplay.DisplayRefresh();
((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormMainDisplay); ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormMainDisplay);
} }
@ -823,6 +826,8 @@ namespace INT63DC_2C.Forms
{ {
if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Developer) if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Developer)
{ {
this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Level4Developer;
if (this.buttonEquipmentTest.Visible != true) if (this.buttonEquipmentTest.Visible != true)
this.buttonEquipmentTest.Visible = true; this.buttonEquipmentTest.Visible = true;
if (this.buttonOptionSetting.Visible != true) if (this.buttonOptionSetting.Visible != true)

123
INT63DC_2C/Forms/FormOptionSetting.Designer.cs generated
View File

@ -32,8 +32,6 @@
this.smartForm1 = new SmartX.SmartForm(); this.smartForm1 = new SmartX.SmartForm();
this.buttonBack = new SmartX.SmartButton(); this.buttonBack = new SmartX.SmartButton();
this.labelTitle = new SmartX.SmartLabel(); this.labelTitle = new SmartX.SmartLabel();
this.buttonFeedbackUse = new SmartX.SmartButton();
this.smartLabel4 = new SmartX.SmartLabel();
this.smartGroupBox1 = new SmartX.SmartGroupBox(); this.smartGroupBox1 = new SmartX.SmartGroupBox();
this.smartGroupBox2 = new SmartX.SmartGroupBox(); this.smartGroupBox2 = new SmartX.SmartGroupBox();
this.labelInfo4 = new SmartX.SmartLabel(); this.labelInfo4 = new SmartX.SmartLabel();
@ -44,6 +42,8 @@
this.labelBuadrateWarning2 = new SmartX.SmartLabel(); this.labelBuadrateWarning2 = new SmartX.SmartLabel();
this.labelBuadrateWarning = new SmartX.SmartLabel(); this.labelBuadrateWarning = new SmartX.SmartLabel();
this.buttonSave = new SmartX.SmartButton(); this.buttonSave = new SmartX.SmartButton();
this.buttonSorterCheckEnable = new SmartX.SmartButton();
this.labelStaticSorterCheckEnable = new SmartX.SmartLabel();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.smartGroupBox1.SuspendLayout(); this.smartGroupBox1.SuspendLayout();
this.smartGroupBox2.SuspendLayout(); this.smartGroupBox2.SuspendLayout();
@ -114,58 +114,6 @@
this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitle.Wordwrap = false; this.labelTitle.Wordwrap = false;
// //
// buttonFeedbackUse
//
this.buttonFeedbackUse.BackPictureBox = null;
this.buttonFeedbackUse.BackPictureBox1 = null;
this.buttonFeedbackUse.BackPictureBox2 = null;
this.buttonFeedbackUse.ButtonColor = System.Drawing.Color.Gray;
this.buttonFeedbackUse.ButtonImageAutoSize = true;
this.buttonFeedbackUse.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonFeedbackUse.DisableImage = null;
this.buttonFeedbackUse.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonFeedbackUse.DownImage")));
this.buttonFeedbackUse.GroupID = 0;
this.buttonFeedbackUse.InitVisible = true;
this.buttonFeedbackUse.Location = new System.Drawing.Point(253, 46);
this.buttonFeedbackUse.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonFeedbackUse.Name = "buttonFeedbackUse";
this.buttonFeedbackUse.NestedClickEventPrevent = false;
this.buttonFeedbackUse.OutlinePixel = 1;
this.buttonFeedbackUse.RepeatInterval = 200;
this.buttonFeedbackUse.RepeatIntervalAccelerate = null;
this.buttonFeedbackUse.SafeInterval = 200;
this.buttonFeedbackUse.Size = new System.Drawing.Size(84, 25);
this.buttonFeedbackUse.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonFeedbackUse.TabIndex = 204;
this.buttonFeedbackUse.TextColor = System.Drawing.Color.Black;
this.buttonFeedbackUse.TextDownColor = System.Drawing.Color.White;
this.buttonFeedbackUse.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.buttonFeedbackUse.TextLocation = new System.Drawing.Point(0, 0);
this.buttonFeedbackUse.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonFeedbackUse.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonFeedbackUse.UpImage")));
this.buttonFeedbackUse.Visible = false;
this.buttonFeedbackUse.Click += new System.EventHandler(this.buttonFeedbackUse_Click);
//
// smartLabel4
//
this.smartLabel4.BackPictureBox = this.smartForm1;
this.smartLabel4.BackPictureBox1 = null;
this.smartLabel4.BackPictureBox2 = null;
this.smartLabel4.BorderColor = System.Drawing.Color.Black;
this.smartLabel4.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.smartLabel4.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.smartLabel4.InitVisible = true;
this.smartLabel4.LineSpacing = 0F;
this.smartLabel4.Location = new System.Drawing.Point(47, 46);
this.smartLabel4.Name = "smartLabel4";
this.smartLabel4.Size = new System.Drawing.Size(200, 25);
this.smartLabel4.TabIndex = 203;
this.smartLabel4.Text = "Feedback Board";
this.smartLabel4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
this.smartLabel4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.smartLabel4.Visible = false;
this.smartLabel4.Wordwrap = false;
//
// smartGroupBox1 // smartGroupBox1
// //
this.smartGroupBox1.BackPictureBox = this.smartForm1; this.smartGroupBox1.BackPictureBox = this.smartForm1;
@ -194,13 +142,13 @@
// //
this.smartGroupBox2.BackPictureBox = this.smartForm1; this.smartGroupBox2.BackPictureBox = this.smartForm1;
this.smartGroupBox2.BackPictureBox1 = null; this.smartGroupBox2.BackPictureBox1 = null;
this.smartGroupBox2.Controls.Add(this.buttonSorterCheckEnable);
this.smartGroupBox2.Controls.Add(this.labelStaticSorterCheckEnable);
this.smartGroupBox2.Controls.Add(this.labelInfo4); this.smartGroupBox2.Controls.Add(this.labelInfo4);
this.smartGroupBox2.Controls.Add(this.buttonSorter4Location); this.smartGroupBox2.Controls.Add(this.buttonSorter4Location);
this.smartGroupBox2.Controls.Add(this.labelStaticSorter4Location); this.smartGroupBox2.Controls.Add(this.labelStaticSorter4Location);
this.smartGroupBox2.Controls.Add(this.buttonDataStatistics); this.smartGroupBox2.Controls.Add(this.buttonDataStatistics);
this.smartGroupBox2.Controls.Add(this.smartLabel1); this.smartGroupBox2.Controls.Add(this.smartLabel1);
this.smartGroupBox2.Controls.Add(this.buttonFeedbackUse);
this.smartGroupBox2.Controls.Add(this.smartLabel4);
this.smartGroupBox2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); this.smartGroupBox2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.smartGroupBox2.FrameLineColor1 = System.Drawing.Color.Black; this.smartGroupBox2.FrameLineColor1 = System.Drawing.Color.Black;
this.smartGroupBox2.FrameLineColor2 = System.Drawing.Color.Black; this.smartGroupBox2.FrameLineColor2 = System.Drawing.Color.Black;
@ -208,10 +156,10 @@
this.smartGroupBox2.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle; this.smartGroupBox2.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle;
this.smartGroupBox2.Image = null; this.smartGroupBox2.Image = null;
this.smartGroupBox2.InitVisible = true; this.smartGroupBox2.InitVisible = true;
this.smartGroupBox2.Location = new System.Drawing.Point(186, 204); this.smartGroupBox2.Location = new System.Drawing.Point(118, 204);
this.smartGroupBox2.Name = "smartGroupBox2"; this.smartGroupBox2.Name = "smartGroupBox2";
this.smartGroupBox2.RoundRadius = 10; this.smartGroupBox2.RoundRadius = 10;
this.smartGroupBox2.Size = new System.Drawing.Size(668, 182); this.smartGroupBox2.Size = new System.Drawing.Size(822, 221);
this.smartGroupBox2.TabIndex = 210; this.smartGroupBox2.TabIndex = 210;
this.smartGroupBox2.Text = "Option"; this.smartGroupBox2.Text = "Option";
this.smartGroupBox2.TextColor = System.Drawing.Color.Black; this.smartGroupBox2.TextColor = System.Drawing.Color.Black;
@ -230,7 +178,7 @@
this.labelInfo4.LineSpacing = 0F; this.labelInfo4.LineSpacing = 0F;
this.labelInfo4.Location = new System.Drawing.Point(343, 108); this.labelInfo4.Location = new System.Drawing.Point(343, 108);
this.labelInfo4.Name = "labelInfo4"; this.labelInfo4.Name = "labelInfo4";
this.labelInfo4.Size = new System.Drawing.Size(300, 25); this.labelInfo4.Size = new System.Drawing.Size(450, 25);
this.labelInfo4.TabIndex = 268; this.labelInfo4.TabIndex = 268;
this.labelInfo4.Text = "※ 리크디텍터 선별(위치 1 고정)"; this.labelInfo4.Text = "※ 리크디텍터 선별(위치 1 고정)";
this.labelInfo4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelInfo4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -281,7 +229,7 @@
this.labelStaticSorter4Location.LineSpacing = 0F; this.labelStaticSorter4Location.LineSpacing = 0F;
this.labelStaticSorter4Location.Location = new System.Drawing.Point(47, 108); this.labelStaticSorter4Location.Location = new System.Drawing.Point(47, 108);
this.labelStaticSorter4Location.Name = "labelStaticSorter4Location"; this.labelStaticSorter4Location.Name = "labelStaticSorter4Location";
this.labelStaticSorter4Location.Size = new System.Drawing.Size(181, 25); this.labelStaticSorter4Location.Size = new System.Drawing.Size(200, 25);
this.labelStaticSorter4Location.TabIndex = 266; this.labelStaticSorter4Location.TabIndex = 266;
this.labelStaticSorter4Location.Text = "선별기4 위치"; this.labelStaticSorter4Location.Text = "선별기4 위치";
this.labelStaticSorter4Location.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; this.labelStaticSorter4Location.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@ -411,6 +359,57 @@
this.buttonSave.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonSave.UpImage"))); this.buttonSave.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonSave.UpImage")));
this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
// //
// buttonSorterCheckEnable
//
this.buttonSorterCheckEnable.BackPictureBox = null;
this.buttonSorterCheckEnable.BackPictureBox1 = null;
this.buttonSorterCheckEnable.BackPictureBox2 = null;
this.buttonSorterCheckEnable.ButtonColor = System.Drawing.Color.Gray;
this.buttonSorterCheckEnable.ButtonImageAutoSize = true;
this.buttonSorterCheckEnable.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonSorterCheckEnable.DisableImage = null;
this.buttonSorterCheckEnable.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonSorterCheckEnable.DownImage")));
this.buttonSorterCheckEnable.GroupID = 0;
this.buttonSorterCheckEnable.InitVisible = true;
this.buttonSorterCheckEnable.Location = new System.Drawing.Point(253, 139);
this.buttonSorterCheckEnable.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonSorterCheckEnable.Name = "buttonSorterCheckEnable";
this.buttonSorterCheckEnable.NestedClickEventPrevent = false;
this.buttonSorterCheckEnable.OutlinePixel = 1;
this.buttonSorterCheckEnable.RepeatInterval = 200;
this.buttonSorterCheckEnable.RepeatIntervalAccelerate = null;
this.buttonSorterCheckEnable.SafeInterval = 200;
this.buttonSorterCheckEnable.Size = new System.Drawing.Size(84, 25);
this.buttonSorterCheckEnable.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonSorterCheckEnable.TabIndex = 270;
this.buttonSorterCheckEnable.TextColor = System.Drawing.Color.Black;
this.buttonSorterCheckEnable.TextDownColor = System.Drawing.Color.White;
this.buttonSorterCheckEnable.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.buttonSorterCheckEnable.TextLocation = new System.Drawing.Point(0, 0);
this.buttonSorterCheckEnable.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonSorterCheckEnable.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonSorterCheckEnable.UpImage")));
this.buttonSorterCheckEnable.Click += new System.EventHandler(this.buttonSorterCheckEnable_Click);
//
// labelStaticSorterCheckEnable
//
this.labelStaticSorterCheckEnable.BackPictureBox = this.smartForm1;
this.labelStaticSorterCheckEnable.BackPictureBox1 = null;
this.labelStaticSorterCheckEnable.BackPictureBox2 = null;
this.labelStaticSorterCheckEnable.BorderColor = System.Drawing.Color.Black;
this.labelStaticSorterCheckEnable.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelStaticSorterCheckEnable.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold);
this.labelStaticSorterCheckEnable.ForeColor = System.Drawing.Color.Black;
this.labelStaticSorterCheckEnable.InitVisible = true;
this.labelStaticSorterCheckEnable.LineSpacing = 0F;
this.labelStaticSorterCheckEnable.Location = new System.Drawing.Point(47, 139);
this.labelStaticSorterCheckEnable.Name = "labelStaticSorterCheckEnable";
this.labelStaticSorterCheckEnable.Size = new System.Drawing.Size(200, 25);
this.labelStaticSorterCheckEnable.TabIndex = 269;
this.labelStaticSorterCheckEnable.Text = "선별부 동작감지";
this.labelStaticSorterCheckEnable.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
this.labelStaticSorterCheckEnable.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelStaticSorterCheckEnable.Wordwrap = false;
//
// FormOptionSetting // FormOptionSetting
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@ -433,8 +432,6 @@
private SmartX.SmartForm smartForm1; private SmartX.SmartForm smartForm1;
private SmartX.SmartButton buttonBack; private SmartX.SmartButton buttonBack;
private SmartX.SmartLabel labelTitle; private SmartX.SmartLabel labelTitle;
private SmartX.SmartButton buttonFeedbackUse;
private SmartX.SmartLabel smartLabel4;
private SmartX.SmartGroupBox smartGroupBox1; private SmartX.SmartGroupBox smartGroupBox1;
private SmartX.SmartButton buttonDataStatistics; private SmartX.SmartButton buttonDataStatistics;
private SmartX.SmartLabel smartLabel1; private SmartX.SmartLabel smartLabel1;
@ -445,5 +442,7 @@
private SmartX.SmartLabel labelInfo4; private SmartX.SmartLabel labelInfo4;
private SmartX.SmartButton buttonSorter4Location; private SmartX.SmartButton buttonSorter4Location;
private SmartX.SmartLabel labelStaticSorter4Location; private SmartX.SmartLabel labelStaticSorter4Location;
private SmartX.SmartButton buttonSorterCheckEnable;
private SmartX.SmartLabel labelStaticSorterCheckEnable;
} }
} }

26
INT63DC_2C/Forms/FormOptionSetting.cs
View File

@ -79,9 +79,6 @@ namespace INT63DC_2C.Forms
this.labelStaticSorter4Location.Text = "分类机4 地点"; this.labelStaticSorter4Location.Text = "分类机4 地点";
this.labelInfo4.Text = "※ 泄漏检测器选择 (固定为位置1)"; this.labelInfo4.Text = "※ 泄漏检测器选择 (固定为位置1)";
this.buttonFeedbackUse.DownImage = this.buttonDataStatistics.DownImage = this.buttonSorter4Location.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnOn_84X25));
this.buttonFeedbackUse.UpImage = this.buttonDataStatistics.UpImage = this.buttonSorter4Location.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnOff_84X25));
this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnSaveDisable)); this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnSaveDisable));
this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnSaveDown)); this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnSaveDown));
this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnSaveUp)); this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnSaveUp));
@ -196,12 +193,6 @@ namespace INT63DC_2C.Forms
} }
private void buttonSave_Click(object sender, EventArgs e) private void buttonSave_Click(object sender, EventArgs e)
{ {
//// 피드백 보드 사용 유무
//if (this.buttonFeedbackUse.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
// this.ParentForm.SystemConfig.IsOptFeedbackBoardUse = true;
//else
// this.ParentForm.SystemConfig.IsOptFeedbackBoardUse = false;
// 데이터 통계 기능 사용 유무 // 데이터 통계 기능 사용 유무
if (this.buttonDataStatistics.ButtonStatus == SmartButton.BUTSTATUS.DOWN) if (this.buttonDataStatistics.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
this.ParentForm.SystemConfig.IsOptDataStatistics = true; this.ParentForm.SystemConfig.IsOptDataStatistics = true;
@ -209,16 +200,23 @@ namespace INT63DC_2C.Forms
this.ParentForm.SystemConfig.IsOptDataStatistics = false; this.ParentForm.SystemConfig.IsOptDataStatistics = false;
// 선별기4 위치 // 선별기4 위치
if (this.buttonSorter4Location.ButtonStatus == SmartX.SmartButton.BUTSTATUS.UP) if (this.buttonSorter4Location.ButtonStatus == SmartButton.BUTSTATUS.UP)
this.ParentForm.SystemConfig.Sorter4Location = 0; this.ParentForm.SystemConfig.Sorter4Location = 0;
else else
this.ParentForm.SystemConfig.Sorter4Location = 1; this.ParentForm.SystemConfig.Sorter4Location = 1;
// 선별부 동작 감지 사용 여부
if (this.buttonSorterCheckEnable.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
this.ParentForm.SystemConfig.IsSorterCheckEnable = true;
else
this.ParentForm.SystemConfig.IsSorterCheckEnable = false;
this.ParentForm.SaveSystemConfigurationFile1(this.ParentForm.SystemConfig); this.ParentForm.SaveSystemConfigurationFile1(this.ParentForm.SystemConfig);
this.ParentForm.SaveSystemConfigurationFile2(this.ParentForm.SystemConfig); this.ParentForm.SaveSystemConfigurationFile2(this.ParentForm.SystemConfig);
this.smartGroupBox1.Enabled = false; this.smartGroupBox1.Enabled = false;
this.buttonBack.Visible = false; this.buttonBack.Visible = false;
this.buttonSave.Visible = false;
} }
private void buttonDataStatistics_Click(object sender, EventArgs e) private void buttonDataStatistics_Click(object sender, EventArgs e)
{ {
@ -234,15 +232,15 @@ namespace INT63DC_2C.Forms
if (this.buttonSave.Visible == false) if (this.buttonSave.Visible == false)
this.buttonSave.Visible = true; this.buttonSave.Visible = true;
}
private void buttonFeedbackUse_Click(object sender, EventArgs e)
{
} }
private void buttonSorter4Location_Click(object sender, EventArgs e) private void buttonSorter4Location_Click(object sender, EventArgs e)
{ {
this.buttonSave.Visible = true; this.buttonSave.Visible = true;
} }
private void buttonSorterCheckEnable_Click(object sender, EventArgs e)
{
this.buttonSave.Visible = true;
}
#endregion #endregion
} }
} }

1119
INT63DC_2C/Forms/FormOptionSetting.resx
View File

File diff suppressed because it is too large Load Diff

64
INT63DC_2C/INT63DC_2C.csproj
View File

@ -335,12 +335,6 @@
<Compile Include="Controls\ControlMainDisplayTable15.Designer.cs"> <Compile Include="Controls\ControlMainDisplayTable15.Designer.cs">
<DependentUpon>ControlMainDisplayTable15.cs</DependentUpon> <DependentUpon>ControlMainDisplayTable15.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\ControlUserSetting.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Controls\ControlUserSetting.designer.cs">
<DependentUpon>ControlUserSetting.cs</DependentUpon>
</Compile>
<Compile Include="DataStore.cs" /> <Compile Include="DataStore.cs" />
<Compile Include="DialogForms\DialogFormDataStatistics.cs"> <Compile Include="DialogForms\DialogFormDataStatistics.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
@ -348,18 +342,6 @@
<Compile Include="DialogForms\DialogFormDataStatistics.designer.cs"> <Compile Include="DialogForms\DialogFormDataStatistics.designer.cs">
<DependentUpon>DialogFormDataStatistics.cs</DependentUpon> <DependentUpon>DialogFormDataStatistics.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="DialogForms\DialogFormDataViewerFilter.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DialogForms\DialogFormDataViewerFilter.designer.cs">
<DependentUpon>DialogFormDataViewerFilter.cs</DependentUpon>
</Compile>
<Compile Include="DialogForms\DialogFormHistoryData.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DialogForms\DialogFormHistoryData.designer.cs">
<DependentUpon>DialogFormHistoryData.cs</DependentUpon>
</Compile>
<Compile Include="DialogForms\DialogFormLogOn.cs"> <Compile Include="DialogForms\DialogFormLogOn.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
@ -390,12 +372,6 @@
<Compile Include="DialogForms\DialogFormPasswordKeyPad.Designer.cs"> <Compile Include="DialogForms\DialogFormPasswordKeyPad.Designer.cs">
<DependentUpon>DialogFormPasswordKeyPad.cs</DependentUpon> <DependentUpon>DialogFormPasswordKeyPad.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="DialogForms\DialogFormUserEditorKeyboard.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DialogForms\DialogFormUserEditorKeyboard.designer.cs">
<DependentUpon>DialogFormUserEditorKeyboard.cs</DependentUpon>
</Compile>
<Compile Include="DialogForms\DialogFormYesNo.cs"> <Compile Include="DialogForms\DialogFormYesNo.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
@ -420,24 +396,12 @@
<Compile Include="Forms\FormDataBackup.Designer.cs"> <Compile Include="Forms\FormDataBackup.Designer.cs">
<DependentUpon>FormDataBackup.cs</DependentUpon> <DependentUpon>FormDataBackup.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Forms\FormDataBackup_Part11.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\FormDataBackup_Part11.designer.cs">
<DependentUpon>FormDataBackup_Part11.cs</DependentUpon>
</Compile>
<Compile Include="Forms\FormDataStatistics.cs"> <Compile Include="Forms\FormDataStatistics.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="Forms\FormDataStatistics.designer.cs"> <Compile Include="Forms\FormDataStatistics.designer.cs">
<DependentUpon>FormDataStatistics.cs</DependentUpon> <DependentUpon>FormDataStatistics.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Forms\FormDataViewer.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\FormDataViewer.designer.cs">
<DependentUpon>FormDataViewer.cs</DependentUpon>
</Compile>
<Compile Include="Forms\FormEquipmentSetting.cs"> <Compile Include="Forms\FormEquipmentSetting.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
@ -516,20 +480,18 @@
<Compile Include="Forms\FormTimeSetting.Designer.cs"> <Compile Include="Forms\FormTimeSetting.Designer.cs">
<DependentUpon>FormTimeSetting.cs</DependentUpon> <DependentUpon>FormTimeSetting.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Forms\FormUserEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\FormUserEditor.designer.cs">
<DependentUpon>FormUserEditor.cs</DependentUpon>
</Compile>
<Compile Include="Forms\FormUserGroupEditor.cs"> <Compile Include="Forms\FormUserGroupEditor.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="Forms\FormUserGroupEditor.designer.cs"> <Compile Include="Forms\FormUserGroupEditor.designer.cs">
<DependentUpon>FormUserGroupEditor.cs</DependentUpon> <DependentUpon>FormUserGroupEditor.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Forms\FormUserSetting.cs">
</Compile>
<Compile Include="Forms\FormUserSetting.Designer.cs">
<DependentUpon>FormUserSetting.cs</DependentUpon>
</Compile>
<Compile Include="Helper.cs" /> <Compile Include="Helper.cs" />
<Compile Include="IniFile.cs" />
<Compile Include="IntechGraphics.cs" /> <Compile Include="IntechGraphics.cs" />
<Compile Include="Part11_Encryption\Encryption.cs" /> <Compile Include="Part11_Encryption\Encryption.cs" />
<Compile Include="Part11_Encryption\Encryption.Define.cs" /> <Compile Include="Part11_Encryption\Encryption.Define.cs" />
@ -760,18 +722,10 @@
<DependentUpon>FormDataBackup.cs</DependentUpon> <DependentUpon>FormDataBackup.cs</DependentUpon>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Forms\FormDataBackup_Part11.resx">
<DependentUpon>FormDataBackup_Part11.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Forms\FormDataStatistics.resx"> <EmbeddedResource Include="Forms\FormDataStatistics.resx">
<DependentUpon>FormDataStatistics.cs</DependentUpon> <DependentUpon>FormDataStatistics.cs</DependentUpon>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Forms\FormDataViewer.resx">
<DependentUpon>FormDataViewer.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Forms\FormEquipmentSetting.resx"> <EmbeddedResource Include="Forms\FormEquipmentSetting.resx">
<DependentUpon>FormEquipmentSetting.cs</DependentUpon> <DependentUpon>FormEquipmentSetting.cs</DependentUpon>
<SubType>Designer</SubType> <SubType>Designer</SubType>
@ -824,14 +778,14 @@
<DependentUpon>FormTimeSetting.cs</DependentUpon> <DependentUpon>FormTimeSetting.cs</DependentUpon>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Forms\FormUserEditor.resx">
<DependentUpon>FormUserEditor.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Forms\FormUserGroupEditor.resx"> <EmbeddedResource Include="Forms\FormUserGroupEditor.resx">
<DependentUpon>FormUserGroupEditor.cs</DependentUpon> <DependentUpon>FormUserGroupEditor.cs</DependentUpon>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Forms\FormUserSetting.resx">
<DependentUpon>FormUserSetting.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx"> <EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput> <LastGenOutput>Resources.Designer.cs</LastGenOutput>

BIN
INT63DC_2C/Version.txt
View File

Binary file not shown.

BIN
INT63DC_ImageDll/obj/Debug/Refactor/INT63DC_ImageDll.dll
View File

Binary file not shown.