From 6fe68d5f2c2c6ea9f862b1bb9762d8d79e3bfb67 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 21 Oct 2019 13:15:13 +0200 Subject: [PATCH] Continuo fix grafico stats in IOB --- IOB-WIN/AdapterForm.Designer.cs | 102 +++++++++++++++++++++----------- IOB-WIN/AdapterForm.cs | 4 +- 2 files changed, 70 insertions(+), 36 deletions(-) diff --git a/IOB-WIN/AdapterForm.Designer.cs b/IOB-WIN/AdapterForm.Designer.cs index e21f999d..b02bfc97 100644 --- a/IOB-WIN/AdapterForm.Designer.cs +++ b/IOB-WIN/AdapterForm.Designer.cs @@ -45,8 +45,7 @@ this.start = new System.Windows.Forms.Button(); this.bIN = new System.Windows.Forms.Button(); this.bOUT = new System.Windows.Forms.Button(); - this.lQueueLen = new System.Windows.Forms.Label(); - this.lblDataProc = new System.Windows.Forms.Label(); + this.lblQueueLen = new System.Windows.Forms.Label(); this.chkForceDequeue = new System.Windows.Forms.CheckBox(); this.displTimer = new System.Windows.Forms.Timer(this.components); this.tabData = new System.Windows.Forms.TabControl(); @@ -61,10 +60,15 @@ this.label3 = new System.Windows.Forms.Label(); this.lblOutMessage3 = new System.Windows.Forms.Label(); this.lblOutMessage2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.lblDataProc = new System.Windows.Forms.Label(); this.statusStrip1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.tabData.SuspendLayout(); this.tabRealtime.SuspendLayout(); + this.tabStats.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); this.SuspendLayout(); // @@ -138,8 +142,6 @@ this.tableLayoutPanel1.Controls.Add(this.start, 1, 0); this.tableLayoutPanel1.Controls.Add(this.bIN, 0, 0); this.tableLayoutPanel1.Controls.Add(this.bOUT, 10, 0); - this.tableLayoutPanel1.Controls.Add(this.lQueueLen, 7, 0); - this.tableLayoutPanel1.Controls.Add(this.lblDataProc, 5, 0); this.tableLayoutPanel1.Controls.Add(this.chkForceDequeue, 4, 0); this.tableLayoutPanel1.Location = new System.Drawing.Point(2, 0); this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(2); @@ -268,34 +270,18 @@ this.bOUT.Text = "O"; this.bOUT.UseVisualStyleBackColor = true; // - // lQueueLen + // lblQueueLen // - this.lQueueLen.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lQueueLen.AutoSize = true; - this.lQueueLen.Font = new System.Drawing.Font("Arial Narrow", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lQueueLen.Location = new System.Drawing.Point(859, 0); - this.lQueueLen.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.lQueueLen.Name = "lQueueLen"; - this.lQueueLen.Size = new System.Drawing.Size(26, 30); - this.lQueueLen.TabIndex = 77; - this.lQueueLen.Text = "#"; - this.lQueueLen.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // lblDataProc - // - this.lblDataProc.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); - this.lblDataProc.AutoSize = true; - this.lblDataProc.Font = new System.Drawing.Font("Arial Narrow", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblDataProc.Location = new System.Drawing.Point(815, 0); - this.lblDataProc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.lblDataProc.Name = "lblDataProc"; - this.lblDataProc.Size = new System.Drawing.Size(10, 30); - this.lblDataProc.TabIndex = 79; - this.lblDataProc.Text = "-"; - this.lblDataProc.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.lblQueueLen.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblQueueLen.AutoSize = true; + this.lblQueueLen.Font = new System.Drawing.Font("Arial Narrow", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblQueueLen.Location = new System.Drawing.Point(100, 70); + this.lblQueueLen.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblQueueLen.Name = "lblQueueLen"; + this.lblQueueLen.Size = new System.Drawing.Size(22, 15); + this.lblQueueLen.TabIndex = 77; + this.lblQueueLen.Text = "###"; + this.lblQueueLen.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // chkForceDequeue // @@ -342,13 +328,18 @@ // // tabStats // + this.tabStats.BackColor = System.Drawing.Color.Transparent; + this.tabStats.Controls.Add(this.lblDataProc); + this.tabStats.Controls.Add(this.label9); + this.tabStats.Controls.Add(this.label8); + this.tabStats.Controls.Add(this.label1); + this.tabStats.Controls.Add(this.lblQueueLen); this.tabStats.Location = new System.Drawing.Point(4, 22); this.tabStats.Name = "tabStats"; this.tabStats.Padding = new System.Windows.Forms.Padding(3); this.tabStats.Size = new System.Drawing.Size(952, 553); this.tabStats.TabIndex = 1; this.tabStats.Text = "Statistics"; - this.tabStats.UseVisualStyleBackColor = true; // // tableLayoutPanel2 // @@ -478,6 +469,44 @@ this.lblOutMessage2.TabIndex = 62; this.lblOutMessage2.Text = "..."; // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(7, 7); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(119, 25); + this.label1.TabIndex = 0; + this.label1.Text = "IOB STATS"; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(9, 46); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(86, 13); + this.label8.TabIndex = 80; + this.label8.Text = "Data Processed:"; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(9, 71); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(74, 13); + this.label9.TabIndex = 81; + this.label9.Text = "Queue lenght:"; + // + // lblDataProc + // + this.lblDataProc.AutoSize = true; + this.lblDataProc.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblDataProc.Location = new System.Drawing.Point(100, 46); + this.lblDataProc.Name = "lblDataProc"; + this.lblDataProc.Size = new System.Drawing.Size(16, 13); + this.lblDataProc.TabIndex = 82; + this.lblDataProc.Text = "---"; + // // AdapterForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -499,6 +528,8 @@ this.tableLayoutPanel1.PerformLayout(); this.tabData.ResumeLayout(false); this.tabRealtime.ResumeLayout(false); + this.tabStats.ResumeLayout(false); + this.tabStats.PerformLayout(); this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel2.PerformLayout(); this.ResumeLayout(false); @@ -517,7 +548,7 @@ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.Button stop; private System.Windows.Forms.Button start; - private System.Windows.Forms.Label lQueueLen; + private System.Windows.Forms.Label lblQueueLen; private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label5; private System.Windows.Forms.TextBox nLines; @@ -525,7 +556,6 @@ private System.Windows.Forms.Button bOUT; private System.Windows.Forms.Timer displTimer; private System.Windows.Forms.Button restart; - private System.Windows.Forms.Label lblDataProc; private System.Windows.Forms.CheckBox chkForceDequeue; private System.Windows.Forms.TabControl tabData; private System.Windows.Forms.TabPage tabRealtime; @@ -539,5 +569,9 @@ private System.Windows.Forms.Label label3; private System.Windows.Forms.Label lblOutMessage3; private System.Windows.Forms.Label lblOutMessage2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label lblDataProc; } } \ No newline at end of file diff --git a/IOB-WIN/AdapterForm.cs b/IOB-WIN/AdapterForm.cs index c7d2efeb..b139d831 100644 --- a/IOB-WIN/AdapterForm.cs +++ b/IOB-WIN/AdapterForm.cs @@ -336,7 +336,7 @@ namespace IOB_WIN private void refreshFormData() { // aggiorno visualizzazioni varie in form... - lQueueLen.Text = iobObj.QueueIN.Count.ToString(); + lblQueueLen.Text = iobObj.QueueIN.Count.ToString(); } private void gather_Tick(object sender, EventArgs e) { @@ -684,7 +684,7 @@ namespace IOB_WIN { stop.Enabled = false; - lQueueLen.Text = "ND"; + lblQueueLen.Text = "ND"; nLine2show = utils.CRI("numRowConsole"); } ///