diff --git a/cVMS.NET_CS/Class/StructAndEnum.cs b/cVMS.NET_CS/Class/StructAndEnum.cs
index cfcdc3d..71975e1 100644
--- a/cVMS.NET_CS/Class/StructAndEnum.cs
+++ b/cVMS.NET_CS/Class/StructAndEnum.cs
@@ -27,6 +27,10 @@ namespace vmsnet
DAQDisconnected,
DAQTryConnect,
RefreshChart,
+ ///
+ /// 알람설정에서 확인을 누르면 호출됩니다.
+ ///
+ AlarmValueReset,
}
enum ConnState
{
diff --git a/cVMS.NET_CS/FMain.Designer.cs b/cVMS.NET_CS/FMain.Designer.cs
index 976dd77..24ff60a 100644
--- a/cVMS.NET_CS/FMain.Designer.cs
+++ b/cVMS.NET_CS/FMain.Designer.cs
@@ -125,16 +125,16 @@ namespace vmsnet
this.lbPLC,
this.lbINDI,
this.lb_status});
- this.StatusStrip1.Location = new System.Drawing.Point(0, 747);
+ this.StatusStrip1.Location = new System.Drawing.Point(0, 757);
this.StatusStrip1.Name = "StatusStrip1";
- this.StatusStrip1.Size = new System.Drawing.Size(1561, 32);
+ this.StatusStrip1.Size = new System.Drawing.Size(1561, 22);
this.StatusStrip1.TabIndex = 1;
this.StatusStrip1.Text = "StatusStrip1";
//
// lb_diskfree
//
this.lb_diskfree.Name = "lb_diskfree";
- this.lb_diskfree.Size = new System.Drawing.Size(122, 25);
+ this.lb_diskfree.Size = new System.Drawing.Size(77, 17);
this.lb_diskfree.Text = "";
//
// lb_chcount
@@ -142,21 +142,21 @@ namespace vmsnet
this.lb_chcount.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.lb_chcount.ForeColor = System.Drawing.Color.Navy;
this.lb_chcount.Name = "lb_chcount";
- this.lb_chcount.Size = new System.Drawing.Size(110, 25);
+ this.lb_chcount.Size = new System.Drawing.Size(73, 17);
this.lb_chcount.Text = "<장치정보>";
//
// lb_msec
//
this.lb_msec.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.lb_msec.Name = "lb_msec";
- this.lb_msec.Size = new System.Drawing.Size(86, 25);
+ this.lb_msec.Size = new System.Drawing.Size(58, 17);
this.lb_msec.Text = "";
//
// lb_Saved
//
this.lb_Saved.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.lb_Saved.Name = "lb_Saved";
- this.lb_Saved.Size = new System.Drawing.Size(121, 25);
+ this.lb_Saved.Size = new System.Drawing.Size(79, 17);
this.lb_Saved.Text = "";
this.lb_Saved.Click += new System.EventHandler(this.lb_Saved_Click);
//
@@ -164,7 +164,7 @@ namespace vmsnet
//
this.lb_alarm.ForeColor = System.Drawing.Color.Silver;
this.lb_alarm.Name = "lb_alarm";
- this.lb_alarm.Size = new System.Drawing.Size(30, 25);
+ this.lb_alarm.Size = new System.Drawing.Size(19, 17);
this.lb_alarm.Text = "●";
//
// lbMonitor
@@ -172,7 +172,7 @@ namespace vmsnet
this.lbMonitor.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.lbMonitor.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.lbMonitor.Name = "lbMonitor";
- this.lbMonitor.Size = new System.Drawing.Size(125, 25);
+ this.lbMonitor.Size = new System.Drawing.Size(84, 17);
this.lbMonitor.Text = "";
//
// lbPLC
@@ -180,7 +180,7 @@ namespace vmsnet
this.lbPLC.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.lbPLC.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.lbPLC.Name = "lbPLC";
- this.lbPLC.Size = new System.Drawing.Size(69, 25);
+ this.lbPLC.Size = new System.Drawing.Size(46, 17);
this.lbPLC.Text = "";
//
// lbINDI
@@ -188,7 +188,7 @@ namespace vmsnet
this.lbINDI.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.lbINDI.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.lbINDI.Name = "lbINDI";
- this.lbINDI.Size = new System.Drawing.Size(137, 25);
+ this.lbINDI.Size = new System.Drawing.Size(92, 17);
this.lbINDI.Text = "";
//
// lb_status
@@ -196,7 +196,7 @@ namespace vmsnet
this.lb_status.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.lb_status.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.lb_status.Name = "lb_status";
- this.lb_status.Size = new System.Drawing.Size(104, 25);
+ this.lb_status.Size = new System.Drawing.Size(70, 17);
this.lb_status.Text = "";
//
// ToolStrip1
@@ -251,7 +251,7 @@ namespace vmsnet
this.btMonitorOn.Image = ((System.Drawing.Image)(resources.GetObject("btMonitorOn.Image")));
this.btMonitorOn.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btMonitorOn.Name = "btMonitorOn";
- this.btMonitorOn.Size = new System.Drawing.Size(168, 39);
+ this.btMonitorOn.Size = new System.Drawing.Size(120, 41);
this.btMonitorOn.Text = "Monitor On/Off";
this.btMonitorOn.Click += new System.EventHandler(this.toolStripButton3_Click_1);
//
@@ -260,7 +260,7 @@ namespace vmsnet
this.bt_fullscreen.Image = ((System.Drawing.Image)(resources.GetObject("bt_fullscreen.Image")));
this.bt_fullscreen.ImageTransparentColor = System.Drawing.Color.Magenta;
this.bt_fullscreen.Name = "bt_fullscreen";
- this.bt_fullscreen.Size = new System.Drawing.Size(112, 39);
+ this.bt_fullscreen.Size = new System.Drawing.Size(83, 41);
this.bt_fullscreen.Text = "개별보기";
this.bt_fullscreen.Click += new System.EventHandler(this.bt_fullscreen_Click);
//
@@ -270,7 +270,7 @@ namespace vmsnet
this.bt_tviewr.Image = ((System.Drawing.Image)(resources.GetObject("bt_tviewr.Image")));
this.bt_tviewr.ImageTransparentColor = System.Drawing.Color.Magenta;
this.bt_tviewr.Name = "bt_tviewr";
- this.bt_tviewr.Size = new System.Drawing.Size(177, 39);
+ this.bt_tviewr.Size = new System.Drawing.Size(128, 41);
this.bt_tviewr.Text = "실시간트렌드(F1)";
this.bt_tviewr.Click += new System.EventHandler(this.ToolStripButton3_Click);
//
@@ -280,7 +280,7 @@ namespace vmsnet
this.bt_tview.Image = ((System.Drawing.Image)(resources.GetObject("bt_tview.Image")));
this.bt_tview.ImageTransparentColor = System.Drawing.Color.Magenta;
this.bt_tview.Name = "bt_tview";
- this.bt_tview.Size = new System.Drawing.Size(159, 39);
+ this.bt_tview.Size = new System.Drawing.Size(116, 41);
this.bt_tview.Text = "과거트렌드(F1)";
this.bt_tview.Click += new System.EventHandler(this.ToolStripButton1_Click_2);
//
@@ -290,7 +290,7 @@ namespace vmsnet
this.bt_alamhistory.Image = ((System.Drawing.Image)(resources.GetObject("bt_alamhistory.Image")));
this.bt_alamhistory.ImageTransparentColor = System.Drawing.Color.Magenta;
this.bt_alamhistory.Name = "bt_alamhistory";
- this.bt_alamhistory.Size = new System.Drawing.Size(141, 39);
+ this.bt_alamhistory.Size = new System.Drawing.Size(104, 41);
this.bt_alamhistory.Text = "알람목록(F3)";
this.bt_alamhistory.Click += new System.EventHandler(this.ToolStripButton2_Click_1);
//
@@ -300,7 +300,7 @@ namespace vmsnet
this.bt_alamsetup.Image = ((System.Drawing.Image)(resources.GetObject("bt_alamsetup.Image")));
this.bt_alamsetup.ImageTransparentColor = System.Drawing.Color.Magenta;
this.bt_alamsetup.Name = "bt_alamsetup";
- this.bt_alamsetup.Size = new System.Drawing.Size(141, 39);
+ this.bt_alamsetup.Size = new System.Drawing.Size(104, 41);
this.bt_alamsetup.Text = "알람설정(F4)";
this.bt_alamsetup.Click += new System.EventHandler(this.ToolStripButton1_Click_4);
//
@@ -310,7 +310,7 @@ namespace vmsnet
this.bt_save.Image = ((System.Drawing.Image)(resources.GetObject("bt_save.Image")));
this.bt_save.ImageTransparentColor = System.Drawing.Color.Magenta;
this.bt_save.Name = "bt_save";
- this.bt_save.Size = new System.Drawing.Size(105, 39);
+ this.bt_save.Size = new System.Drawing.Size(80, 41);
this.bt_save.Text = "저장(F5)";
this.bt_save.Click += new System.EventHandler(this.bt_save_Click);
//
@@ -319,7 +319,7 @@ namespace vmsnet
this.ToolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripButton2.Image")));
this.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.ToolStripButton2.Name = "ToolStripButton2";
- this.ToolStripButton2.Size = new System.Drawing.Size(141, 39);
+ this.ToolStripButton2.Size = new System.Drawing.Size(104, 41);
this.ToolStripButton2.Text = "소리끄기(F2)";
this.ToolStripButton2.Click += new System.EventHandler(this.ToolStripButton2_Click);
//
@@ -329,7 +329,7 @@ namespace vmsnet
this.bt_print.Image = ((System.Drawing.Image)(resources.GetObject("bt_print.Image")));
this.bt_print.ImageTransparentColor = System.Drawing.Color.Magenta;
this.bt_print.Name = "bt_print";
- this.bt_print.Size = new System.Drawing.Size(105, 39);
+ this.bt_print.Size = new System.Drawing.Size(80, 41);
this.bt_print.Text = "인쇄(F9)";
this.bt_print.Visible = false;
this.bt_print.Click += new System.EventHandler(this.bt_print_Click);
@@ -345,7 +345,7 @@ namespace vmsnet
this.bt_show2ndwindow.Image = ((System.Drawing.Image)(resources.GetObject("bt_show2ndwindow.Image")));
this.bt_show2ndwindow.ImageTransparentColor = System.Drawing.Color.Magenta;
this.bt_show2ndwindow.Name = "bt_show2ndwindow";
- this.bt_show2ndwindow.Size = new System.Drawing.Size(94, 39);
+ this.bt_show2ndwindow.Size = new System.Drawing.Size(71, 41);
this.bt_show2ndwindow.Text = "보조창";
this.bt_show2ndwindow.Visible = false;
this.bt_show2ndwindow.Click += new System.EventHandler(this.bt_show2ndwindow_Click);
@@ -357,7 +357,7 @@ namespace vmsnet
this.bt_config.Image = ((System.Drawing.Image)(resources.GetObject("bt_config.Image")));
this.bt_config.ImageTransparentColor = System.Drawing.Color.Magenta;
this.bt_config.Name = "bt_config";
- this.bt_config.Size = new System.Drawing.Size(76, 39);
+ this.bt_config.Size = new System.Drawing.Size(59, 41);
this.bt_config.Text = "설정";
this.bt_config.Click += new System.EventHandler(this.btConfig_Click);
//
@@ -367,7 +367,7 @@ namespace vmsnet
this.ToolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripButton1.Image")));
this.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.ToolStripButton1.Name = "ToolStripButton1";
- this.ToolStripButton1.Size = new System.Drawing.Size(76, 39);
+ this.ToolStripButton1.Size = new System.Drawing.Size(59, 41);
this.ToolStripButton1.Text = "정보";
this.ToolStripButton1.Click += new System.EventHandler(this.ToolStripButton1_Click_6);
//
@@ -376,7 +376,7 @@ namespace vmsnet
this.btLog.Image = ((System.Drawing.Image)(resources.GetObject("btLog.Image")));
this.btLog.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btLog.Name = "btLog";
- this.btLog.Size = new System.Drawing.Size(112, 29);
+ this.btLog.Size = new System.Drawing.Size(83, 41);
this.btLog.Text = "운영로그";
this.btLog.Click += new System.EventHandler(this.toolStripButton3_Click_2);
//
@@ -385,7 +385,7 @@ namespace vmsnet
this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton3.Name = "toolStripButton3";
- this.toolStripButton3.Size = new System.Drawing.Size(112, 29);
+ this.toolStripButton3.Size = new System.Drawing.Size(83, 41);
this.toolStripButton3.Text = "저장폴더";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click_3);
//
@@ -434,7 +434,7 @@ namespace vmsnet
this.TableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
this.TableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.TableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.TableLayoutPanel1.Size = new System.Drawing.Size(1561, 703);
+ this.TableLayoutPanel1.Size = new System.Drawing.Size(1561, 713);
this.TableLayoutPanel1.TabIndex = 5;
//
// Panel1
@@ -455,7 +455,7 @@ namespace vmsnet
this.cmb_tanks.FormattingEnabled = true;
this.cmb_tanks.Location = new System.Drawing.Point(0, 0);
this.cmb_tanks.Name = "cmb_tanks";
- this.cmb_tanks.Size = new System.Drawing.Size(657, 45);
+ this.cmb_tanks.Size = new System.Drawing.Size(657, 33);
this.cmb_tanks.TabIndex = 5;
this.cmb_tanks.SelectedIndexChanged += new System.EventHandler(this.cmb_group_SelectedIndexChanged);
//
@@ -488,13 +488,13 @@ namespace vmsnet
this.cmbt_x_gap_21600,
this.cmbt_x_gap_43200});
this.menus_xgap.Name = "menus_xgap";
- this.menus_xgap.Size = new System.Drawing.Size(198, 32);
+ this.menus_xgap.Size = new System.Drawing.Size(150, 22);
this.menus_xgap.Text = "X축 간격";
//
// cmbt_x_gap_5
//
this.cmbt_x_gap_5.Name = "cmbt_x_gap_5";
- this.cmbt_x_gap_5.Size = new System.Drawing.Size(170, 34);
+ this.cmbt_x_gap_5.Size = new System.Drawing.Size(112, 22);
this.cmbt_x_gap_5.Tag = "5";
this.cmbt_x_gap_5.Text = "5초";
//
@@ -504,7 +504,7 @@ namespace vmsnet
this.cmbt_x_gap_10.CheckOnClick = true;
this.cmbt_x_gap_10.CheckState = System.Windows.Forms.CheckState.Checked;
this.cmbt_x_gap_10.Name = "cmbt_x_gap_10";
- this.cmbt_x_gap_10.Size = new System.Drawing.Size(170, 34);
+ this.cmbt_x_gap_10.Size = new System.Drawing.Size(112, 22);
this.cmbt_x_gap_10.Tag = "10";
this.cmbt_x_gap_10.Text = "10초";
//
@@ -512,7 +512,7 @@ namespace vmsnet
//
this.cmbt_x_gap_30.CheckOnClick = true;
this.cmbt_x_gap_30.Name = "cmbt_x_gap_30";
- this.cmbt_x_gap_30.Size = new System.Drawing.Size(170, 34);
+ this.cmbt_x_gap_30.Size = new System.Drawing.Size(112, 22);
this.cmbt_x_gap_30.Tag = "30";
this.cmbt_x_gap_30.Text = "30초";
//
@@ -520,14 +520,14 @@ namespace vmsnet
//
this.cmbt_x_gap_60.CheckOnClick = true;
this.cmbt_x_gap_60.Name = "cmbt_x_gap_60";
- this.cmbt_x_gap_60.Size = new System.Drawing.Size(170, 34);
+ this.cmbt_x_gap_60.Size = new System.Drawing.Size(112, 22);
this.cmbt_x_gap_60.Tag = "60";
this.cmbt_x_gap_60.Text = "1분";
//
// cmbt_x_gap_600
//
this.cmbt_x_gap_600.Name = "cmbt_x_gap_600";
- this.cmbt_x_gap_600.Size = new System.Drawing.Size(170, 34);
+ this.cmbt_x_gap_600.Size = new System.Drawing.Size(112, 22);
this.cmbt_x_gap_600.Tag = "600";
this.cmbt_x_gap_600.Text = "10분";
//
@@ -535,7 +535,7 @@ namespace vmsnet
//
this.cmbt_x_gap_1800.CheckOnClick = true;
this.cmbt_x_gap_1800.Name = "cmbt_x_gap_1800";
- this.cmbt_x_gap_1800.Size = new System.Drawing.Size(170, 34);
+ this.cmbt_x_gap_1800.Size = new System.Drawing.Size(112, 22);
this.cmbt_x_gap_1800.Tag = "1800";
this.cmbt_x_gap_1800.Text = "30분";
//
@@ -543,7 +543,7 @@ namespace vmsnet
//
this.cmbt_x_gap_3600.CheckOnClick = true;
this.cmbt_x_gap_3600.Name = "cmbt_x_gap_3600";
- this.cmbt_x_gap_3600.Size = new System.Drawing.Size(170, 34);
+ this.cmbt_x_gap_3600.Size = new System.Drawing.Size(112, 22);
this.cmbt_x_gap_3600.Tag = "3600";
this.cmbt_x_gap_3600.Text = "1시간";
//
@@ -551,7 +551,7 @@ namespace vmsnet
//
this.cmbt_x_gap_21600.CheckOnClick = true;
this.cmbt_x_gap_21600.Name = "cmbt_x_gap_21600";
- this.cmbt_x_gap_21600.Size = new System.Drawing.Size(170, 34);
+ this.cmbt_x_gap_21600.Size = new System.Drawing.Size(112, 22);
this.cmbt_x_gap_21600.Tag = "21600";
this.cmbt_x_gap_21600.Text = "6시간";
//
@@ -559,7 +559,7 @@ namespace vmsnet
//
this.cmbt_x_gap_43200.CheckOnClick = true;
this.cmbt_x_gap_43200.Name = "cmbt_x_gap_43200";
- this.cmbt_x_gap_43200.Size = new System.Drawing.Size(170, 34);
+ this.cmbt_x_gap_43200.Size = new System.Drawing.Size(112, 22);
this.cmbt_x_gap_43200.Tag = "43200";
this.cmbt_x_gap_43200.Text = "12시간";
//
@@ -571,14 +571,14 @@ namespace vmsnet
this.cmbt_x_21600,
this.cmbt_x_43200});
this.menus_xterm.Name = "menus_xterm";
- this.menus_xterm.Size = new System.Drawing.Size(198, 32);
+ this.menus_xterm.Size = new System.Drawing.Size(150, 22);
this.menus_xterm.Text = "X축 범위";
//
// cmbt_x_1800
//
this.cmbt_x_1800.CheckOnClick = true;
this.cmbt_x_1800.Name = "cmbt_x_1800";
- this.cmbt_x_1800.Size = new System.Drawing.Size(170, 34);
+ this.cmbt_x_1800.Size = new System.Drawing.Size(112, 22);
this.cmbt_x_1800.Tag = "1800";
this.cmbt_x_1800.Text = "30분";
//
@@ -588,7 +588,7 @@ namespace vmsnet
this.cmbt_x_3600.CheckOnClick = true;
this.cmbt_x_3600.CheckState = System.Windows.Forms.CheckState.Checked;
this.cmbt_x_3600.Name = "cmbt_x_3600";
- this.cmbt_x_3600.Size = new System.Drawing.Size(170, 34);
+ this.cmbt_x_3600.Size = new System.Drawing.Size(112, 22);
this.cmbt_x_3600.Tag = "3600";
this.cmbt_x_3600.Text = "1시간";
//
@@ -596,7 +596,7 @@ namespace vmsnet
//
this.cmbt_x_21600.CheckOnClick = true;
this.cmbt_x_21600.Name = "cmbt_x_21600";
- this.cmbt_x_21600.Size = new System.Drawing.Size(170, 34);
+ this.cmbt_x_21600.Size = new System.Drawing.Size(112, 22);
this.cmbt_x_21600.Tag = "21600";
this.cmbt_x_21600.Text = "6시간";
//
@@ -604,7 +604,7 @@ namespace vmsnet
//
this.cmbt_x_43200.CheckOnClick = true;
this.cmbt_x_43200.Name = "cmbt_x_43200";
- this.cmbt_x_43200.Size = new System.Drawing.Size(170, 34);
+ this.cmbt_x_43200.Size = new System.Drawing.Size(112, 22);
this.cmbt_x_43200.Tag = "43200";
this.cmbt_x_43200.Text = "12시간";
//
@@ -618,14 +618,14 @@ namespace vmsnet
this.cmbt_y_2_0,
this.cmbt_y_5_0});
this.menus_ygap.Name = "menus_ygap";
- this.menus_ygap.Size = new System.Drawing.Size(198, 32);
+ this.menus_ygap.Size = new System.Drawing.Size(150, 22);
this.menus_ygap.Text = "Y축 간격";
//
// cmbt_y_0_1
//
this.cmbt_y_0_1.CheckOnClick = true;
this.cmbt_y_0_1.Name = "cmbt_y_0_1";
- this.cmbt_y_0_1.Size = new System.Drawing.Size(138, 34);
+ this.cmbt_y_0_1.Size = new System.Drawing.Size(91, 22);
this.cmbt_y_0_1.Tag = "0.1";
this.cmbt_y_0_1.Text = "0.1";
//
@@ -635,7 +635,7 @@ namespace vmsnet
this.cmbt_y_0_5.CheckOnClick = true;
this.cmbt_y_0_5.CheckState = System.Windows.Forms.CheckState.Checked;
this.cmbt_y_0_5.Name = "cmbt_y_0_5";
- this.cmbt_y_0_5.Size = new System.Drawing.Size(138, 34);
+ this.cmbt_y_0_5.Size = new System.Drawing.Size(91, 22);
this.cmbt_y_0_5.Tag = "0.5";
this.cmbt_y_0_5.Text = "0.5";
//
@@ -643,7 +643,7 @@ namespace vmsnet
//
this.cmbt_y_1_0.CheckOnClick = true;
this.cmbt_y_1_0.Name = "cmbt_y_1_0";
- this.cmbt_y_1_0.Size = new System.Drawing.Size(138, 34);
+ this.cmbt_y_1_0.Size = new System.Drawing.Size(91, 22);
this.cmbt_y_1_0.Tag = "1.0";
this.cmbt_y_1_0.Text = "1.0";
//
@@ -651,7 +651,7 @@ namespace vmsnet
//
this.cmbt_y_1_5.CheckOnClick = true;
this.cmbt_y_1_5.Name = "cmbt_y_1_5";
- this.cmbt_y_1_5.Size = new System.Drawing.Size(138, 34);
+ this.cmbt_y_1_5.Size = new System.Drawing.Size(91, 22);
this.cmbt_y_1_5.Tag = "1.5";
this.cmbt_y_1_5.Text = "1.5";
//
@@ -659,7 +659,7 @@ namespace vmsnet
//
this.cmbt_y_2_0.CheckOnClick = true;
this.cmbt_y_2_0.Name = "cmbt_y_2_0";
- this.cmbt_y_2_0.Size = new System.Drawing.Size(138, 34);
+ this.cmbt_y_2_0.Size = new System.Drawing.Size(91, 22);
this.cmbt_y_2_0.Tag = "2.0";
this.cmbt_y_2_0.Text = "2.0";
//
@@ -667,38 +667,38 @@ namespace vmsnet
//
this.cmbt_y_5_0.CheckOnClick = true;
this.cmbt_y_5_0.Name = "cmbt_y_5_0";
- this.cmbt_y_5_0.Size = new System.Drawing.Size(138, 34);
+ this.cmbt_y_5_0.Size = new System.Drawing.Size(91, 22);
this.cmbt_y_5_0.Tag = "5.0";
this.cmbt_y_5_0.Text = "5.0";
//
// ToolStripMenuItem2
//
this.ToolStripMenuItem2.Name = "ToolStripMenuItem2";
- this.ToolStripMenuItem2.Size = new System.Drawing.Size(195, 6);
+ this.ToolStripMenuItem2.Size = new System.Drawing.Size(147, 6);
//
// menus_winsize
//
this.menus_winsize.Name = "menus_winsize";
- this.menus_winsize.Size = new System.Drawing.Size(198, 32);
+ this.menus_winsize.Size = new System.Drawing.Size(150, 22);
this.menus_winsize.Text = "창 크기";
//
// GraphReSetToolStripMenuItem
//
this.GraphReSetToolStripMenuItem.Name = "GraphReSetToolStripMenuItem";
- this.GraphReSetToolStripMenuItem.Size = new System.Drawing.Size(198, 32);
+ this.GraphReSetToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
this.GraphReSetToolStripMenuItem.Text = "그래프 초기화";
this.GraphReSetToolStripMenuItem.Click += new System.EventHandler(this.GraphReSetToolStripMenuItem_Click);
//
// ToolStripMenuItem3
//
this.ToolStripMenuItem3.Name = "ToolStripMenuItem3";
- this.ToolStripMenuItem3.Size = new System.Drawing.Size(195, 6);
+ this.ToolStripMenuItem3.Size = new System.Drawing.Size(147, 6);
//
// DataPointToolStripMenuItem
//
this.DataPointToolStripMenuItem.CheckOnClick = true;
this.DataPointToolStripMenuItem.Name = "DataPointToolStripMenuItem";
- this.DataPointToolStripMenuItem.Size = new System.Drawing.Size(198, 32);
+ this.DataPointToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
this.DataPointToolStripMenuItem.Text = "Data Point";
this.DataPointToolStripMenuItem.Click += new System.EventHandler(this.DataPointToolStripMenuItem_Click);
//
@@ -707,14 +707,14 @@ namespace vmsnet
this.DebugMsgToolStripMenuItem.CheckOnClick = true;
this.DebugMsgToolStripMenuItem.ForeColor = System.Drawing.Color.Gray;
this.DebugMsgToolStripMenuItem.Name = "DebugMsgToolStripMenuItem";
- this.DebugMsgToolStripMenuItem.Size = new System.Drawing.Size(198, 32);
+ this.DebugMsgToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
this.DebugMsgToolStripMenuItem.Text = "Debug Msg";
this.DebugMsgToolStripMenuItem.Click += new System.EventHandler(this.DebugMsgToolStripMenuItem_Click);
//
// ToolStripMenuItem4
//
this.ToolStripMenuItem4.Name = "ToolStripMenuItem4";
- this.ToolStripMenuItem4.Size = new System.Drawing.Size(195, 6);
+ this.ToolStripMenuItem4.Size = new System.Drawing.Size(147, 6);
//
// cm1
//
@@ -731,7 +731,7 @@ namespace vmsnet
this.DebugMsgToolStripMenuItem,
this.ToolStripMenuItem4});
this.cm1.Name = "ContextMenuStrip1";
- this.cm1.Size = new System.Drawing.Size(199, 246);
+ this.cm1.Size = new System.Drawing.Size(151, 176);
//
// documentElement1
//
@@ -745,7 +745,7 @@ namespace vmsnet
//
// FMain
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1561, 779);
this.Controls.Add(this.TableLayoutPanel1);
diff --git a/cVMS.NET_CS/FMain.cs b/cVMS.NET_CS/FMain.cs
index a74531c..b5b01ee 100644
--- a/cVMS.NET_CS/FMain.cs
+++ b/cVMS.NET_CS/FMain.cs
@@ -766,7 +766,34 @@ namespace vmsnet
private void Pub_RemoteCommandEvent(object sender, RemoteCommand e)
{
- if (e.Command == rCommand.StateMessage)
+ if(e.Command == rCommand.AlarmValueReset)
+ {
+ ////auto로 된 그룹의 기준값을 변경한다.
+ this.DispCtrl1.SuspendLayout();
+ foreach (HMI.CGROUP c in DispCtrl1.GROUPS)
+ {
+ if (c.AlarmType == "AUTO")
+ {
+ ////이그룹을 사용하는 모든셀의 auto값을 초기화한다.
+ foreach (HMI.CITEM i in c.Items)
+ {
+ i.alamv = -999;
+ }
+ }
+ else if (c.AlarmType == "STOP")
+ {
+ c._alamcount = (short)0;
+ c._alamcountlb = (short)0;
+ }
+ }
+ this.DispCtrl1._raise_alarm_pre = true; ////혹알람이 발생되어있을지 모르니. 끄도록 발생한것 처럼 표시해준다.
+ this.DispCtrl1.ResumeLayout();
+ this.DispCtrl1.Invalidate();
+
+ ////설정정보를 가져온다.
+ PUB.SaveConfigFile("GRP");
+ }
+ else if (e.Command == rCommand.StateMessage)
{
var msg = e.Data.ToString();
if (PUB.lastStatueMessage.Equals(msg) == false)
@@ -1560,32 +1587,13 @@ namespace vmsnet
{
PUB.log.Add(AR.Log.ETYPE.NORMAL, "알람설정화면확인");
- ////auto로 된 그룹의 기준값을 변경한다.
- this.DispCtrl1.SuspendLayout();
- foreach (HMI.CGROUP c in DispCtrl1.GROUPS)
- {
- if (c.AlarmType == "AUTO")
- {
- ////이그룹을 사용하는 모든셀의 auto값을 초기화한다.
- foreach (HMI.CITEM i in c.Items)
- {
- i.alamv = -999;
- }
- }
- else if (c.AlarmType == "STOP")
- {
- c._alamcount = (short)0;
- c._alamcountlb = (short)0;
- }
- }
- this.DispCtrl1._raise_alarm_pre = true; ////혹알람이 발생되어있을지 모르니. 끄도록 발생한것 처럼 표시해준다.
- this.DispCtrl1.ResumeLayout();
- this.DispCtrl1.Invalidate();
-
-
- ////설정정보를 가져온다.
+ PUB.RaiseRemoteCommandEvent(rCommand.AlarmValueReset);
+
+ ////설정정보를 가져온다(저장은 메인에서만 진행한다)
PUB.SaveConfigFile("GRP");
+ //각 창별로 window1.grp / window2.grp 의 파일에 그룹상태를 저장 합니다
+ PUB.RaiseRemoteCommandEvent(rCommand.SaveGroupClass);
}
}
diff --git a/cVMS.NET_CS/FMain.resx b/cVMS.NET_CS/FMain.resx
index dd4ec78..d2624b7 100644
--- a/cVMS.NET_CS/FMain.resx
+++ b/cVMS.NET_CS/FMain.resx
@@ -127,7 +127,7 @@
iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHWSURBVFhH7ZZbSwJBFIB76uf1Ft2IIsr3HiSMYCGtrMCF
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHWSURBVFhH7ZZbSwJBFIB76uf1Ft2IIsr3HiSMYCGtrMCF
qIeoKLKXpCACCzQvPXQxKkMLbw9lkUaUl0goEk+cBSVnJNedHVhxD3ysO+dw5mPc2dm2Nj1aIQwmEbRI
lWDsAzRF6whG8yVqTA1UEYzmAaYcIelK5lhRRdARSEHHuBP2b16pHCvMgpFsCYbm/WDZDsHo8jmVZ4VZ
cN33AMbVC4jkSjBg9YIrmqVqWGASDL8XoW/6CDyJnHS/5r2Hic1rqo4FJsHFgzgIW8HKfThThF6LG06S
@@ -141,7 +141,7 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAN3SURBVFhHxVdNU5JRGGWmae30D5qWzdSiVYt+UsuaaRUG
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAN3SURBVFhHxVdNU5JRGGWmae30D5qWzdSiVYt+UsuaaRUG
oqVglmk600wbEcOPQgWV1D4EDFFEU0iwaVEivECh0vo0z/147+WtxqEJvDNnnuc55zz3npcdtmBkBWcJ
2zPfKM7q0NsswNbnfdz0xFsKelMF2M/BM1PCwHINg0s1DC7/5FX2xJtajfsYhE/3MI5mfY/3tDew/BO9
s2Wk9nMqQGo/C/d0CU8WaxhYPDGr7PmsV64xLBE4z/3E1/CEcXKfcxKemTJSOS3AZi6LnoCB/vAJ+l8T
@@ -162,7 +162,7 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAabSURBVFhHxZZ7TJPnHsebtGR/9X1fL2e4oUXdzbk5F8yS
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAabSURBVFhHxZZ7TJPnHsebtGR/9X1fL2e4oUXdzbk5F8yS
ZX9syXL+ODnJsmRZsi05Wc7x7MwYLwg6pyCCWIsoskIvMCdoubQUaAuVuakIKrch4AUt9ykXQQdt3xZ2
Ocv++C6/533bQhnbjFv2JJ98f8/z/B5+n0BKqlAoFArjlcUFZo/mW/Ot1d+aPQtz/Hqcl/r/8GVq1+CH
H79D/495CzL6fwvrMV/RIPr9Qy/TVxq0BTbj9D3hV6Ee6o1+/9DL2KZBa+CDeQOjaQ18CEPbij9eIL9F
@@ -196,7 +196,7 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAabSURBVFhHxZZ7TJPnHsebtGR/9X1fL2e4oUXdzbk5F8yS
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAabSURBVFhHxZZ7TJPnHsebtGR/9X1fL2e4oUXdzbk5F8yS
ZX9syXL+ODnJsmRZsi05Wc7x7MwYLwg6pyCCWIsoskIvMCdoubQUaAuVuakIKrch4AUt9ykXQQdt3xZ2
Ocv++C6/533bQhnbjFv2JJ98f8/z/B5+n0BKqlAoFArjlcUFZo/mW/Ot1d+aPQtz/Hqcl/r/8GVq1+CH
H79D/495CzL6fwvrMV/RIPr9Qy/TVxq0BTbj9D3hV6Ee6o1+/9DL2KZBa+CDeQOjaQ18CEPbij9eIL9F
@@ -230,7 +230,7 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAURSURBVFhHzZdrTFNnGMfPl1JEuVgEBPHjsuzDkmVR5KLz
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAURSURBVFhHzZdrTFNnGMfPl1JEuVgEBPHjsuzDkmVR5KLz
wihjkswblDvIRLkVRWRKxKHC4ubinDA3gmxzm1uMcSbKnRYEdcNt6jbNlkyBFitTTIhZtnMBNf/ledtT
T0/LqJsme5Jfctr35f97nvccTlKOe8zKrth2JKdiGzxBa+r9T7yytpSj49drHqE19f4nXmmlRqzZUOCR
dGPZf2+gYWXgwAcrA0A0JAegYWUgjNl6pBQWOcmtqPBISpG8pxhl2XrkxoU7Muw5lK32udWhVwPwy75o
@@ -258,7 +258,7 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAQnSURBVFhH5ZRtTFtVGICvGmWM9t5aWlhpy8DCNrdg2CaE
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQnSURBVFhH5ZRtTFtVGICvGmWM9t5aWlhpy8DCNrdg2CaE
xTBds8yEAD+Y7I+LxsQ/ix9Rf6gM2IlO4seQxkAyWaeMkU23AWNsOj6EIsOJM87p5n4QF8JaPlrarkDv
Z0dfcw+jrqdU0RUS45M86cn7vud9z217D0X9l/E1Gp72HdWXkvFlYbRet9LXYJy5dYzhpxpTEsn8kuNt
0tWwtp3A9ZeC75j+JJlfUtxNeoOzTisGpRmAWQlGj+skzxHjBrJuyfAc0fXwP70O0o+FEPj1BRB+fgNu
@@ -282,7 +282,7 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAARxSURBVFhH7ZdLU5tVGMffGfd+BBeV3BNyIRBCSEIuJAYw
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAARxSURBVFhH7ZdLU5tVGMffGfd+BBeV3BNyIRBCSEIuJAYw
NCUEEgLFta2fwZ0b9QPIzo2u2xm/gE21jtpAKFCqrhzMmwsJWlfJzN95znvOe81ohym6MTO/eS7nOc//
z5sQBkn6/8Vftd33DtKZHFKZHChW6/vI5VdZ/tWjR9fi1z9eIhyOqDsplstbtXz+XY9ZX6KBjz/5FO/f
+4AhDFD+52h0bcrlirqT9gsTZn0plV5GdWefCdd4JAO1+l38fHWFX66GPOoZGnKfP6Ai7uTyK6jt3GU7
@@ -307,7 +307,7 @@
iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAABhKSURBVHhe7ZsHWFRnusePTKNPodo3btpqNsmmGDXqKGAn
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAABhKSURBVHhe7ZsHWFRnusePTKNPodo3btpqNsmmGDXqKGAn
ighIUVFEyoBi1Giqxxg1mtx0o4nZ7M1zn81uNru5WVEULBkLxUKRIjAz1KHXoYiFMu993u+cM3PmMKhp
u/c+z/2e5x8IzJzv/f3f93u/7xxGivr/8euOEo2Xa3mycpE+SfmWXqM8a9C41+sTXG7oNco7+iRlP5FG
eac8ybXPEK9sNSQoLukSlR+UJytXlmi8fIXX+z8x9BtV43SJyl3lGtdahKuO9hpo3PEAtNKPQef+56Hr
@@ -417,7 +417,7 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAStSURBVFhH7ZZdTJNnFMef290sS1x0zhgXhyjJLiZ6sezG
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAStSURBVFhH7ZZdTJNnFMef290sS1x0zhgXhyjJLiZ6sezG
i3lBtt3uauFmcOHHPmI2dS4a2OIUiZluUTTSCPJhUWiLtWhtpaXY10Kp5cMWaCms6MAXBhQtgn2r7385
z9sX6OuIkXLpSX455zznec7/n6ZNytibeEXUemJYLpc9MWj3vXbUeqYgPEjC/SAJYViCeziZ6iUIVA+r
OclnHH43CX3bShhoi+HOsITWqIQ70STPan2H5wWUmXKH+isdjzM3oG+fhutvCS1RCS2UOcn5zGdpZwt9
@@ -443,7 +443,7 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAKdSURBVFhH7VZNiFJRGJ2IVm2CZhtEwQRBi1kEMQgR0SKC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKdSURBVFhH7VZNiFJRGJ2IVm2CZhtEwQRBi1kEMQgR0SKC
DDT8QXETTjUQBEbSgJY1Qw5MpFPTQsRUEMRZWptIazdOZUbgH4Wlgz+0mfwhCfGL8/A6+Urn3lYtPHDA
B98597z7Xe/3JibGGEMMu8xm8x6DwbDXZDLtMxqN+3U63eQooga10EALD7kpN2AAM71ef0ir1U5rNJoZ
nU6nGEXUoBYaaHsh/g14CxidcWxETy99IRFCAy085L7cwBvgbU7dL5B3/Se9yHa4iFpooIWH3FeOoX3W
@@ -460,7 +460,7 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAZRSURBVFhH7VZtbJNVFFZBiB/RiJqgIgnR+MPEGENMNFGr
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAZRSURBVFhH7VZtbJNVFFZBiB/RiJqgIgnR+MPEGENMNFGr
P0gwkMhi3/ZtmfCDhF+SEsJYM5KVZS9h61YCtBS6FTbavm1vu0/YLOvWbl1Hxz7Y+NiAsQ8YX4PBNhJ/
+MOYa54Lt3n7jlXR+M+TPLlv7z3nPOeee869fe65/+UfCiFkSzgc7n+CJCHEqNb5z4QQ8nMsFqN37txh
uHXrFm1tbaWEkJ/Uuv9aCCGfBINBZzAYtBFCPiSErPL7/cM3b96kjx49ojMzM2ycmJiggUAgRQh5jxDy
@@ -493,7 +493,7 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAciSURBVFhHnZZpTFvZGYaPqnbU0bSj/pi2U3VRR6qqVmql
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAciSURBVFhHnZZpTFvZGYaPqnbU0bSj/pi2U3VRR6qqVmql
VqPOn0oz/VFV7Y+2qhS1Umc0SaWpqqQzUaTQkGDwZQ2MbQgkQMxqwLsD2GwhkBAgJGEnYTcQNmNj3+vl
egFvhLzVuRMssB1D+0mPrOv7nvd7z3euF0JOWMV6y+syk/NP0hZOITM6JiQt3IrMyEGghVuj78laWbXE
5PhLuYH9Wvz6/7skBvZtWQtbyxi5YGmHE4oHPhinQxjdjGCRjcaY3Iqg6VEAZZ0uUK2slWsqavf8IN7v
@@ -530,7 +530,7 @@
iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAJSSURBVFhH7db/axJxHMfx/RH9Ff3aH2A/7dym5mhBQo2x
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJSSURBVFhH7db/axJxHMfx/RH9Ff3aH2A/7dym5mhBQo2x
+qkf+qEvPw9ibDs9XYOVtVoz2qDol9jI6CfDOu+805mVFfNkWBq1wNWuaNO5V3wEZX7COXc7Peie8P5B
TvTBh7d3dnWZ/S8xEwKMNLSvArwVKxtiTKDWMYFapyHQKJlArZlArZlArbUMvLKQqns96F/+5+He6pDP
aBS5Tvv2BLY7E6i14duJ1oDt3kES7dsT2IlonyGAyexPnL+TxAmfBIdHembjYkcMAwyEP8HpleHn1/Hk
@@ -546,7 +546,7 @@
iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAC6SURBVFhHY2AYBaNgEIBpVS7/icY1Lr3o+mkOQBbf3pBK
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC6SURBVFhHY2AYBaNgEIBpVS7/icY1Lr3o+mkOQBbf3pBK
EF9dk/x/Wr3nlxlVLn3oZtAUEOvAAXMkKQ4E4fMrEv/X12n9wYh+KmOyHHhkXtT/uQ0e//fMjv3/8XTz
/6/nWmmCMRxILF7S5vv/wZ5yDAOpjTEciK5goPGoAynFow6kFI86kFI86kBK8agDKcWjDqQUjzqQUjzq
QErxqAMpxaMOpBSPOpBSPOpASjGGAwcjhjtwFIyCAQQAl/T9hdakfvYAAAAASUVORK5CYII=
diff --git a/cVMS.NET_CS/Frm_Sub.cs b/cVMS.NET_CS/Frm_Sub.cs
index 12b1545..e714182 100644
--- a/cVMS.NET_CS/Frm_Sub.cs
+++ b/cVMS.NET_CS/Frm_Sub.cs
@@ -222,7 +222,31 @@ namespace vmsnet
delegate void Pub_RemoteCommandEventHandler(object sender, RemoteCommand e);
private void Pub_RemoteCommandEvent(object sender, RemoteCommand e)
{
- if (e.Command == rCommand.StateMessage)
+ if(e.Command == rCommand.AlarmValueReset)
+ {
+ ////auto로 된 그룹의 기준값을 변경한다.
+ this.DispCtrl1.SuspendLayout();
+ foreach (HMI.CGROUP c in DispCtrl1.GROUPS)
+ {
+ if (c.AlarmType == "AUTO")
+ {
+ ////이그룹을 사용하는 모든셀의 auto값을 초기화한다.
+ foreach (HMI.CITEM i in c.Items)
+ {
+ i.alamv = -999;
+ }
+ }
+ else if (c.AlarmType == "STOP")
+ {
+ c._alamcount = (short)0;
+ c._alamcountlb = (short)0;
+ }
+ }
+ this.DispCtrl1._raise_alarm_pre = true; ////혹알람이 발생되어있을지 모르니. 끄도록 발생한것 처럼 표시해준다.
+ this.DispCtrl1.ResumeLayout();
+ this.DispCtrl1.Invalidate();
+ }
+ else if (e.Command == rCommand.StateMessage)
{
if (this.InvokeRequired)
{
diff --git a/cVMS.NET_CS/RunCode/_00_System_Initialize.cs b/cVMS.NET_CS/RunCode/_00_System_Initialize.cs
index c5d6121..fecf46f 100644
--- a/cVMS.NET_CS/RunCode/_00_System_Initialize.cs
+++ b/cVMS.NET_CS/RunCode/_00_System_Initialize.cs
@@ -19,7 +19,7 @@ namespace vmsnet
VAR.Init();
//연결체크용 쓰레드
- thConnection= Task.Run(() => bwDeviceConnection());
+ thConnection = Task.Run(() => bwDeviceConnection());
}
}
diff --git a/cVMS.NET_CS/Setting/Frm_Alam.Designer.cs b/cVMS.NET_CS/Setting/Frm_Alam.Designer.cs
index 71ea947..33bcfbb 100644
--- a/cVMS.NET_CS/Setting/Frm_Alam.Designer.cs
+++ b/cVMS.NET_CS/Setting/Frm_Alam.Designer.cs
@@ -70,11 +70,14 @@ namespace vmsnet
this.StatusStrip1 = new System.Windows.Forms.StatusStrip();
this.ToolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.Button1 = new System.Windows.Forms.Button();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.chkResetValue = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.DataGridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.BindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.DataSet1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.DataTable1)).BeginInit();
this.StatusStrip1.SuspendLayout();
+ this.panel1.SuspendLayout();
this.SuspendLayout();
//
// DataGridView1
@@ -85,6 +88,7 @@ namespace vmsnet
this.DataGridView1.AutoGenerateColumns = false;
this.DataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
this.DataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
+ this.DataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.DataGridView1.ColumnHeadersHeight = 40;
this.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.DataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -116,7 +120,7 @@ namespace vmsnet
this.DataGridView1.RowHeadersWidth = 50;
this.DataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
this.DataGridView1.RowTemplate.Height = 23;
- this.DataGridView1.Size = new System.Drawing.Size(1010, 461);
+ this.DataGridView1.Size = new System.Drawing.Size(1010, 475);
this.DataGridView1.TabIndex = 0;
this.DataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView1_CellContentClick);
this.DataGridView1.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.DataGridView1_CellFormatting);
@@ -146,7 +150,7 @@ namespace vmsnet
this.TypeDataGridViewTextBoxColumn.Name = "TypeDataGridViewTextBoxColumn";
this.TypeDataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.TypeDataGridViewTextBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.TypeDataGridViewTextBoxColumn.Width = 125;
+ this.TypeDataGridViewTextBoxColumn.Width = 82;
//
// HighDataGridViewTextBoxColumn
//
@@ -156,7 +160,7 @@ namespace vmsnet
this.HighDataGridViewTextBoxColumn.HeaderText = "Manual(H)";
this.HighDataGridViewTextBoxColumn.MinimumWidth = 8;
this.HighDataGridViewTextBoxColumn.Name = "HighDataGridViewTextBoxColumn";
- this.HighDataGridViewTextBoxColumn.Width = 160;
+ this.HighDataGridViewTextBoxColumn.Width = 108;
//
// LowDataGridViewTextBoxColumn
//
@@ -166,7 +170,7 @@ namespace vmsnet
this.LowDataGridViewTextBoxColumn.HeaderText = "Manual(L)";
this.LowDataGridViewTextBoxColumn.MinimumWidth = 8;
this.LowDataGridViewTextBoxColumn.Name = "LowDataGridViewTextBoxColumn";
- this.LowDataGridViewTextBoxColumn.Width = 156;
+ this.LowDataGridViewTextBoxColumn.Width = 105;
//
// AhighDataGridViewTextBoxColumn
//
@@ -176,7 +180,7 @@ namespace vmsnet
this.AhighDataGridViewTextBoxColumn.HeaderText = "Auto(±)";
this.AhighDataGridViewTextBoxColumn.MinimumWidth = 8;
this.AhighDataGridViewTextBoxColumn.Name = "AhighDataGridViewTextBoxColumn";
- this.AhighDataGridViewTextBoxColumn.Width = 127;
+ this.AhighDataGridViewTextBoxColumn.Width = 87;
//
// AlowDataGridViewTextBoxColumn
//
@@ -187,7 +191,7 @@ namespace vmsnet
this.AlowDataGridViewTextBoxColumn.MinimumWidth = 8;
this.AlowDataGridViewTextBoxColumn.Name = "AlowDataGridViewTextBoxColumn";
this.AlowDataGridViewTextBoxColumn.Visible = false;
- this.AlowDataGridViewTextBoxColumn.Width = 103;
+ this.AlowDataGridViewTextBoxColumn.Width = 71;
//
// nbhh
//
@@ -196,7 +200,7 @@ namespace vmsnet
this.nbhh.MinimumWidth = 8;
this.nbhh.Name = "nbhh";
this.nbhh.Visible = false;
- this.nbhh.Width = 113;
+ this.nbhh.Width = 81;
//
// nbh
//
@@ -206,7 +210,7 @@ namespace vmsnet
this.nbh.HeaderText = "NullB(Alarm1)";
this.nbh.MinimumWidth = 8;
this.nbh.Name = "nbh";
- this.nbh.Width = 199;
+ this.nbh.Width = 131;
//
// nbl
//
@@ -216,7 +220,7 @@ namespace vmsnet
this.nbl.HeaderText = "NullB(Alarm2)";
this.nbl.MinimumWidth = 8;
this.nbl.Name = "nbl";
- this.nbl.Width = 199;
+ this.nbl.Width = 131;
//
// nbll
//
@@ -225,7 +229,7 @@ namespace vmsnet
this.nbll.MinimumWidth = 8;
this.nbll.Name = "nbll";
this.nbll.Visible = false;
- this.nbll.Width = 109;
+ this.nbll.Width = 79;
//
// BindingSource1
//
@@ -324,10 +328,10 @@ namespace vmsnet
this.StatusStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
this.StatusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripStatusLabel1});
- this.StatusStrip1.Location = new System.Drawing.Point(0, 529);
+ this.StatusStrip1.Location = new System.Drawing.Point(0, 536);
this.StatusStrip1.Name = "StatusStrip1";
this.StatusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 20, 0);
- this.StatusStrip1.Size = new System.Drawing.Size(1010, 29);
+ this.StatusStrip1.Size = new System.Drawing.Size(1010, 22);
this.StatusStrip1.TabIndex = 2;
this.StatusStrip1.Text = "StatusStrip1";
//
@@ -335,29 +339,50 @@ namespace vmsnet
//
this.ToolStripStatusLabel1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.999999F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.ToolStripStatusLabel1.Name = "ToolStripStatusLabel1";
- this.ToolStripStatusLabel1.Size = new System.Drawing.Size(423, 22);
+ this.ToolStripStatusLabel1.Size = new System.Drawing.Size(373, 17);
this.ToolStripStatusLabel1.Text = "개별알람 및 개별알람(자동)으로 설정된 셀은 영향을 받지 않습니다.";
//
// Button1
//
- this.Button1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.Button1.Dock = System.Windows.Forms.DockStyle.Fill;
this.Button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Button1.Location = new System.Drawing.Point(0, 461);
+ this.Button1.Location = new System.Drawing.Point(0, 0);
this.Button1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Button1.Name = "Button1";
- this.Button1.Size = new System.Drawing.Size(1010, 68);
+ this.Button1.Size = new System.Drawing.Size(858, 61);
this.Button1.TabIndex = 3;
this.Button1.Text = "저장";
this.Button1.UseVisualStyleBackColor = true;
this.Button1.Click += new System.EventHandler(this.Button1_Click);
//
+ // panel1
+ //
+ this.panel1.Controls.Add(this.Button1);
+ this.panel1.Controls.Add(this.chkResetValue);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panel1.Location = new System.Drawing.Point(0, 475);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(1010, 61);
+ this.panel1.TabIndex = 4;
+ //
+ // chkResetValue
+ //
+ this.chkResetValue.Dock = System.Windows.Forms.DockStyle.Right;
+ this.chkResetValue.Location = new System.Drawing.Point(858, 0);
+ this.chkResetValue.Name = "chkResetValue";
+ this.chkResetValue.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);
+ this.chkResetValue.Size = new System.Drawing.Size(152, 61);
+ this.chkResetValue.TabIndex = 0;
+ this.chkResetValue.Text = "알람 기준값 초기화";
+ this.chkResetValue.UseVisualStyleBackColor = true;
+ //
// Frm_Alam
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 29F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1010, 558);
this.Controls.Add(this.DataGridView1);
- this.Controls.Add(this.Button1);
+ this.Controls.Add(this.panel1);
this.Controls.Add(this.StatusStrip1);
this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.KeyPreview = true;
@@ -372,6 +397,7 @@ namespace vmsnet
((System.ComponentModel.ISupportInitialize)(this.DataTable1)).EndInit();
this.StatusStrip1.ResumeLayout(false);
this.StatusStrip1.PerformLayout();
+ this.panel1.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -406,6 +432,8 @@ namespace vmsnet
internal System.Windows.Forms.DataGridViewTextBoxColumn nbl;
internal System.Windows.Forms.DataGridViewTextBoxColumn nbll;
private System.ComponentModel.IContainer components;
+ private Panel panel1;
+ private CheckBox chkResetValue;
}
}
diff --git a/cVMS.NET_CS/Setting/Frm_Alam.cs b/cVMS.NET_CS/Setting/Frm_Alam.cs
index 9d0a133..6d124c6 100644
--- a/cVMS.NET_CS/Setting/Frm_Alam.cs
+++ b/cVMS.NET_CS/Setting/Frm_Alam.cs
@@ -65,7 +65,10 @@ namespace vmsnet
if (CDT == null)
{
//MsgBox("변경된 내용이 없습니다", MsgBoxStyle.Information, "확인")
- this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ if (chkResetValue.Checked)
+ this.DialogResult = DialogResult.OK;
+ else
+ this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
}
else
{
@@ -94,8 +97,7 @@ namespace vmsnet
////설정바꾼다.
PUB.RaiseRemoteCommandEvent(rCommand.UpdateAlarmSetting,idx);
- //각 창별로 window1.grp / window2.grp 의 파일에 그룹상태를 저장 합니다
- PUB.RaiseRemoteCommandEvent(rCommand.SaveGroupClass);
+
}
this.DialogResult = System.Windows.Forms.DialogResult.OK;
}