JDTek/vms2016_kadisp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 알람셋팅화면에 기준값초기화 체크박스 추가

Browse Source 
2. 기준값 초기화시 신규 설정된 기준값이 바로 저장되도록 함 (필요한 경우 5분 혹은 10분간격으로 window1, window2 : grp 파일은 생성해주는 것이 좋을 듯함)
3. 알람 설정화면을 통해서 값 변경시 , 기준값초기화 기능이 서브윈도우에 적용되지 않는 버그 수정
This commit is contained in:
tindevil
2025-07-01 22:11:17 +09:00
parent 9958dd0cf8
commit ffa0cb9bf9
8 changed files with 186 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
cVMS.NET_CS/Setting/Frm_Alam.Designer.cs generated
View File

@@ -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;
}
}

8
cVMS.NET_CS/Setting/Frm_Alam.cs
View File

@@ -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;
}