diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/9139c3a3-d671-487f-b4f5-b1ae27b32551.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/9139c3a3-d671-487f-b4f5-b1ae27b32551.vsidx new file mode 100644 index 000000000..30dc44d4e Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/9139c3a3-d671-487f-b4f5-b1ae27b32551.vsidx differ diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/a457bbf8-8b2f-47ca-9946-102fc9201018.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/a457bbf8-8b2f-47ca-9946-102fc9201018.vsidx deleted file mode 100644 index 60cc6c04d..000000000 Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/a457bbf8-8b2f-47ca-9946-102fc9201018.vsidx and /dev/null differ diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/b5c8c11b-bc62-46b5-a10c-deb540f89441.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/b5c8c11b-bc62-46b5-a10c-deb540f89441.vsidx deleted file mode 100644 index 51d40a15a..000000000 Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/b5c8c11b-bc62-46b5-a10c-deb540f89441.vsidx and /dev/null differ diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/cdd0b8bf-98fb-4228-90f8-6921b76a6696.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/cdd0b8bf-98fb-4228-90f8-6921b76a6696.vsidx new file mode 100644 index 000000000..24d43b7cb Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/cdd0b8bf-98fb-4228-90f8-6921b76a6696.vsidx differ diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/cf03d050-1bde-4014-9b27-c6233e9ba340.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/cf03d050-1bde-4014-9b27-c6233e9ba340.vsidx new file mode 100644 index 000000000..9bd8d89f1 Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/cf03d050-1bde-4014-9b27-c6233e9ba340.vsidx differ diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/e3d396c4-5033-468a-8b86-ee74881dac8a.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/e3d396c4-5033-468a-8b86-ee74881dac8a.vsidx deleted file mode 100644 index 88db63413..000000000 Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/e3d396c4-5033-468a-8b86-ee74881dac8a.vsidx and /dev/null differ diff --git a/AgroBase/.vs/AgroBase/v17/.suo b/AgroBase/.vs/AgroBase/v17/.suo index 3d7b9a0f9..98db53f82 100644 Binary files a/AgroBase/.vs/AgroBase/v17/.suo and b/AgroBase/.vs/AgroBase/v17/.suo differ diff --git a/AgroBase/AgroBase/AgroBase.csproj b/AgroBase/AgroBase/AgroBase.csproj index 10bfc1efe..a3c432d55 100644 --- a/AgroBase/AgroBase/AgroBase.csproj +++ b/AgroBase/AgroBase/AgroBase.csproj @@ -471,6 +471,7 @@ + @@ -511,6 +512,7 @@ + diff --git a/AgroBase/AgroBase/Forms/IHM/frmIHM.Designer.cs b/AgroBase/AgroBase/Forms/IHM/frmIHM.Designer.cs index b00bd0596..f5f64a8c1 100644 --- a/AgroBase/AgroBase/Forms/IHM/frmIHM.Designer.cs +++ b/AgroBase/AgroBase/Forms/IHM/frmIHM.Designer.cs @@ -44,9 +44,9 @@ this.lblD_Dir_DT = new System.Windows.Forms.Label(); this.lblD_Dir_ET = new System.Windows.Forms.Label(); this.lblD_Mov_ET = new System.Windows.Forms.Label(); - this.lblD_Cam_S0 = new System.Windows.Forms.Label(); - this.lblD_Cam_S1 = new System.Windows.Forms.Label(); - this.lblD_Knt = new System.Windows.Forms.Label(); + this.lblD_Cam_0 = new System.Windows.Forms.Label(); + this.lblD_Cam_1 = new System.Windows.Forms.Label(); + this.lblD_Snr = new System.Windows.Forms.Label(); this.lblDiagnosticos = new System.Windows.Forms.Label(); this.lblOperacao = new System.Windows.Forms.Label(); this.lblAjustes = new System.Windows.Forms.Label(); @@ -254,39 +254,39 @@ this.lblD_Mov_ET.Text = "MOV"; this.lblD_Mov_ET.Click += new System.EventHandler(this.lblModulo_Click); // - // lblD_Cam_S0 + // lblD_Cam_0 // - this.lblD_Cam_S0.AutoSize = true; - this.lblD_Cam_S0.BackColor = System.Drawing.Color.Lavender; - this.lblD_Cam_S0.Cursor = System.Windows.Forms.Cursors.Hand; - this.lblD_Cam_S0.Location = new System.Drawing.Point(85, 470); - this.lblD_Cam_S0.Name = "lblD_Cam_S0"; - this.lblD_Cam_S0.Size = new System.Drawing.Size(52, 24); - this.lblD_Cam_S0.TabIndex = 29; - this.lblD_Cam_S0.Text = "CAM"; - this.lblD_Cam_S0.Click += new System.EventHandler(this.lblModulo_Click); + this.lblD_Cam_0.AutoSize = true; + this.lblD_Cam_0.BackColor = System.Drawing.Color.Lavender; + this.lblD_Cam_0.Cursor = System.Windows.Forms.Cursors.Hand; + this.lblD_Cam_0.Location = new System.Drawing.Point(85, 470); + this.lblD_Cam_0.Name = "lblD_Cam_0"; + this.lblD_Cam_0.Size = new System.Drawing.Size(52, 24); + this.lblD_Cam_0.TabIndex = 29; + this.lblD_Cam_0.Text = "CAM"; + this.lblD_Cam_0.Click += new System.EventHandler(this.lblModulo_Click); // - // lblD_Cam_S1 + // lblD_Cam_1 // - this.lblD_Cam_S1.AutoSize = true; - this.lblD_Cam_S1.Cursor = System.Windows.Forms.Cursors.Hand; - this.lblD_Cam_S1.Location = new System.Drawing.Point(334, 470); - this.lblD_Cam_S1.Name = "lblD_Cam_S1"; - this.lblD_Cam_S1.Size = new System.Drawing.Size(52, 24); - this.lblD_Cam_S1.TabIndex = 30; - this.lblD_Cam_S1.Text = "CAM"; - this.lblD_Cam_S1.Click += new System.EventHandler(this.lblModulo_Click); + this.lblD_Cam_1.AutoSize = true; + this.lblD_Cam_1.Cursor = System.Windows.Forms.Cursors.Hand; + this.lblD_Cam_1.Location = new System.Drawing.Point(334, 470); + this.lblD_Cam_1.Name = "lblD_Cam_1"; + this.lblD_Cam_1.Size = new System.Drawing.Size(52, 24); + this.lblD_Cam_1.TabIndex = 30; + this.lblD_Cam_1.Text = "CAM"; + this.lblD_Cam_1.Click += new System.EventHandler(this.lblModulo_Click); // - // lblD_Knt + // lblD_Snr // - this.lblD_Knt.AutoSize = true; - this.lblD_Knt.Cursor = System.Windows.Forms.Cursors.Hand; - this.lblD_Knt.Location = new System.Drawing.Point(214, 125); - this.lblD_Knt.Name = "lblD_Knt"; - this.lblD_Knt.Size = new System.Drawing.Size(48, 24); - this.lblD_Knt.TabIndex = 31; - this.lblD_Knt.Text = "KNT"; - this.lblD_Knt.Click += new System.EventHandler(this.lblModulo_Click); + this.lblD_Snr.AutoSize = true; + this.lblD_Snr.Cursor = System.Windows.Forms.Cursors.Hand; + this.lblD_Snr.Location = new System.Drawing.Point(210, 125); + this.lblD_Snr.Name = "lblD_Snr"; + this.lblD_Snr.Size = new System.Drawing.Size(49, 24); + this.lblD_Snr.TabIndex = 31; + this.lblD_Snr.Text = "SNR"; + this.lblD_Snr.Click += new System.EventHandler(this.lblModulo_Click); // // lblDiagnosticos // @@ -528,10 +528,10 @@ this.Controls.Add(this.lblDiagnosticos); this.Controls.Add(this.picDiagnosticos); this.Controls.Add(this.picOperacao); - this.Controls.Add(this.lblD_Knt); + this.Controls.Add(this.lblD_Snr); this.Controls.Add(this.picAjustes); - this.Controls.Add(this.lblD_Cam_S1); - this.Controls.Add(this.lblD_Cam_S0); + this.Controls.Add(this.lblD_Cam_1); + this.Controls.Add(this.lblD_Cam_0); this.Controls.Add(this.picDesligar); this.Controls.Add(this.lblD_Dir_ET); this.Controls.Add(this.lblD_Mov_ET); @@ -590,9 +590,9 @@ private System.Windows.Forms.PictureBox picDiagnosticos; private System.Windows.Forms.PictureBox picOperacao; private System.Windows.Forms.PictureBox picDesligar; - private System.Windows.Forms.Label lblD_Cam_S0; - private System.Windows.Forms.Label lblD_Cam_S1; - private System.Windows.Forms.Label lblD_Knt; + private System.Windows.Forms.Label lblD_Cam_0; + private System.Windows.Forms.Label lblD_Cam_1; + private System.Windows.Forms.Label lblD_Snr; private System.Windows.Forms.PictureBox picAjustes; private System.Windows.Forms.Label lblDiagnosticos; private System.Windows.Forms.Label lblOperacao; diff --git a/AgroBase/AgroBase/Forms/IHM/frmIHM.cs b/AgroBase/AgroBase/Forms/IHM/frmIHM.cs index 684b357da..ee985a08a 100644 --- a/AgroBase/AgroBase/Forms/IHM/frmIHM.cs +++ b/AgroBase/AgroBase/Forms/IHM/frmIHM.cs @@ -134,66 +134,6 @@ namespace AgroBase.Forms.IHM lblCodigoFalha.Click += LblCodigoFalha_Click; } - /* - private async Task tmrDispositivos_Tick() - { - CodFalha = Variaveis.OperacaoEmAndamento.RetornaCodigoFalha(); - - var Labels = this.Controls.OfType