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

Compare commits

base: SJ84:b96a328903deda8035d85f87dd1d04e5b324ddd3
Branches Tags
SJ84:main
..
compare: SJ84:57545ce003225fa220b68b2762c7ea5c527ad69a
Branches Tags
SJ84:main

No commits in common. "b96a328903deda8035d85f87dd1d04e5b324ddd3" and "57545ce003225fa220b68b2762c7ea5c527ad69a" have entirely different histories.
b96a328903 ... 57545ce003

11 changed files with 12273 additions and 11406 deletions
Show Stats Expand all files Collapse all files

BIN
INT63DC_6CH.suo 100644
View File

Binary file not shown.

7
INT63DC_6CH/Controls/ControlCalibration10.cs
View File

@ -119,7 +119,7 @@ namespace INT63DC_6CH.Controls
this.ParentForm.CalibrationButtonEnable(false, false, true); this.ParentForm.CalibrationButtonEnable(false, false, true);
} }
public void CalibrationStart(bool autoMode) public void CalibrationStart()
{ {
string detail = ""; string detail = "";
@ -130,10 +130,7 @@ namespace INT63DC_6CH.Controls
{ {
if (this.CollButtonLane[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN) if (this.CollButtonLane[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN)
{ {
if (autoMode == true) this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLane[i].Tag.ToString());
this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStartAutoMode, this.CollButtonLane[i].Tag.ToString());
else
this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLane[i].Tag.ToString());
// Part 11 // Part 11
if (this.ParentForm.ParentForm.SystemConfig.IsOptPart11 == true) if (this.ParentForm.ParentForm.SystemConfig.IsOptPart11 == true)

7
INT63DC_6CH/Controls/ControlCalibration12.cs
View File

@ -123,7 +123,7 @@ namespace INT63DC_6CH.Controls
this.ParentForm.CalibrationButtonEnable(false, false, true); this.ParentForm.CalibrationButtonEnable(false, false, true);
} }
public void CalibrationStart(bool autoMode) public void CalibrationStart()
{ {
string detail = ""; string detail = "";
@ -134,10 +134,7 @@ namespace INT63DC_6CH.Controls
{ {
if (this.CollButtonLane[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN) if (this.CollButtonLane[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN)
{ {
if (autoMode == true) this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLane[i].Tag.ToString());
this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStartAutoMode, this.CollButtonLane[i].Tag.ToString());
else
this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLane[i].Tag.ToString());
// Part 11 // Part 11
if (this.ParentForm.ParentForm.SystemConfig.IsOptPart11 == true) if (this.ParentForm.ParentForm.SystemConfig.IsOptPart11 == true)

7
INT63DC_6CH/Controls/ControlCalibration6.cs
View File

@ -111,7 +111,7 @@ namespace INT63DC_6CH.Controls
this.ParentForm.CalibrationButtonEnable(false, false, true); this.ParentForm.CalibrationButtonEnable(false, false, true);
} }
public void CalibrationStart(bool autoMode) public void CalibrationStart()
{ {
string detail = ""; string detail = "";
@ -122,10 +122,7 @@ namespace INT63DC_6CH.Controls
{ {
if (this.CollButtonLane[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN) if (this.CollButtonLane[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN)
{ {
if (autoMode == true) this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLane[i].Tag.ToString());
this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStartAutoMode, this.CollButtonLane[i].Tag.ToString());
else
this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLane[i].Tag.ToString());
// Part 11 // Part 11
if (this.ParentForm.ParentForm.SystemConfig.IsOptPart11 == true) if (this.ParentForm.ParentForm.SystemConfig.IsOptPart11 == true)

21668
INT63DC_6CH/Controls/ControlCalibration6.resx
View File

File diff suppressed because it is too large Load Diff

7
INT63DC_6CH/Controls/ControlCalibration7.cs
View File

@ -112,7 +112,7 @@ namespace INT63DC_6CH.Controls
this.ParentForm.CalibrationButtonEnable(false, false, true); this.ParentForm.CalibrationButtonEnable(false, false, true);
} }
public void CalibrationStart(bool autoMode) public void CalibrationStart()
{ {
string detail = ""; string detail = "";
@ -123,10 +123,7 @@ namespace INT63DC_6CH.Controls
{ {
if (this.CollButtonLane[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) if (this.CollButtonLane[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN)
{ {
if (autoMode == true) this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLane[i].Tag.ToString());
this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStartAutoMode, this.CollButtonLane[i].Tag.ToString());
else
this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLane[i].Tag.ToString());
// Part 11 // Part 11
if (this.ParentForm.ParentForm.SystemConfig.IsOptPart11 == true) if (this.ParentForm.ParentForm.SystemConfig.IsOptPart11 == true)

7
INT63DC_6CH/Controls/ControlCalibration8.cs
View File

@ -115,7 +115,7 @@ namespace INT63DC_6CH.Controls
this.ParentForm.CalibrationButtonEnable(false, false, true); this.ParentForm.CalibrationButtonEnable(false, false, true);
} }
public void CalibrationStart(bool autoMode) public void CalibrationStart()
{ {
string detail = ""; string detail = "";
@ -126,10 +126,7 @@ namespace INT63DC_6CH.Controls
{ {
if (this.CollButtonLane[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN) if (this.CollButtonLane[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN)
{ {
if (autoMode == true) this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLane[i].Tag.ToString());
this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStartAutoMode, this.CollButtonLane[i].Tag.ToString());
else
this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLane[i].Tag.ToString());
// Part 11 // Part 11
if (this.ParentForm.ParentForm.SystemConfig.IsOptPart11 == true) if (this.ParentForm.ParentForm.SystemConfig.IsOptPart11 == true)

2
INT63DC_6CH/DataStore.cs
View File

@ -546,8 +546,6 @@ namespace INT63DC_6CH
public static readonly string CalibrationUp = "Ccu00"; public static readonly string CalibrationUp = "Ccu00";
// 중량보정 - 한자리내림 // 중량보정 - 한자리내림
public static readonly string CalibrationDown = "Ccd00"; public static readonly string CalibrationDown = "Ccd00";
// 중량조정 - 자동모드
public static readonly string CalibrationStartAutoMode = "Cca00";
// 파라미터 쓰기 // 파라미터 쓰기
public static readonly string Write = "Pw000"; public static readonly string Write = "Pw000";

135
INT63DC_6CH/Forms/FormCalibration.Designer.cs generated
View File

@ -38,10 +38,9 @@
this.buttonBalance = new SmartX.SmartButton(); this.buttonBalance = new SmartX.SmartButton();
this.buttonStart = new SmartX.SmartButton(); this.buttonStart = new SmartX.SmartButton();
this.smartGroupBox1 = new SmartX.SmartGroupBox(); this.smartGroupBox1 = new SmartX.SmartGroupBox();
this.smartLabel2 = new SmartX.SmartLabel();
this.smartLabel1 = new SmartX.SmartLabel();
this.labelWeight1 = new SmartX.SmartLabel(); this.labelWeight1 = new SmartX.SmartLabel();
this.buttonExtanalCAL = new SmartX.SmartButton(); this.smartLabel1 = new SmartX.SmartLabel();
this.smartLabel2 = new SmartX.SmartLabel();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.groupBoxHelp.SuspendLayout(); this.groupBoxHelp.SuspendLayout();
this.smartGroupBox1.SuspendLayout(); this.smartGroupBox1.SuspendLayout();
@ -98,7 +97,7 @@
this.groupBoxHelp.BackPictureBox = this.smartForm1; this.groupBoxHelp.BackPictureBox = this.smartForm1;
this.groupBoxHelp.BackPictureBox1 = null; this.groupBoxHelp.BackPictureBox1 = null;
this.groupBoxHelp.Controls.Add(this.listBoxHelp); this.groupBoxHelp.Controls.Add(this.listBoxHelp);
this.groupBoxHelp.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.groupBoxHelp.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.groupBoxHelp.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxHelp.FrameLineColor1 = System.Drawing.Color.Black;
this.groupBoxHelp.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxHelp.FrameLineColor2 = System.Drawing.Color.Black;
this.groupBoxHelp.FrameLineThickness = 1; this.groupBoxHelp.FrameLineThickness = 1;
@ -121,7 +120,7 @@
this.listBoxHelp.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER; this.listBoxHelp.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxHelp.ColumnDelimiter = '\0'; this.listBoxHelp.ColumnDelimiter = '\0';
this.listBoxHelp.ColumnOffsets = null; this.listBoxHelp.ColumnOffsets = null;
this.listBoxHelp.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.listBoxHelp.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
this.listBoxHelp.FontColor = System.Drawing.Color.Black; this.listBoxHelp.FontColor = System.Drawing.Color.Black;
this.listBoxHelp.InitVisible = true; this.listBoxHelp.InitVisible = true;
this.listBoxHelp.ItemAddOrder = SmartX.SmartListBox.ITEMADDORDERS.BOTTOMADD; this.listBoxHelp.ItemAddOrder = SmartX.SmartListBox.ITEMADDORDERS.BOTTOMADD;
@ -153,7 +152,7 @@
this.labelTitle.BackPictureBox2 = null; this.labelTitle.BackPictureBox2 = null;
this.labelTitle.BorderColor = System.Drawing.Color.Black; this.labelTitle.BorderColor = System.Drawing.Color.Black;
this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTitle.Font = new System.Drawing.Font("New Gulim", 35F, System.Drawing.FontStyle.Bold); this.labelTitle.Font = new System.Drawing.Font("새굴림", 35F, System.Drawing.FontStyle.Bold);
this.labelTitle.InitVisible = true; this.labelTitle.InitVisible = true;
this.labelTitle.LineSpacing = 0F; this.labelTitle.LineSpacing = 0F;
this.labelTitle.Location = new System.Drawing.Point(199, 7); this.labelTitle.Location = new System.Drawing.Point(199, 7);
@ -175,10 +174,10 @@
this.buttonCancel.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonCancel.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonCancel.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonCancel.DisableImage"))); this.buttonCancel.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonCancel.DisableImage")));
this.buttonCancel.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonCancel.DownImage"))); this.buttonCancel.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonCancel.DownImage")));
this.buttonCancel.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold); this.buttonCancel.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold);
this.buttonCancel.GroupID = 0; this.buttonCancel.GroupID = 0;
this.buttonCancel.InitVisible = true; this.buttonCancel.InitVisible = true;
this.buttonCancel.Location = new System.Drawing.Point(144, 36); this.buttonCancel.Location = new System.Drawing.Point(375, 36);
this.buttonCancel.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonCancel.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.NestedClickEventPrevent = false; this.buttonCancel.NestedClickEventPrevent = false;
@ -207,10 +206,10 @@
this.buttonBalance.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonBalance.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonBalance.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonBalance.DisableImage"))); this.buttonBalance.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonBalance.DisableImage")));
this.buttonBalance.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonBalance.DownImage"))); this.buttonBalance.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonBalance.DownImage")));
this.buttonBalance.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold); this.buttonBalance.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold);
this.buttonBalance.GroupID = 0; this.buttonBalance.GroupID = 0;
this.buttonBalance.InitVisible = true; this.buttonBalance.InitVisible = true;
this.buttonBalance.Location = new System.Drawing.Point(445, 36); this.buttonBalance.Location = new System.Drawing.Point(229, 36);
this.buttonBalance.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonBalance.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonBalance.Name = "buttonBalance"; this.buttonBalance.Name = "buttonBalance";
this.buttonBalance.NestedClickEventPrevent = false; this.buttonBalance.NestedClickEventPrevent = false;
@ -239,10 +238,10 @@
this.buttonStart.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonStart.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonStart.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonStart.DisableImage"))); this.buttonStart.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonStart.DisableImage")));
this.buttonStart.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonStart.DownImage"))); this.buttonStart.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonStart.DownImage")));
this.buttonStart.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold); this.buttonStart.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold);
this.buttonStart.GroupID = 0; this.buttonStart.GroupID = 0;
this.buttonStart.InitVisible = true; this.buttonStart.InitVisible = true;
this.buttonStart.Location = new System.Drawing.Point(38, 36); this.buttonStart.Location = new System.Drawing.Point(85, 36);
this.buttonStart.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonStart.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonStart.Name = "buttonStart"; this.buttonStart.Name = "buttonStart";
this.buttonStart.NestedClickEventPrevent = false; this.buttonStart.NestedClickEventPrevent = false;
@ -265,14 +264,13 @@
// //
this.smartGroupBox1.BackPictureBox = this.smartForm1; this.smartGroupBox1.BackPictureBox = this.smartForm1;
this.smartGroupBox1.BackPictureBox1 = null; this.smartGroupBox1.BackPictureBox1 = null;
this.smartGroupBox1.Controls.Add(this.buttonExtanalCAL);
this.smartGroupBox1.Controls.Add(this.smartLabel2); this.smartGroupBox1.Controls.Add(this.smartLabel2);
this.smartGroupBox1.Controls.Add(this.smartLabel1); this.smartGroupBox1.Controls.Add(this.smartLabel1);
this.smartGroupBox1.Controls.Add(this.labelWeight1); this.smartGroupBox1.Controls.Add(this.labelWeight1);
this.smartGroupBox1.Controls.Add(this.buttonCancel); this.smartGroupBox1.Controls.Add(this.buttonCancel);
this.smartGroupBox1.Controls.Add(this.buttonStart); this.smartGroupBox1.Controls.Add(this.buttonStart);
this.smartGroupBox1.Controls.Add(this.buttonBalance); this.smartGroupBox1.Controls.Add(this.buttonBalance);
this.smartGroupBox1.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.smartGroupBox1.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.Black; this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.Black;
this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black; this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black;
this.smartGroupBox1.FrameLineThickness = 1; this.smartGroupBox1.FrameLineThickness = 1;
@ -286,25 +284,25 @@
this.smartGroupBox1.TabIndex = 6; this.smartGroupBox1.TabIndex = 6;
this.smartGroupBox1.TextColor = System.Drawing.Color.Black; this.smartGroupBox1.TextColor = System.Drawing.Color.Black;
// //
// smartLabel2 // labelWeight1
// //
this.smartLabel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151))))); this.labelWeight1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151)))));
this.smartLabel2.BackPictureBox = null; this.labelWeight1.BackPictureBox = null;
this.smartLabel2.BackPictureBox1 = null; this.labelWeight1.BackPictureBox1 = null;
this.smartLabel2.BackPictureBox2 = null; this.labelWeight1.BackPictureBox2 = null;
this.smartLabel2.BorderColor = System.Drawing.Color.Black; this.labelWeight1.BorderColor = System.Drawing.Color.Black;
this.smartLabel2.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelWeight1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.smartLabel2.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.labelWeight1.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold);
this.smartLabel2.InitVisible = true; this.labelWeight1.InitVisible = true;
this.smartLabel2.LineSpacing = 0F; this.labelWeight1.LineSpacing = 0F;
this.smartLabel2.Location = new System.Drawing.Point(144, 132); this.labelWeight1.Location = new System.Drawing.Point(85, 132);
this.smartLabel2.Name = "smartLabel2"; this.labelWeight1.Name = "labelWeight1";
this.smartLabel2.Size = new System.Drawing.Size(100, 20); this.labelWeight1.Size = new System.Drawing.Size(100, 20);
this.smartLabel2.TabIndex = 14; this.labelWeight1.TabIndex = 12;
this.smartLabel2.Text = "취소"; this.labelWeight1.Text = "시작";
this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelWeight1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelWeight1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.smartLabel2.Wordwrap = false; this.labelWeight1.Wordwrap = false;
// //
// smartLabel1 // smartLabel1
// //
@ -314,10 +312,10 @@
this.smartLabel1.BackPictureBox2 = null; this.smartLabel1.BackPictureBox2 = null;
this.smartLabel1.BorderColor = System.Drawing.Color.Black; this.smartLabel1.BorderColor = System.Drawing.Color.Black;
this.smartLabel1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.smartLabel1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.smartLabel1.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.smartLabel1.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold);
this.smartLabel1.InitVisible = true; this.smartLabel1.InitVisible = true;
this.smartLabel1.LineSpacing = 0F; this.smartLabel1.LineSpacing = 0F;
this.smartLabel1.Location = new System.Drawing.Point(445, 132); this.smartLabel1.Location = new System.Drawing.Point(229, 132);
this.smartLabel1.Name = "smartLabel1"; this.smartLabel1.Name = "smartLabel1";
this.smartLabel1.Size = new System.Drawing.Size(100, 20); this.smartLabel1.Size = new System.Drawing.Size(100, 20);
this.smartLabel1.TabIndex = 13; this.smartLabel1.TabIndex = 13;
@ -326,57 +324,25 @@
this.smartLabel1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.smartLabel1.Wordwrap = false; this.smartLabel1.Wordwrap = false;
// //
// labelWeight1 // smartLabel2
// //
this.labelWeight1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151))))); this.smartLabel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151)))));
this.labelWeight1.BackPictureBox = null; this.smartLabel2.BackPictureBox = null;
this.labelWeight1.BackPictureBox1 = null; this.smartLabel2.BackPictureBox1 = null;
this.labelWeight1.BackPictureBox2 = null; this.smartLabel2.BackPictureBox2 = null;
this.labelWeight1.BorderColor = System.Drawing.Color.Black; this.smartLabel2.BorderColor = System.Drawing.Color.Black;
this.labelWeight1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.smartLabel2.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelWeight1.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.smartLabel2.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold);
this.labelWeight1.InitVisible = true; this.smartLabel2.InitVisible = true;
this.labelWeight1.LineSpacing = 0F; this.smartLabel2.LineSpacing = 0F;
this.labelWeight1.Location = new System.Drawing.Point(38, 132); this.smartLabel2.Location = new System.Drawing.Point(375, 132);
this.labelWeight1.Name = "labelWeight1"; this.smartLabel2.Name = "smartLabel2";
this.labelWeight1.Size = new System.Drawing.Size(100, 20); this.smartLabel2.Size = new System.Drawing.Size(100, 20);
this.labelWeight1.TabIndex = 12; this.smartLabel2.TabIndex = 14;
this.labelWeight1.Text = "시작"; this.smartLabel2.Text = "취소";
this.labelWeight1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelWeight1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelWeight1.Wordwrap = false; this.smartLabel2.Wordwrap = false;
//
// buttonExtanalCAL
//
this.buttonExtanalCAL.BackPictureBox = null;
this.buttonExtanalCAL.BackPictureBox1 = null;
this.buttonExtanalCAL.BackPictureBox2 = null;
this.buttonExtanalCAL.ButtonColor = System.Drawing.Color.Gainsboro;
this.buttonExtanalCAL.ButtonImageAutoSize = true;
this.buttonExtanalCAL.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonExtanalCAL.DisableImage = null;
this.buttonExtanalCAL.DownImage = null;
this.buttonExtanalCAL.GroupID = 0;
this.buttonExtanalCAL.InitVisible = true;
this.buttonExtanalCAL.Location = new System.Drawing.Point(267, 36);
this.buttonExtanalCAL.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonExtanalCAL.Name = "buttonExtanalCAL";
this.buttonExtanalCAL.NestedClickEventPrevent = false;
this.buttonExtanalCAL.OutlinePixel = 1;
this.buttonExtanalCAL.RepeatInterval = 200;
this.buttonExtanalCAL.RepeatIntervalAccelerate = null;
this.buttonExtanalCAL.SafeInterval = 200;
this.buttonExtanalCAL.Size = new System.Drawing.Size(120, 90);
this.buttonExtanalCAL.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonExtanalCAL.TabIndex = 15;
this.buttonExtanalCAL.Text = "외부 분동 CAL";
this.buttonExtanalCAL.TextColor = System.Drawing.Color.Black;
this.buttonExtanalCAL.TextDownColor = System.Drawing.Color.White;
this.buttonExtanalCAL.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.buttonExtanalCAL.TextLocation = new System.Drawing.Point(0, 0);
this.buttonExtanalCAL.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonExtanalCAL.UpImage = null;
this.buttonExtanalCAL.Click += new System.EventHandler(this.buttonExtanalCAL_Click);
// //
// FormCalibration // FormCalibration
// //
@ -412,6 +378,5 @@
private SmartX.SmartLabel labelWeight1; private SmartX.SmartLabel labelWeight1;
private SmartX.SmartLabel smartLabel2; private SmartX.SmartLabel smartLabel2;
private SmartX.SmartLabel smartLabel1; private SmartX.SmartLabel smartLabel1;
private SmartX.SmartButton buttonExtanalCAL;
} }
} }

23
INT63DC_6CH/Forms/FormCalibration.cs
View File

@ -19,8 +19,6 @@ namespace INT63DC_6CH.Forms
#region Field #region Field
private FormMain m_ParentForm; private FormMain m_ParentForm;
private bool IsAutoMode;
private ControlCalibration6 Calibration6; private ControlCalibration6 Calibration6;
private ControlCalibration7 Calibration7; private ControlCalibration7 Calibration7;
private ControlCalibration8 Calibration8; private ControlCalibration8 Calibration8;
@ -135,9 +133,6 @@ namespace INT63DC_6CH.Forms
} }
private void InitializeControl() private void InitializeControl()
{ {
this.IsAutoMode = false;
this.buttonExtanalCAL.ButtonUp();
switch (this.ParentForm.SystemConfig.EquipmentColumns) switch (this.ParentForm.SystemConfig.EquipmentColumns)
{ {
case 6: case 6:
@ -483,19 +478,19 @@ namespace INT63DC_6CH.Forms
switch (this.ParentForm.SystemConfig.EquipmentColumns) switch (this.ParentForm.SystemConfig.EquipmentColumns)
{ {
case 6: case 6:
this.Calibration6.CalibrationStart(this.IsAutoMode); this.Calibration6.CalibrationStart();
break; break;
case 7: case 7:
this.Calibration7.CalibrationStart(this.IsAutoMode); this.Calibration7.CalibrationStart();
break; break;
case 8: case 8:
this.Calibration8.CalibrationStart(this.IsAutoMode); this.Calibration8.CalibrationStart();
break; break;
case 10: case 10:
this.Calibration10.CalibrationStart(this.IsAutoMode); this.Calibration10.CalibrationStart();
break; break;
case 12: case 12:
this.Calibration12.CalibrationStart(this.IsAutoMode); this.Calibration12.CalibrationStart();
break; break;
default: default:
break; break;
@ -574,13 +569,5 @@ namespace INT63DC_6CH.Forms
((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormMenu); ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormMenu);
} }
#endregion #endregion
private void buttonExtanalCAL_Click(object sender, EventArgs e)
{
if (this.buttonExtanalCAL.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN)
this.IsAutoMode = false;
else
this.IsAutoMode = true;
}
} }
} }

1816
INT63DC_6CH/Forms/FormCalibration.resx
View File

File diff suppressed because it is too large Load Diff