diff --git a/Viewer/TrendViewer/Frm_trend.Designer.cs b/Viewer/TrendViewer/Frm_trend.Designer.cs index f470409..540f304 100644 --- a/Viewer/TrendViewer/Frm_trend.Designer.cs +++ b/Viewer/TrendViewer/Frm_trend.Designer.cs @@ -254,7 +254,7 @@ namespace vmsnet this.TabPage2.Location = new System.Drawing.Point(4, 34); this.TabPage2.Name = "TabPage2"; this.TabPage2.Padding = new System.Windows.Forms.Padding(3); - this.TabPage2.Size = new System.Drawing.Size(186, 726); + this.TabPage2.Size = new System.Drawing.Size(186, 724); this.TabPage2.TabIndex = 1; this.TabPage2.Text = "기타"; this.TabPage2.UseVisualStyleBackColor = true; @@ -264,7 +264,7 @@ namespace vmsnet this.PropertyGrid1.Dock = System.Windows.Forms.DockStyle.Fill; this.PropertyGrid1.Location = new System.Drawing.Point(3, 3); this.PropertyGrid1.Name = "PropertyGrid1"; - this.PropertyGrid1.Size = new System.Drawing.Size(180, 720); + this.PropertyGrid1.Size = new System.Drawing.Size(180, 718); this.PropertyGrid1.TabIndex = 0; // // bt_cursor2 diff --git a/cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs b/cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs index 6f1369d..b8759d6 100644 --- a/cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs +++ b/cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs @@ -431,6 +431,31 @@ namespace vmsnet.HMI } #endregion + private RectangleF[] GetRectangleTitle(Graphics g, RectangleF ItemRect, CGROUP grp, Boolean isprint) + { + Font applyfont = this.FONT_CT;// grp.셀글꼴; + if (isprint) applyfont = new Font(applyfont.FontFamily, 6, FontStyle.Bold); + + String Cellno = grp.maxcellname; + SizeF CellNoSize = g.MeasureString(Cellno, applyfont); + SizeF CellAlSize = g.MeasureString("88/88", applyfont); + + //------------- | ----------- | ------------ + // cell pv alarm + //------------- | ----------- | ------------ + + Single H = (Single)(CellNoSize.Height * 2.5); //높이값 + Single NameSize = (Single)(CellNoSize.Width * 1.05); //살짝더크게 + Single PvSize = ItemRect.Width - (Single)(CellNoSize.Width * 1.05) - (Single)(CellAlSize.Width); + Single AlamSize = ItemRect.Width - NameSize - PvSize; + + RectangleF CellNoRect = new RectangleF(ItemRect.Left, ItemRect.Top, NameSize, H); + RectangleF CellPvRect = new RectangleF(CellNoRect.Left + CellNoRect.Width, ItemRect.Top, PvSize, H); + RectangleF CellALRect = new RectangleF(CellPvRect.Left + CellPvRect.Width, ItemRect.Top, AlamSize, H); + + return new RectangleF[3] { CellNoRect, CellPvRect, CellALRect }; + } + private void DrawItem(Graphics g, CGROUP grp, RectangleF R, short CellGroupidx, Boolean isprint, Boolean isVisible) { RectangleF[] CellTitleRect = DrawCellTitle(g, R, grp, isprint); //0번은 title label ,1 번은 value label @@ -736,11 +761,12 @@ namespace vmsnet.HMI //최대,최소,합계VOLT 누적 if (Item.사용 && Item.활성화) { + //if (Item.CurValue > 0) Debugger.Break(); + if (Item.CurValue >= grp.Maxvolt) { grp._maxvolt = Item.CurValue; grp._maxitem = Item; - } if (Item.CurValue <= grp.Minvolt) { @@ -750,10 +776,6 @@ namespace vmsnet.HMI grp._sumvolt += Item.CurValue1; //분주되기전의 sum값 140829 grp._sumvolt1 += Item.CurValue; //분주된후의 sum값 140829 } - else - { /* 작성자: 이재웅, 작성일: 2024-10-11, 작성내용: 'Item.활성화' 되지 않아서 그룹 타이틀의 'grp.Maxvolt' 및 'grp.Minvolt' 표기 오류 정정 */ - grp._maxvolt = grp._minvolt = 0; - } //알람활성화여부(오버데이터는 알람설정하지 않는다) if (!Item._onalamover && Item.알람형태 != COMM.EALAMTYPE.사용안함 && Item.사용) @@ -1258,7 +1280,7 @@ namespace vmsnet.HMI //g.DrawString(this.window.disconnecttime.ToString(), this.Font, Brushes.Red, R.Left,R.Top); } - + grp._amp = 0; if (grp._ampidx != "" && grp._ampidx != null) {