diff --git a/cVMS.NET_CS/FMain.Designer.cs b/cVMS.NET_CS/FMain.Designer.cs index fe3c8fb..976dd77 100644 --- a/cVMS.NET_CS/FMain.Designer.cs +++ b/cVMS.NET_CS/FMain.Designer.cs @@ -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, 29); + this.bt_config.Size = new System.Drawing.Size(76, 39); 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, 29); + this.ToolStripButton1.Size = new System.Drawing.Size(76, 39); this.ToolStripButton1.Text = "정보"; this.ToolStripButton1.Click += new System.EventHandler(this.ToolStripButton1_Click_6); // diff --git a/cVMS.NET_CS/FMain.cs b/cVMS.NET_CS/FMain.cs index 3fb49db..3c37bdc 100644 --- a/cVMS.NET_CS/FMain.cs +++ b/cVMS.NET_CS/FMain.cs @@ -901,6 +901,8 @@ namespace vmsnet this.DispCtrl1.Font_Header = PUB.GetFontFromStr(PUB.DESIGN.font_summary); this.DispCtrl1.FONT_CT = PUB.GetFontFromStr(PUB.DESIGN.font_celltitle); this.DispCtrl1.FONT_AV = PUB.GetFontFromStr(PUB.DESIGN.font_alarmvalue); + this.DispCtrl1.FONT_KA = PUB.GetFontFromStr(PUB.DESIGN.font_kaValue); + this.DispCtrl1.FONT_KU = PUB.GetFontFromStr(PUB.DESIGN.font_kaUnit); DispCtrl1_RaiseAlarm(false); diff --git a/cVMS.NET_CS/Frm_Sub.cs b/cVMS.NET_CS/Frm_Sub.cs index 92a7cbe..0bf1996 100644 --- a/cVMS.NET_CS/Frm_Sub.cs +++ b/cVMS.NET_CS/Frm_Sub.cs @@ -420,6 +420,8 @@ namespace vmsnet this.DispCtrl1.Font_Header = PUB.GetFontFromStr(PUB.DESIGN.font_summary); this.DispCtrl1.FONT_CT = PUB.GetFontFromStr(PUB.DESIGN.font_celltitle); this.DispCtrl1.FONT_AV = PUB.GetFontFromStr(PUB.DESIGN.font_alarmvalue); + this.DispCtrl1.FONT_KA = PUB.GetFontFromStr(PUB.DESIGN.font_kaValue); + this.DispCtrl1.FONT_KU = PUB.GetFontFromStr(PUB.DESIGN.font_kaUnit); DispCtrl1_RaiseAlarm(false); diff --git a/cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs b/cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs index 1b29075..d0eaf7e 100644 --- a/cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs +++ b/cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs @@ -167,6 +167,8 @@ namespace vmsnet.HMI public Font FONT_CT = new Font("Tahoma", 8, FontStyle.Bold); public Font FONT_AV = new Font("Tahoma", 7, FontStyle.Bold); + public Font FONT_KA = new Font("Arial", 40, FontStyle.Bold); //ka-value + public Font FONT_KU = new Font("Arial", 10, FontStyle.Bold); //ka-unit public bool EnableKA { get; set; } = false; /// @@ -223,8 +225,7 @@ namespace vmsnet.HMI private string Warn_msg = ""; //경고메세지(화면 최상단중앙에 표시됨) private Font Warn_Font; - private Font KAFONT = new Font("Arial", 40, FontStyle.Bold); - private Font KAFONTU = new Font("Arial", 10, FontStyle.Bold); + private Font alamfont = new Font("Arial", 8, FontStyle.Bold); //ALAMICON_01 //기타설정' @@ -1436,17 +1437,17 @@ namespace vmsnet.HMI /**************************************************************************************/ - Fontsize = g.MeasureString(MaxKA, KAFONT); - SizeF FontSizeu = g.MeasureString(Kaunit, KAFONTU); + Fontsize = g.MeasureString(MaxKA, FONT_KA); + SizeF FontSizeu = g.MeasureString(Kaunit, FONT_KU); RectangleF KARECT = new RectangleF(grp.Rect_Header.Left + grp.Rect_Header.Width - Fontsize.Width, grp.Rect_Header.Top + (grp.Rect_Header.Height - Fontsize.Height), Fontsize.Width, Fontsize.Height); if (EnableKA == false) KARECT = new RectangleF(grp.Rect_Header.Right, KARECT.Top, 0, 0); //g.FillRectangle(Brushes.Black, KARECT); if (IsVisible && KARECT.IsEmpty == false) { - g.DrawString(MaxKA.ToString(), KAFONT, Brushes.Black, KARECT.Left + 2, KARECT.Top + 2); - g.DrawString(MaxKA.ToString(), KAFONT, Brushes.Yellow, KARECT.Left, KARECT.Top); - g.DrawString(Kaunit, KAFONTU, Brushes.Yellow, KARECT.Left + KARECT.Width - FontSizeu.Width - 10, KARECT.Top - 10); + g.DrawString(MaxKA.ToString(), FONT_KA, Brushes.Black, KARECT.Left + 2, KARECT.Top + 2); + g.DrawString(MaxKA.ToString(), FONT_KA, Brushes.Yellow, KARECT.Left, KARECT.Top); + g.DrawString(Kaunit, FONT_KU, Brushes.Yellow, KARECT.Left + KARECT.Width - FontSizeu.Width - 10, KARECT.Top - 10); } //NullBalance Display diff --git a/cVMS.NET_CS/Setting/CSetting.cs b/cVMS.NET_CS/Setting/CSetting.cs index e9b0742..745cacb 100644 --- a/cVMS.NET_CS/Setting/CSetting.cs +++ b/cVMS.NET_CS/Setting/CSetting.cs @@ -66,6 +66,9 @@ namespace vmsnet public string font_summary { get; set; } public string font_celltitle { get; set; } public string font_alarmvalue { get; set; } + + public string font_kaValue { get; set; } + public string font_kaUnit { get; set; } public override void AfterLoad() { if (font_nb.isEmpty()) font_nb = "Tahoma,35,1"; @@ -74,6 +77,8 @@ namespace vmsnet if (font_summary.isEmpty()) font_summary = "Tahoma,10,1"; if (font_celltitle.isEmpty()) font_celltitle = "Tahoma,8,1"; if (font_alarmvalue.isEmpty()) font_alarmvalue = "Tahoma,7,1"; + if (font_kaValue.isEmpty()) font_kaValue = "Arial,40,1"; + if (font_kaUnit.isEmpty()) font_kaUnit = "Arial,10,1"; } public override void AfterSave() { diff --git a/cVMS.NET_CS/Setting/fDesignSetting.Designer.cs b/cVMS.NET_CS/Setting/fDesignSetting.Designer.cs index 21c90fa..2af9b2d 100644 --- a/cVMS.NET_CS/Setting/fDesignSetting.Designer.cs +++ b/cVMS.NET_CS/Setting/fDesignSetting.Designer.cs @@ -42,15 +42,19 @@ this.linkLabel5 = new System.Windows.Forms.LinkLabel(); this.tbFontAvalue = new System.Windows.Forms.TextBox(); this.linkLabel6 = new System.Windows.Forms.LinkLabel(); + this.tbFontKaValue = new System.Windows.Forms.TextBox(); + this.linkLabel7 = new System.Windows.Forms.LinkLabel(); + this.tbFontKaUnit = new System.Windows.Forms.TextBox(); + this.linkLabel8 = new System.Windows.Forms.LinkLabel(); this.SuspendLayout(); // // linkLabel1 // this.linkLabel1.AutoSize = true; - this.linkLabel1.Location = new System.Drawing.Point(23, 32); - this.linkLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.linkLabel1.Location = new System.Drawing.Point(34, 48); + this.linkLabel1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(289, 32); + this.linkLabel1.Size = new System.Drawing.Size(444, 48); this.linkLabel1.TabIndex = 0; this.linkLabel1.TabStop = true; this.linkLabel1.Text = "Null balance Display Font"; @@ -59,10 +63,10 @@ // linkLabel2 // this.linkLabel2.AutoSize = true; - this.linkLabel2.Location = new System.Drawing.Point(45, 146); - this.linkLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.linkLabel2.Location = new System.Drawing.Point(68, 219); + this.linkLabel2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.linkLabel2.Name = "linkLabel2"; - this.linkLabel2.Size = new System.Drawing.Size(267, 32); + this.linkLabel2.Size = new System.Drawing.Size(409, 48); this.linkLabel2.TabIndex = 0; this.linkLabel2.TabStop = true; this.linkLabel2.Text = "Cell Name Dispaly Font"; @@ -70,20 +74,20 @@ // // tbfontnb // - this.tbfontnb.Location = new System.Drawing.Point(320, 32); - this.tbfontnb.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tbfontnb.Location = new System.Drawing.Point(480, 48); + this.tbfontnb.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); this.tbfontnb.Name = "tbfontnb"; this.tbfontnb.ReadOnly = true; - this.tbfontnb.Size = new System.Drawing.Size(394, 39); + this.tbfontnb.Size = new System.Drawing.Size(589, 55); this.tbfontnb.TabIndex = 1; // // linkLabel3 // this.linkLabel3.AutoSize = true; - this.linkLabel3.Location = new System.Drawing.Point(49, 203); - this.linkLabel3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.linkLabel3.Location = new System.Drawing.Point(74, 304); + this.linkLabel3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.linkLabel3.Name = "linkLabel3"; - this.linkLabel3.Size = new System.Drawing.Size(263, 32); + this.linkLabel3.Size = new System.Drawing.Size(402, 48); this.linkLabel3.TabIndex = 0; this.linkLabel3.TabStop = true; this.linkLabel3.Text = "Cell Value Display Font"; @@ -91,28 +95,29 @@ // // tbfontcellname // - this.tbfontcellname.Location = new System.Drawing.Point(320, 146); - this.tbfontcellname.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tbfontcellname.Location = new System.Drawing.Point(480, 219); + this.tbfontcellname.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); this.tbfontcellname.Name = "tbfontcellname"; this.tbfontcellname.ReadOnly = true; - this.tbfontcellname.Size = new System.Drawing.Size(394, 39); + this.tbfontcellname.Size = new System.Drawing.Size(589, 55); this.tbfontcellname.TabIndex = 1; // // tbfontcellvalue // - this.tbfontcellvalue.Location = new System.Drawing.Point(320, 203); - this.tbfontcellvalue.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tbfontcellvalue.Location = new System.Drawing.Point(480, 304); + this.tbfontcellvalue.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); this.tbfontcellvalue.Name = "tbfontcellvalue"; this.tbfontcellvalue.ReadOnly = true; - this.tbfontcellvalue.Size = new System.Drawing.Size(394, 39); + this.tbfontcellvalue.Size = new System.Drawing.Size(589, 55); this.tbfontcellvalue.TabIndex = 1; // // button1 // this.button1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.button1.Location = new System.Drawing.Point(10, 379); + this.button1.Location = new System.Drawing.Point(15, 798); + this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(708, 67); + this.button1.Size = new System.Drawing.Size(1062, 100); this.button1.TabIndex = 2; this.button1.Text = "OK"; this.button1.UseVisualStyleBackColor = true; @@ -120,20 +125,20 @@ // // tbFontSummary // - this.tbFontSummary.Location = new System.Drawing.Point(320, 317); - this.tbFontSummary.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tbFontSummary.Location = new System.Drawing.Point(480, 476); + this.tbFontSummary.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); this.tbFontSummary.Name = "tbFontSummary"; this.tbFontSummary.ReadOnly = true; - this.tbFontSummary.Size = new System.Drawing.Size(394, 39); + this.tbFontSummary.Size = new System.Drawing.Size(589, 55); this.tbFontSummary.TabIndex = 4; // // linkLabel4 // this.linkLabel4.AutoSize = true; - this.linkLabel4.Location = new System.Drawing.Point(56, 317); - this.linkLabel4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.linkLabel4.Location = new System.Drawing.Point(84, 476); + this.linkLabel4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.linkLabel4.Name = "linkLabel4"; - this.linkLabel4.Size = new System.Drawing.Size(256, 32); + this.linkLabel4.Size = new System.Drawing.Size(393, 48); this.linkLabel4.TabIndex = 3; this.linkLabel4.TabStop = true; this.linkLabel4.Text = "Summary Display Font"; @@ -141,20 +146,20 @@ // // tbFontCellTitle // - this.tbFontCellTitle.Location = new System.Drawing.Point(320, 89); - this.tbFontCellTitle.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tbFontCellTitle.Location = new System.Drawing.Point(480, 134); + this.tbFontCellTitle.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); this.tbFontCellTitle.Name = "tbFontCellTitle"; this.tbFontCellTitle.ReadOnly = true; - this.tbFontCellTitle.Size = new System.Drawing.Size(394, 39); + this.tbFontCellTitle.Size = new System.Drawing.Size(589, 55); this.tbFontCellTitle.TabIndex = 6; // // linkLabel5 // this.linkLabel5.AutoSize = true; - this.linkLabel5.Location = new System.Drawing.Point(63, 89); - this.linkLabel5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.linkLabel5.Location = new System.Drawing.Point(94, 134); + this.linkLabel5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.linkLabel5.Name = "linkLabel5"; - this.linkLabel5.Size = new System.Drawing.Size(249, 32); + this.linkLabel5.Size = new System.Drawing.Size(379, 48); this.linkLabel5.TabIndex = 5; this.linkLabel5.TabStop = true; this.linkLabel5.Text = "Cell Title Dispaly Font"; @@ -162,30 +167,76 @@ // // tbFontAvalue // - this.tbFontAvalue.Location = new System.Drawing.Point(320, 260); - this.tbFontAvalue.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tbFontAvalue.Location = new System.Drawing.Point(480, 390); + this.tbFontAvalue.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); this.tbFontAvalue.Name = "tbFontAvalue"; this.tbFontAvalue.ReadOnly = true; - this.tbFontAvalue.Size = new System.Drawing.Size(394, 39); + this.tbFontAvalue.Size = new System.Drawing.Size(589, 55); this.tbFontAvalue.TabIndex = 8; // // linkLabel6 // this.linkLabel6.AutoSize = true; - this.linkLabel6.Location = new System.Drawing.Point(26, 260); - this.linkLabel6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.linkLabel6.Location = new System.Drawing.Point(39, 390); + this.linkLabel6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.linkLabel6.Name = "linkLabel6"; - this.linkLabel6.Size = new System.Drawing.Size(286, 32); + this.linkLabel6.Size = new System.Drawing.Size(439, 48); this.linkLabel6.TabIndex = 7; this.linkLabel6.TabStop = true; this.linkLabel6.Text = "Alarm Value Display Font"; this.linkLabel6.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel6_LinkClicked); // + // tbFontKa + // + this.tbFontKaValue.Location = new System.Drawing.Point(480, 556); + this.tbFontKaValue.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); + this.tbFontKaValue.Name = "tbFontKa"; + this.tbFontKaValue.ReadOnly = true; + this.tbFontKaValue.Size = new System.Drawing.Size(589, 55); + this.tbFontKaValue.TabIndex = 10; + // + // linkLabel7 + // + this.linkLabel7.AutoSize = true; + this.linkLabel7.Location = new System.Drawing.Point(81, 556); + this.linkLabel7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.linkLabel7.Name = "linkLabel7"; + this.linkLabel7.Size = new System.Drawing.Size(396, 48); + this.linkLabel7.TabIndex = 9; + this.linkLabel7.TabStop = true; + this.linkLabel7.Text = "KA(Value) Display Font"; + this.linkLabel7.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel7_LinkClicked); + // + // tbFontKaUnit + // + this.tbFontKaUnit.Location = new System.Drawing.Point(480, 627); + this.tbFontKaUnit.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); + this.tbFontKaUnit.Name = "tbFontKaUnit"; + this.tbFontKaUnit.ReadOnly = true; + this.tbFontKaUnit.Size = new System.Drawing.Size(589, 55); + this.tbFontKaUnit.TabIndex = 12; + // + // linkLabel8 + // + this.linkLabel8.AutoSize = true; + this.linkLabel8.Location = new System.Drawing.Point(105, 627); + this.linkLabel8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.linkLabel8.Name = "linkLabel8"; + this.linkLabel8.Size = new System.Drawing.Size(372, 48); + this.linkLabel8.TabIndex = 11; + this.linkLabel8.TabStop = true; + this.linkLabel8.Text = "KA(Unit) Display Font"; + this.linkLabel8.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel8_LinkClicked); + // // fDesignSetting // - this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleDimensions = new System.Drawing.SizeF(144F, 144F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.ClientSize = new System.Drawing.Size(728, 456); + this.ClientSize = new System.Drawing.Size(1092, 913); + this.Controls.Add(this.tbFontKaUnit); + this.Controls.Add(this.linkLabel8); + this.Controls.Add(this.tbFontKaValue); + this.Controls.Add(this.linkLabel7); this.Controls.Add(this.tbFontAvalue); this.Controls.Add(this.linkLabel6); this.Controls.Add(this.tbFontCellTitle); @@ -201,11 +252,11 @@ this.Controls.Add(this.linkLabel1); this.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "fDesignSetting"; - this.Padding = new System.Windows.Forms.Padding(10); + this.Padding = new System.Windows.Forms.Padding(15, 15, 15, 15); this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Design Setting"; this.Load += new System.EventHandler(this.fDesignSetting_Load); @@ -229,5 +280,9 @@ private System.Windows.Forms.LinkLabel linkLabel5; private System.Windows.Forms.TextBox tbFontAvalue; private System.Windows.Forms.LinkLabel linkLabel6; + private System.Windows.Forms.TextBox tbFontKaValue; + private System.Windows.Forms.LinkLabel linkLabel7; + private System.Windows.Forms.TextBox tbFontKaUnit; + private System.Windows.Forms.LinkLabel linkLabel8; } } \ No newline at end of file diff --git a/cVMS.NET_CS/Setting/fDesignSetting.cs b/cVMS.NET_CS/Setting/fDesignSetting.cs index 4fc94c3..35ff939 100644 --- a/cVMS.NET_CS/Setting/fDesignSetting.cs +++ b/cVMS.NET_CS/Setting/fDesignSetting.cs @@ -26,6 +26,8 @@ namespace vmsnet.Setting tbFontSummary.Text = PUB.DESIGN.font_summary; tbFontCellTitle.Text = PUB.DESIGN.font_celltitle; tbFontAvalue.Text = PUB.DESIGN.font_alarmvalue; + tbFontKaValue.Text = PUB.DESIGN.font_kaValue; + tbFontKaUnit.Text = PUB.DESIGN.font_kaUnit; } private void button1_Click(object sender, EventArgs e) @@ -36,6 +38,8 @@ namespace vmsnet.Setting PUB.DESIGN.font_summary = tbFontSummary.Text; PUB.DESIGN.font_celltitle = tbFontCellTitle.Text; PUB.DESIGN.font_alarmvalue = tbFontAvalue.Text; + PUB.DESIGN.font_kaUnit = tbFontKaUnit.Text; + PUB.DESIGN.font_kaValue = tbFontKaValue.Text; PUB.DESIGN.Save(); } @@ -81,5 +85,15 @@ namespace vmsnet.Setting { SetFontData(tbFontAvalue); } + + private void linkLabel7_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + SetFontData(tbFontKaValue); + } + + private void linkLabel8_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + SetFontData(tbFontKaUnit); + } } }