Compare commits

..

2 Commits

Author SHA1 Message Date
Seonjae 0576820f46 Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 into main 2024-04-17 10:30:37 +09:00
Seonjae 1216cc6429 SystemStatus 테스트화면 수정 2024-04-17 10:30:33 +09:00
3 changed files with 73 additions and 3 deletions

View File

@ -189,6 +189,8 @@
this.labelMesResult2 = new SmartX.SmartLabel();
this.smartGroupBox11 = new SmartX.SmartGroupBox();
this.smartDraw2 = new SmartX.SmartDraw();
this.buttonContinuousTest = new SmartX.SmartButton();
this.smartTimer = new SmartX.SmartTimer();
this.smartGroupBox1.SuspendLayout();
this.smartGroupBox14.SuspendLayout();
this.smartGroupBox2.SuspendLayout();
@ -213,6 +215,7 @@
this.smartGroupBox1.BackGround = null;
this.smartGroupBox1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65)))));
this.smartGroupBox1.BackImage = null;
this.smartGroupBox1.Controls.Add(this.buttonContinuousTest);
this.smartGroupBox1.Controls.Add(this.buttonDisplay);
this.smartGroupBox1.Controls.Add(this.buttonStart);
this.smartGroupBox1.Controls.Add(this.labelProgress3);
@ -352,7 +355,7 @@
this.labelProgress8.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
this.labelProgress8.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelProgress8.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
this.labelProgress8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.labelProgress8.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
this.labelProgress8.LineSpacing = 0F;
this.labelProgress8.Location = new System.Drawing.Point(578, 37);
this.labelProgress8.Name = "labelProgress8";
@ -3057,7 +3060,7 @@
this.labelProgress11.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
this.labelProgress11.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelProgress11.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
this.labelProgress11.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.labelProgress11.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
this.labelProgress11.LineSpacing = 0F;
this.labelProgress11.Location = new System.Drawing.Point(824, 37);
this.labelProgress11.Name = "labelProgress11";
@ -3149,7 +3152,7 @@
this.labelProgress4.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
this.labelProgress4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelProgress4.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
this.labelProgress4.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.labelProgress4.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
this.labelProgress4.LineSpacing = 0F;
this.labelProgress4.Location = new System.Drawing.Point(250, 37);
this.labelProgress4.Name = "labelProgress4";
@ -3817,6 +3820,50 @@
this.smartDraw2.TabIndex = 14;
this.smartDraw2.Text = "smartDraw2";
//
// buttonContinuousTest
//
this.buttonContinuousTest.BackGround = this.smartGroupBox1;
this.buttonContinuousTest.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65)))));
this.buttonContinuousTest.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
this.buttonContinuousTest.ButtonDownColor = System.Drawing.Color.SlateGray;
this.buttonContinuousTest.ButtonImageAutoSize = true;
this.buttonContinuousTest.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonContinuousTest.ButtonText = "continuous testing";
this.buttonContinuousTest.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonContinuousTest.GroupID = 0;
this.buttonContinuousTest.ImageDisable = null;
this.buttonContinuousTest.ImageDown = null;
this.buttonContinuousTest.ImageUp = null;
this.buttonContinuousTest.Location = new System.Drawing.Point(458, 3);
this.buttonContinuousTest.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonContinuousTest.Name = "buttonContinuousTest";
this.buttonContinuousTest.NestedClickEventPrevent = false;
this.buttonContinuousTest.OutlinePixel = 2;
this.buttonContinuousTest.OverlapOptimize = true;
this.buttonContinuousTest.RepeatInterval = 200;
this.buttonContinuousTest.RepeatIntervalAccelerate = null;
this.buttonContinuousTest.RoundSize = 10;
this.buttonContinuousTest.SafeInterval = 200;
this.buttonContinuousTest.Size = new System.Drawing.Size(120, 31);
this.buttonContinuousTest.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonContinuousTest.TabIndex = 442;
this.buttonContinuousTest.Text = null;
this.buttonContinuousTest.TextColor = System.Drawing.Color.White;
this.buttonContinuousTest.TextColorDisable = System.Drawing.Color.Gray;
this.buttonContinuousTest.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255)))));
this.buttonContinuousTest.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.buttonContinuousTest.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonContinuousTest.Click += new System.EventHandler(this.buttonContinuousTest_Click);
//
// smartTimer
//
this.smartTimer.CounterMode = SmartX.SmartTimer.CounterModes.Up_Counter;
this.smartTimer.Interval = 300000;
this.smartTimer.IntervalSeries = null;
this.smartTimer.TimeCount = ((long)(1000000));
this.smartTimer.TimeFormStringSeparator = ":";
this.smartTimer.Tick += new System.EventHandler(this.smartTimer_Tick);
//
// ControlMenuSystemStatus1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@ -4007,5 +4054,7 @@
private SmartX.SmartLabel labelProgress3;
private SmartX.SmartDraw_ChartChannelPenStyle smartDraw_ChartChannelPenStyle1;
private SmartX.SmartButton buttonDisplay;
private SmartX.SmartButton buttonContinuousTest;
private SmartX.SmartTimer smartTimer;
}
}

View File

@ -1090,5 +1090,23 @@ namespace INT_PT002.Controls
this.smartDraw1.Chart.PutData(iValue);
}
private void buttonContinuousTest_Click(object sender, EventArgs e)
{
if (this.buttonContinuousTest.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
{
this.InitializeData();
this.ParentForm.ParentForm.TransferData(CommunicationCommand.CutInpupt, CommunicationID.MainBoard);
this.smartTimer.Start();
}
else
this.smartTimer.Stop();
}
private void smartTimer_Tick(object sender, EventArgs e)
{
this.InitializeData();
this.ParentForm.ParentForm.TransferData(CommunicationCommand.CutInpupt, CommunicationID.MainBoard);
}
}
}

View File

@ -123,6 +123,9 @@
<metadata name="smartDraw_ChartChannelPenStyle1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="smartTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>264, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>47</value>
</metadata>