Compare commits
No commits in common. "master" and "V3.1.2" have entirely different histories.
|
@ -54,6 +54,7 @@ namespace ITC81DB_2.Controls
|
|||
if (this.ParentForm.ParentForm.SystemConfig.Language == Define.E_LanguageID.English)
|
||||
{
|
||||
this.labelTitleSelectLane.Text = "Select lane";
|
||||
this.labelTitleOperationMode.Text = "Operation mode";
|
||||
this.labelTitleCommMode.Text = "Communication mode";
|
||||
this.labelTitleSetting.Text = "Setting";
|
||||
this.labelTitleSend.Text = "Send";
|
||||
|
@ -73,6 +74,7 @@ namespace ITC81DB_2.Controls
|
|||
else if (this.ParentForm.ParentForm.SystemConfig.Language == Define.E_LanguageID.Chinese)
|
||||
{
|
||||
this.labelTitleSelectLane.Text = "选择列";
|
||||
this.labelTitleOperationMode.Text = "运转模式";
|
||||
this.labelTitleCommMode.Text = "通信模式";
|
||||
this.labelTitleSetting.Text = "设定值";
|
||||
this.labelTitleSend.Text = "发送";
|
||||
|
@ -95,6 +97,7 @@ namespace ITC81DB_2.Controls
|
|||
else if (this.ParentForm.ParentForm.SystemConfig.Language == Define.E_LanguageID.Russian)
|
||||
{
|
||||
this.labelTitleSelectLane.Text = "Выберите столбец";
|
||||
this.labelTitleOperationMode.Text = "Режим работы";
|
||||
this.labelTitleCommMode.Text = "Режим обмена";
|
||||
this.labelTitleSetting.Text = "Настройка значений";
|
||||
this.labelTitleSend.Text = "Отправить";
|
||||
|
@ -114,6 +117,7 @@ namespace ITC81DB_2.Controls
|
|||
else if (this.ParentForm.ParentForm.SystemConfig.Language == Define.E_LanguageID.German)
|
||||
{
|
||||
this.labelTitleSelectLane.Text = "Spalte auswählen";
|
||||
this.labelTitleOperationMode.Text = "Betriebsmodus";
|
||||
this.labelTitleCommMode.Text = "Kommunikationsmodus";
|
||||
this.labelTitleSetting.Text = "Einstellungswert";
|
||||
this.labelTitleSend.Text = "Senden";
|
||||
|
@ -133,6 +137,7 @@ namespace ITC81DB_2.Controls
|
|||
else if (this.ParentForm.ParentForm.SystemConfig.Language == Define.E_LanguageID.Spanish)
|
||||
{
|
||||
this.labelTitleSelectLane.Text = "Seleccionar columna";
|
||||
this.labelTitleOperationMode.Text = "Modo de operación";
|
||||
this.labelTitleCommMode.Text = "Modo de comunicación";
|
||||
this.labelTitleSetting.Text = "Setear Valor";
|
||||
this.labelTitleSend.Text = "Enviar";
|
||||
|
@ -152,6 +157,7 @@ namespace ITC81DB_2.Controls
|
|||
else
|
||||
{
|
||||
this.labelTitleSelectLane.Text = "열 선택";
|
||||
this.labelTitleOperationMode.Text = "동작 모드";
|
||||
this.labelTitleCommMode.Text = "통신 모드";
|
||||
this.labelTitleSetting.Text = "설정";
|
||||
this.labelTitleSend.Text = "송신";
|
||||
|
@ -925,7 +931,7 @@ namespace ITC81DB_2.Controls
|
|||
this.buttonTestSend.Enabled = true;
|
||||
|
||||
this.SaveComboBox(this.comboBoxSerialBaudRate.SelectedIndex, this.comboBoxSerialMode.SelectedIndex);
|
||||
this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateIcomDisplay();
|
||||
this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateIconDisplay();
|
||||
|
||||
this.ButtonAddOnDisplay();
|
||||
this.buttonSave.Enabled = false;
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
{
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlCenterConfiSerial));
|
||||
this.smartGroupBox1 = new SmartX.SmartGroupBox();
|
||||
this.labelTitleAddon = new SmartX.SmartLabel();
|
||||
this.comboBoxSelectLane = new System.Windows.Forms.ComboBox();
|
||||
this.labelTitleSelectLane = new SmartX.SmartLabel();
|
||||
this.buttonTransmitCondition = new SmartX.SmartButton();
|
||||
|
@ -43,7 +42,7 @@
|
|||
this.labelTitleSend = new SmartX.SmartLabel();
|
||||
this.labelTitleSetting = new SmartX.SmartLabel();
|
||||
this.labelTitleCommMode = new SmartX.SmartLabel();
|
||||
this.labelTitleBaudrate = new SmartX.SmartLabel();
|
||||
this.labelTitleOperationMode = new SmartX.SmartLabel();
|
||||
this.comboBoxSerialMode = new System.Windows.Forms.ComboBox();
|
||||
this.labelTitleFixText = new SmartX.SmartLabel();
|
||||
this.buttonAddon = new SmartX.SmartButton();
|
||||
|
@ -55,6 +54,7 @@
|
|||
this.smartLabel1 = new SmartX.SmartLabel();
|
||||
this.labelFormat = new SmartX.SmartLabel();
|
||||
this.comboBoxSerialBaudRate = new System.Windows.Forms.ComboBox();
|
||||
this.labelTitleAddon = new SmartX.SmartLabel();
|
||||
this.smartGroupBox1.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
|
@ -76,7 +76,7 @@
|
|||
this.smartGroupBox1.Controls.Add(this.labelTitleSend);
|
||||
this.smartGroupBox1.Controls.Add(this.labelTitleSetting);
|
||||
this.smartGroupBox1.Controls.Add(this.labelTitleCommMode);
|
||||
this.smartGroupBox1.Controls.Add(this.labelTitleBaudrate);
|
||||
this.smartGroupBox1.Controls.Add(this.labelTitleOperationMode);
|
||||
this.smartGroupBox1.Controls.Add(this.comboBoxSerialMode);
|
||||
this.smartGroupBox1.Controls.Add(this.labelTitleFixText);
|
||||
this.smartGroupBox1.Controls.Add(this.buttonAddon);
|
||||
|
@ -101,26 +101,6 @@
|
|||
this.smartGroupBox1.TabIndex = 3;
|
||||
this.smartGroupBox1.TextColor = System.Drawing.Color.Black;
|
||||
//
|
||||
// labelTitleAddon
|
||||
//
|
||||
this.labelTitleAddon.BackColor = System.Drawing.Color.White;
|
||||
this.labelTitleAddon.BackPictureBox1 = null;
|
||||
this.labelTitleAddon.BackPictureBox2 = this.smartGroupBox1;
|
||||
this.labelTitleAddon.BorderColor = System.Drawing.Color.White;
|
||||
this.labelTitleAddon.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.labelTitleAddon.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Bold);
|
||||
this.labelTitleAddon.ForeColor = System.Drawing.Color.White;
|
||||
this.labelTitleAddon.InitVisible = true;
|
||||
this.labelTitleAddon.LineSpacing = 0F;
|
||||
this.labelTitleAddon.Location = new System.Drawing.Point(22, 326);
|
||||
this.labelTitleAddon.Name = "labelTitleAddon";
|
||||
this.labelTitleAddon.Size = new System.Drawing.Size(104, 20);
|
||||
this.labelTitleAddon.TabIndex = 234;
|
||||
this.labelTitleAddon.Text = "Add-on";
|
||||
this.labelTitleAddon.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
|
||||
this.labelTitleAddon.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
|
||||
this.labelTitleAddon.Wordwrap = false;
|
||||
//
|
||||
// comboBoxSelectLane
|
||||
//
|
||||
this.comboBoxSelectLane.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold);
|
||||
|
@ -369,25 +349,25 @@
|
|||
this.labelTitleCommMode.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
|
||||
this.labelTitleCommMode.Wordwrap = false;
|
||||
//
|
||||
// labelTitleBaudrate
|
||||
// labelTitleOperationMode
|
||||
//
|
||||
this.labelTitleBaudrate.BackColor = System.Drawing.Color.Black;
|
||||
this.labelTitleBaudrate.BackPictureBox1 = null;
|
||||
this.labelTitleBaudrate.BackPictureBox2 = this.smartGroupBox1;
|
||||
this.labelTitleBaudrate.BorderColor = System.Drawing.Color.Black;
|
||||
this.labelTitleBaudrate.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.labelTitleBaudrate.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
|
||||
this.labelTitleBaudrate.ForeColor = System.Drawing.Color.White;
|
||||
this.labelTitleBaudrate.InitVisible = true;
|
||||
this.labelTitleBaudrate.LineSpacing = 0F;
|
||||
this.labelTitleBaudrate.Location = new System.Drawing.Point(118, 24);
|
||||
this.labelTitleBaudrate.Name = "labelTitleBaudrate";
|
||||
this.labelTitleBaudrate.Size = new System.Drawing.Size(153, 28);
|
||||
this.labelTitleBaudrate.TabIndex = 217;
|
||||
this.labelTitleBaudrate.Text = "Baudrate";
|
||||
this.labelTitleBaudrate.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
|
||||
this.labelTitleBaudrate.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
|
||||
this.labelTitleBaudrate.Wordwrap = false;
|
||||
this.labelTitleOperationMode.BackColor = System.Drawing.Color.Black;
|
||||
this.labelTitleOperationMode.BackPictureBox1 = null;
|
||||
this.labelTitleOperationMode.BackPictureBox2 = this.smartGroupBox1;
|
||||
this.labelTitleOperationMode.BorderColor = System.Drawing.Color.Black;
|
||||
this.labelTitleOperationMode.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.labelTitleOperationMode.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
|
||||
this.labelTitleOperationMode.ForeColor = System.Drawing.Color.White;
|
||||
this.labelTitleOperationMode.InitVisible = true;
|
||||
this.labelTitleOperationMode.LineSpacing = 0F;
|
||||
this.labelTitleOperationMode.Location = new System.Drawing.Point(118, 24);
|
||||
this.labelTitleOperationMode.Name = "labelTitleOperationMode";
|
||||
this.labelTitleOperationMode.Size = new System.Drawing.Size(153, 28);
|
||||
this.labelTitleOperationMode.TabIndex = 217;
|
||||
this.labelTitleOperationMode.Text = "동작 모드";
|
||||
this.labelTitleOperationMode.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
|
||||
this.labelTitleOperationMode.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
|
||||
this.labelTitleOperationMode.Wordwrap = false;
|
||||
//
|
||||
// comboBoxSerialMode
|
||||
//
|
||||
|
@ -616,6 +596,26 @@
|
|||
this.comboBoxSerialBaudRate.TabIndex = 33;
|
||||
this.comboBoxSerialBaudRate.SelectedIndexChanged += new System.EventHandler(this.comboBoxSerialBaudRate_SelectedIndexChanged);
|
||||
//
|
||||
// labelTitleAddon
|
||||
//
|
||||
this.labelTitleAddon.BackColor = System.Drawing.Color.White;
|
||||
this.labelTitleAddon.BackPictureBox1 = null;
|
||||
this.labelTitleAddon.BackPictureBox2 = this.smartGroupBox1;
|
||||
this.labelTitleAddon.BorderColor = System.Drawing.Color.White;
|
||||
this.labelTitleAddon.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.labelTitleAddon.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Bold);
|
||||
this.labelTitleAddon.ForeColor = System.Drawing.Color.White;
|
||||
this.labelTitleAddon.InitVisible = true;
|
||||
this.labelTitleAddon.LineSpacing = 0F;
|
||||
this.labelTitleAddon.Location = new System.Drawing.Point(22, 326);
|
||||
this.labelTitleAddon.Name = "labelTitleAddon";
|
||||
this.labelTitleAddon.Size = new System.Drawing.Size(104, 20);
|
||||
this.labelTitleAddon.TabIndex = 234;
|
||||
this.labelTitleAddon.Text = "Add-on";
|
||||
this.labelTitleAddon.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
|
||||
this.labelTitleAddon.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
|
||||
this.labelTitleAddon.Wordwrap = false;
|
||||
//
|
||||
// ControlCenterConfiSerial
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
|
||||
|
@ -646,7 +646,7 @@
|
|||
private SmartX.SmartLabel labelTitleSend;
|
||||
private SmartX.SmartLabel labelTitleSetting;
|
||||
private SmartX.SmartLabel labelTitleCommMode;
|
||||
private SmartX.SmartLabel labelTitleBaudrate;
|
||||
private SmartX.SmartLabel labelTitleOperationMode;
|
||||
private SmartX.SmartButton buttonTransmitCondition;
|
||||
private SmartX.SmartButton buttonCharacterToFill;
|
||||
private SmartX.SmartLabel labelTitleTransmitCondition;
|
||||
|
|
|
@ -63,7 +63,7 @@ namespace ITC81DB_2.Controls
|
|||
private void DefaultSetting()
|
||||
{
|
||||
this.labelSerialNo.Text = this.ParentForm.ParentForm.SystemConfig.SerialNumber;
|
||||
this.labelDisplayVer.Text = "3.1.4";
|
||||
this.labelDisplayVer.Text = "3.1.2";
|
||||
}
|
||||
|
||||
public void UpdateMainBoardVersionDisplay(string version)
|
||||
|
|
|
@ -163,7 +163,7 @@ namespace ITC81DB_2.Controls
|
|||
case 4:
|
||||
this.buttonUp.Visible = true;
|
||||
this.buttonDown.Visible = true;
|
||||
this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.engBackgroundJudgment_Updown_Discharge));
|
||||
this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.engBackgroundJudgment_Updown));
|
||||
break;
|
||||
default:
|
||||
this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.engBackgroundJudgment));
|
||||
|
@ -180,7 +180,7 @@ namespace ITC81DB_2.Controls
|
|||
case 4:
|
||||
this.buttonUp.Visible = true;
|
||||
this.buttonDown.Visible = true;
|
||||
this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.chnBackgroundJudgment_Updown_Discharge));
|
||||
this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.chnBackgroundJudgment_Updown));
|
||||
break;
|
||||
default:
|
||||
this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.chnBackgroundJudgment));
|
||||
|
@ -197,7 +197,7 @@ namespace ITC81DB_2.Controls
|
|||
case 4:
|
||||
this.buttonUp.Visible = true;
|
||||
this.buttonDown.Visible = true;
|
||||
this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.spnBackgroundJudgment_Updown_Discharge));
|
||||
this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.spnBackgroundJudgment_Updown));
|
||||
break;
|
||||
default:
|
||||
this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.spnBackgroundJudgment));
|
||||
|
@ -214,7 +214,7 @@ namespace ITC81DB_2.Controls
|
|||
case 4:
|
||||
this.buttonUp.Visible = true;
|
||||
this.buttonDown.Visible = true;
|
||||
this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.korBackgroundJudgment_Updown_Discharge));
|
||||
this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.korBackgroundJudgment_Updown));
|
||||
break;
|
||||
default:
|
||||
this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.korBackgroundJudgment));
|
||||
|
|
|
@ -438,93 +438,6 @@ namespace ITC81DB_2.Forms
|
|||
this.pictureBoxFeedbackEnable.Visible = false;
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 사용안함(Modbus 유료화 추가되면 사용할 것)
|
||||
/// </summary>
|
||||
public void UpdateIconDisplay()
|
||||
{
|
||||
int value = 0;
|
||||
|
||||
// Icon - COM1
|
||||
if (this.ParentForm.SystemConfig.SerialCOM1Mode == 0)
|
||||
{
|
||||
this.pictureBoxCOM1Enable.Visible = false;
|
||||
this.pictureBoxCOM1Disable.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (this.ParentForm.SystemConfig.SerialCOM1Mode == (int)Define.E_CommMode.f5_Modbus && this.ParentForm.SystemConfig.IsModbus == false)
|
||||
{
|
||||
this.pictureBoxCOM1Enable.Visible = false;
|
||||
this.pictureBoxCOM1Disable.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.pictureBoxCOM1Enable.Visible = true;
|
||||
this.pictureBoxCOM1Disable.Visible = false;
|
||||
}
|
||||
}
|
||||
|
||||
// Icon - COM3
|
||||
if (this.ParentForm.SystemConfig.SerialCOM3Mode == (int)Define.E_CommMode.f0_None)
|
||||
{
|
||||
this.pictureBoxCOM3Enable.Visible = false;
|
||||
this.pictureBoxCOM3Disable.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (this.ParentForm.SystemConfig.SerialCOM3Mode == (int)Define.E_CommMode.f5_Modbus && this.ParentForm.SystemConfig.IsModbus == false)
|
||||
{
|
||||
this.pictureBoxCOM3Enable.Visible = false;
|
||||
this.pictureBoxCOM3Disable.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.pictureBoxCOM3Enable.Visible = true;
|
||||
this.pictureBoxCOM3Disable.Visible = false;
|
||||
}
|
||||
}
|
||||
|
||||
// Icon - COM3
|
||||
if (this.ParentForm.SystemConfig.SerialCOM4Mode == 0)
|
||||
{
|
||||
this.pictureBoxCOM4Enable.Visible = false;
|
||||
this.pictureBoxCOM4Disable.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (this.ParentForm.SystemConfig.SerialCOM4Mode == (int)Define.E_CommMode.f5_Modbus && this.ParentForm.SystemConfig.IsModbus == false)
|
||||
{
|
||||
this.pictureBoxCOM4Enable.Visible = false;
|
||||
this.pictureBoxCOM4Disable.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.pictureBoxCOM4Enable.Visible = true;
|
||||
this.pictureBoxCOM4Disable.Visible = false;
|
||||
}
|
||||
}
|
||||
|
||||
// 옵션보드
|
||||
try
|
||||
{
|
||||
value = int.Parse(this.ParentForm.CurrentSystemParameter9507.OptionBoard);
|
||||
}
|
||||
catch
|
||||
{
|
||||
value = 0;
|
||||
}
|
||||
if (value == 1 && int.Parse(this.ParentForm.CurrentSystemParameter9508.OPT1SamplingCount) != 0) // Feedback
|
||||
{
|
||||
this.pictureBoxFeedbackDisable.Visible = false;
|
||||
this.pictureBoxFeedbackEnable.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.pictureBoxFeedbackDisable.Visible = true;
|
||||
this.pictureBoxFeedbackEnable.Visible = false;
|
||||
}
|
||||
}
|
||||
private void UpdateDisplayUser(SystemStatus status)
|
||||
{
|
||||
string id = "", group = "";
|
||||
|
@ -793,6 +706,90 @@ namespace ITC81DB_2.Forms
|
|||
this.pictureBoxEthernetDisconnection.Visible = true;
|
||||
}
|
||||
}
|
||||
public void UpdateIconDisplay()
|
||||
{
|
||||
int value = 0;
|
||||
|
||||
// Icon - COM1
|
||||
if (this.ParentForm.SystemConfig.SerialCOM1Mode == 0)
|
||||
{
|
||||
this.pictureBoxCOM1Enable.Visible = false;
|
||||
this.pictureBoxCOM1Disable.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (this.ParentForm.SystemConfig.SerialCOM1Mode == 22 && this.ParentForm.SystemConfig.IsModbus == false)
|
||||
{
|
||||
this.pictureBoxCOM1Enable.Visible = false;
|
||||
this.pictureBoxCOM1Disable.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.pictureBoxCOM1Enable.Visible = true;
|
||||
this.pictureBoxCOM1Disable.Visible = false;
|
||||
}
|
||||
}
|
||||
|
||||
// Icon - COM3
|
||||
if (this.ParentForm.SystemConfig.SerialCOM3Mode == (int)Define.E_CommMode.f0_None)
|
||||
{
|
||||
this.pictureBoxCOM3Enable.Visible = false;
|
||||
this.pictureBoxCOM3Disable.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (this.ParentForm.SystemConfig.SerialCOM3Mode == 22 && this.ParentForm.SystemConfig.IsModbus == false)
|
||||
{
|
||||
this.pictureBoxCOM3Enable.Visible = false;
|
||||
this.pictureBoxCOM3Disable.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.pictureBoxCOM3Enable.Visible = true;
|
||||
this.pictureBoxCOM3Disable.Visible = false;
|
||||
}
|
||||
}
|
||||
|
||||
// Icon - COM3
|
||||
if (this.ParentForm.SystemConfig.SerialCOM4Mode == 0)
|
||||
{
|
||||
this.pictureBoxCOM4Enable.Visible = false;
|
||||
this.pictureBoxCOM4Disable.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (this.ParentForm.SystemConfig.SerialCOM4Mode == 22 && this.ParentForm.SystemConfig.IsModbus == false)
|
||||
{
|
||||
this.pictureBoxCOM4Enable.Visible = false;
|
||||
this.pictureBoxCOM4Disable.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.pictureBoxCOM4Enable.Visible = true;
|
||||
this.pictureBoxCOM4Disable.Visible = false;
|
||||
}
|
||||
}
|
||||
|
||||
// 옵션보드
|
||||
try
|
||||
{
|
||||
value = int.Parse(this.ParentForm.CurrentSystemParameter9507.OptionBoard);
|
||||
}
|
||||
catch
|
||||
{
|
||||
value = 0;
|
||||
}
|
||||
if (value == 1 && int.Parse(this.ParentForm.CurrentSystemParameter9508.OPT1SamplingCount) != 0) // Feedback
|
||||
{
|
||||
this.pictureBoxFeedbackDisable.Visible = false;
|
||||
this.pictureBoxFeedbackEnable.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.pictureBoxFeedbackDisable.Visible = true;
|
||||
this.pictureBoxFeedbackEnable.Visible = false;
|
||||
}
|
||||
}
|
||||
public void PopUpWarning(string warning)
|
||||
{
|
||||
this.labelAlarmWindow.Text = warning;
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>bin\Release\InModbus.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="ITC81DB_2_ImageDll, Version=1.0.9189.24643, Culture=neutral, processorArchitecture=MSIL">
|
||||
<Reference Include="ITC81DB_2_ImageDll, Version=1.0.9091.24849, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\ITC81DB_2_ImageDll\bin\Release\ITC81DB_2_ImageDll.dll</HintPath>
|
||||
</Reference>
|
||||
|
|
|
@ -14,17 +14,6 @@
|
|||
2열 기본형 컨베어 계량기
|
||||
*/
|
||||
|
||||
@ Ver 3.1.4 by CJY
|
||||
- 2025.02.27
|
||||
- Ver 3.1.3 Modify
|
||||
- 상승지연 -> 배출지연 이미지 변경
|
||||
- 시리얼통신 동작모드 -> Baudrate
|
||||
|
||||
@ Ver 3.1.3 by CJY
|
||||
- 2025.02.13
|
||||
- Ver 3.1.2 Modify
|
||||
- 메인 Icon 정상적으로 Enable 안되는 버그 수정
|
||||
|
||||
@ Ver 3.1.2 by CJY
|
||||
- 2024.12.24
|
||||
- Ver 3.1.1 Modify
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -754,6 +754,7 @@ D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Release\ITC81DB_2.pdb
|
|||
D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Release\ITC81DB_2.Controls.ControlCenterEquipEngineer.resources
|
||||
D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Release\ITC81DB_2.exe
|
||||
D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Release\ITC81DB_2.pdb
|
||||
D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Release\ITC81DB_2_ImageDll.dll
|
||||
D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Release\SmartX_IEC1000.dll
|
||||
D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Release\SmartXCommon.dll
|
||||
D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Release\ITC81DB_2_ImageDll.pdb
|
||||
|
@ -772,4 +773,3 @@ D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Release\ITC81DB_2.Controls.ControlConfiEth
|
|||
D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Release\ITC81DB_2.Controls.ControlConfiModbus.resources
|
||||
D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Release\ITC81DB_2.Controls.ControlMainModbus.resources
|
||||
D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Release\ITC81DB_2.Controls.ControlConfiEthernetAddon.resources
|
||||
D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Release\ITC81DB_2_ImageDll.dll
|
||||
|
|
Binary file not shown.
|
@ -19,7 +19,6 @@ namespace ITC81DB_2_ImageDll
|
|||
chnBackgroundDataStatistics,
|
||||
chnBackgroundJudgment,
|
||||
chnBackgroundJudgment_Updown,
|
||||
chnBackgroundJudgment_Updown_Discharge,
|
||||
chnBackgroundOptionBoard1,
|
||||
chnBackgroundProduct,
|
||||
chnBypassCountDown,
|
||||
|
@ -179,7 +178,6 @@ namespace ITC81DB_2_ImageDll
|
|||
engBackgroundDataStatistics,
|
||||
engBackgroundJudgment,
|
||||
engBackgroundJudgment_Updown,
|
||||
engBackgroundJudgment_Updown_Discharge,
|
||||
engBackgroundProduct,
|
||||
engBypassCountDown,
|
||||
engBypassCountUp,
|
||||
|
@ -350,7 +348,6 @@ namespace ITC81DB_2_ImageDll
|
|||
korBackgroundDataStatistics,
|
||||
korBackgroundJudgment,
|
||||
korBackgroundJudgment_Updown,
|
||||
korBackgroundJudgment_Updown_Discharge,
|
||||
korBackgroundOptionBoard1,
|
||||
korBackgroundProduct,
|
||||
korBypassCountDown,
|
||||
|
@ -518,7 +515,6 @@ namespace ITC81DB_2_ImageDll
|
|||
spnBackgroundDataStatistics,
|
||||
spnBackgroundJudgment,
|
||||
spnBackgroundJudgment_Updown,
|
||||
spnBackgroundJudgment_Updown_Discharge,
|
||||
spnBackgroundProduct,
|
||||
spnBypassCountDown,
|
||||
spnBypassCountUp,
|
||||
|
@ -702,9 +698,6 @@ namespace ITC81DB_2_ImageDll
|
|||
case ButtonImages.engBackgroundJudgment_Updown:
|
||||
bt = new Bitmap(Resource1.engBackgroundJudgment_Updown);
|
||||
break;
|
||||
case ButtonImages.engBackgroundJudgment_Updown_Discharge:
|
||||
bt = new Bitmap(Resource1.engBackgroundJudgment_Updown_Discharge);
|
||||
break;
|
||||
case ButtonImages.engBackgroundProduct:
|
||||
bt = new Bitmap(Resource1.engBackgroundProduct);
|
||||
break;
|
||||
|
@ -1209,9 +1202,6 @@ namespace ITC81DB_2_ImageDll
|
|||
case ButtonImages.korBackgroundJudgment_Updown:
|
||||
bt = new Bitmap(Resource1.korBackgroundJudgment_Updown);
|
||||
break;
|
||||
case ButtonImages.korBackgroundJudgment_Updown_Discharge:
|
||||
bt = new Bitmap(Resource1.korBackgroundJudgment_Updown_Discharge);
|
||||
break;
|
||||
case ButtonImages.korBackgroundProduct:
|
||||
bt = new Bitmap(Resource1.korBackgroundProduct);
|
||||
break;
|
||||
|
@ -1683,9 +1673,6 @@ namespace ITC81DB_2_ImageDll
|
|||
case ButtonImages.chnBackgroundJudgment_Updown:
|
||||
bt = new Bitmap(Resource1.chnBackgroundJudgment_Updown);
|
||||
break;
|
||||
case ButtonImages.chnBackgroundJudgment_Updown_Discharge:
|
||||
bt = new Bitmap(Resource1.chnBackgroundJudgment_Updown_Discharge);
|
||||
break;
|
||||
case ButtonImages.chnBackgroundProduct:
|
||||
bt = new Bitmap(Resource1.chnBackgroundProduct);
|
||||
break;
|
||||
|
@ -2145,9 +2132,6 @@ namespace ITC81DB_2_ImageDll
|
|||
case ButtonImages.spnBackgroundJudgment_Updown:
|
||||
bt = new Bitmap(Resource1.spnBackgroundJudgment_Updown);
|
||||
break;
|
||||
case ButtonImages.spnBackgroundJudgment_Updown_Discharge:
|
||||
bt = new Bitmap(Resource1.spnBackgroundJudgment_Updown_Discharge);
|
||||
break;
|
||||
case ButtonImages.spnBackgroundProduct:
|
||||
bt = new Bitmap(Resource1.spnBackgroundProduct);
|
||||
break;
|
||||
|
|
|
@ -1834,6 +1834,9 @@
|
|||
<ItemGroup>
|
||||
<None Include="Resources\spnHelpDataStatisticsUp.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\spnBackgroundJudgment_Updown.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\spnBackgroundJudgment.png" />
|
||||
</ItemGroup>
|
||||
|
@ -2080,21 +2083,6 @@
|
|||
<ItemGroup>
|
||||
<None Include="Resources\spnHelpSerialCOM3Down.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\engBackgroundJudgment_Updown_Discharge.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\korBackgroundJudgment_Updown_Discharge.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\chnBackgroundJudgment_Updown_Discharge.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\spnBackgroundJudgment_Updown.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\spnBackgroundJudgment_Updown_Discharge.png" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
|
|
|
@ -78,13 +78,6 @@ namespace ITC81DB_2_ImageDll {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap chnBackgroundJudgment_Updown_Discharge {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("chnBackgroundJudgment_Updown_Discharge", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap chnBackgroundProduct {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("chnBackgroundProduct", resourceCulture);
|
||||
|
@ -1184,13 +1177,6 @@ namespace ITC81DB_2_ImageDll {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap engBackgroundJudgment_Updown_Discharge {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("engBackgroundJudgment_Updown_Discharge", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap engBackgroundProduct {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("engBackgroundProduct", resourceCulture);
|
||||
|
@ -2381,13 +2367,6 @@ namespace ITC81DB_2_ImageDll {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap korBackgroundJudgment_Updown_Discharge {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("korBackgroundJudgment_Updown_Discharge", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap korBackgroundProduct {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("korBackgroundProduct", resourceCulture);
|
||||
|
@ -3543,13 +3522,6 @@ namespace ITC81DB_2_ImageDll {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap spnBackgroundJudgment_Updown_Discharge {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("spnBackgroundJudgment_Updown_Discharge", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap spnBackgroundProduct {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("spnBackgroundProduct", resourceCulture);
|
||||
|
|
|
@ -2032,16 +2032,4 @@
|
|||
<data name="spnHelpSerialCOM4Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>Resources\spnHelpSerialCOM4Up.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="chnBackgroundJudgment_Updown_Discharge" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>Resources\chnBackgroundJudgment_Updown_Discharge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="engBackgroundJudgment_Updown_Discharge" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>Resources\engBackgroundJudgment_Updown_Discharge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="korBackgroundJudgment_Updown_Discharge" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>Resources\korBackgroundJudgment_Updown_Discharge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="spnBackgroundJudgment_Updown_Discharge" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>Resources\spnBackgroundJudgment_Updown_Discharge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
Binary file not shown.
Before Width: | Height: | Size: 26 KiB |
Binary file not shown.
Before Width: | Height: | Size: 26 KiB |
Binary file not shown.
Before Width: | Height: | Size: 21 KiB |
Binary file not shown.
Before Width: | Height: | Size: 28 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue