diff --git a/AgroBase/AgroBase/Forms/Operacoes/frmResultadosOperacao.Designer.cs b/AgroBase/AgroBase/Forms/Operacoes/frmResultadosOperacao.Designer.cs index ab8759191..98c35da96 100644 --- a/AgroBase/AgroBase/Forms/Operacoes/frmResultadosOperacao.Designer.cs +++ b/AgroBase/AgroBase/Forms/Operacoes/frmResultadosOperacao.Designer.cs @@ -375,6 +375,10 @@ this.picMapaCalor = new System.Windows.Forms.PictureBox(); this.tabSonarDeteccoes = new System.Windows.Forms.TabPage(); this.pnlSonarDeteccoes = new System.Windows.Forms.Panel(); + this.tabTopDown = new System.Windows.Forms.TabPage(); + this.tabFrontal = new System.Windows.Forms.TabPage(); + this.tabTridimensional = new System.Windows.Forms.TabPage(); + this.pnlTridimensional = new System.Windows.Forms.Panel(); this.gridObstaculos = new System.Windows.Forms.DataGridView(); this.txtSonarDecisao = new System.Windows.Forms.TextBox(); this.label99 = new System.Windows.Forms.Label(); @@ -521,10 +525,12 @@ this.label36 = new System.Windows.Forms.Label(); this.txtMomento = new System.Windows.Forms.TextBox(); this.btnPlay = new System.Windows.Forms.Button(); - this.tabTopDown = new System.Windows.Forms.TabPage(); - this.tabFrontal = new System.Windows.Forms.TabPage(); - this.tabTridimensional = new System.Windows.Forms.TabPage(); - this.pnlTridimensional = new System.Windows.Forms.Panel(); + this.rtbImpedimento = new System.Windows.Forms.RichTextBox(); + this.label145 = new System.Windows.Forms.Label(); + this.lblVentilacaoModo = new System.Windows.Forms.Label(); + this.lblVentilacaoRLIN = new System.Windows.Forms.Label(); + this.lblVentilacaoRLOUT = new System.Windows.Forms.Label(); + this.lblVentilacaoTemperatura = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.trbMomento)).BeginInit(); this.panel1.SuspendLayout(); this.tabControl4.SuspendLayout(); @@ -533,6 +539,9 @@ this.panel2.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tabSituacao.SuspendLayout(); + this.pnlManual.SuspendLayout(); + this.pnlOperacao.SuspendLayout(); + this.pnlAutomatico.SuspendLayout(); this.tabDirecional.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picDIR_DT)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picDIR_DF)).BeginInit(); @@ -582,6 +591,7 @@ this.tabSonarCalor.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picMapaCalor)).BeginInit(); this.tabSonarDeteccoes.SuspendLayout(); + this.tabTridimensional.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gridObstaculos)).BeginInit(); this.tabSegmentacao.SuspendLayout(); this.tabCPU.SuspendLayout(); @@ -600,7 +610,6 @@ this.panel6.SuspendLayout(); this.pnlInformacoesOperacao.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picCameraCaminho)).BeginInit(); - this.tabTridimensional.SuspendLayout(); this.SuspendLayout(); // // trbMomento @@ -1002,13 +1011,11 @@ // // tabSituacao // + this.tabSituacao.Controls.Add(this.rtbImpedimento); this.tabSituacao.Controls.Add(this.label117); this.tabSituacao.Controls.Add(this.tvwFalhas); - this.tabSituacao.Controls.Add(this.lblManual); - this.tabSituacao.Controls.Add(this.lblOperacao); this.tabSituacao.Controls.Add(this.pnlManual); this.tabSituacao.Controls.Add(this.pnlOperacao); - this.tabSituacao.Controls.Add(this.lblAutomatico); this.tabSituacao.Controls.Add(this.pnlAutomatico); this.tabSituacao.Location = new System.Drawing.Point(4, 22); this.tabSituacao.Name = "tabSituacao"; @@ -1022,7 +1029,7 @@ // this.label117.AutoSize = true; this.label117.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F); - this.label117.Location = new System.Drawing.Point(6, 141); + this.label117.Location = new System.Drawing.Point(6, 154); this.label117.Name = "label117"; this.label117.Size = new System.Drawing.Size(118, 17); this.label117.TabIndex = 19; @@ -1033,60 +1040,63 @@ this.tvwFalhas.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.tvwFalhas.Location = new System.Drawing.Point(6, 161); + this.tvwFalhas.Location = new System.Drawing.Point(6, 174); this.tvwFalhas.Name = "tvwFalhas"; - this.tvwFalhas.Size = new System.Drawing.Size(484, 355); + this.tvwFalhas.Size = new System.Drawing.Size(484, 342); this.tvwFalhas.TabIndex = 18; // // lblManual // this.lblManual.AutoSize = true; this.lblManual.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F); - this.lblManual.Location = new System.Drawing.Point(393, 6); + this.lblManual.Location = new System.Drawing.Point(10, 17); this.lblManual.Name = "lblManual"; - this.lblManual.Size = new System.Drawing.Size(65, 17); + this.lblManual.Size = new System.Drawing.Size(29, 17); this.lblManual.TabIndex = 16; - this.lblManual.Text = "MANUAL"; + this.lblManual.Text = "MN"; // // lblOperacao // this.lblOperacao.AutoSize = true; this.lblOperacao.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F); - this.lblOperacao.Location = new System.Drawing.Point(212, 6); + this.lblOperacao.Location = new System.Drawing.Point(12, 18); this.lblOperacao.Name = "lblOperacao"; - this.lblOperacao.Size = new System.Drawing.Size(85, 17); + this.lblOperacao.Size = new System.Drawing.Size(28, 17); this.lblOperacao.TabIndex = 17; - this.lblOperacao.Text = "OPERAÇÃO"; + this.lblOperacao.Text = "OP"; // // pnlManual // - this.pnlManual.Location = new System.Drawing.Point(375, 26); + this.pnlManual.Controls.Add(this.lblManual); + this.pnlManual.Location = new System.Drawing.Point(440, 6); this.pnlManual.Name = "pnlManual"; - this.pnlManual.Size = new System.Drawing.Size(100, 100); + this.pnlManual.Size = new System.Drawing.Size(50, 50); this.pnlManual.TabIndex = 14; // // pnlOperacao // - this.pnlOperacao.Location = new System.Drawing.Point(204, 26); + this.pnlOperacao.Controls.Add(this.lblOperacao); + this.pnlOperacao.Location = new System.Drawing.Point(440, 62); this.pnlOperacao.Name = "pnlOperacao"; - this.pnlOperacao.Size = new System.Drawing.Size(100, 100); + this.pnlOperacao.Size = new System.Drawing.Size(50, 50); this.pnlOperacao.TabIndex = 15; // // lblAutomatico // this.lblAutomatico.AutoSize = true; this.lblAutomatico.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F); - this.lblAutomatico.Location = new System.Drawing.Point(18, 6); + this.lblAutomatico.Location = new System.Drawing.Point(13, 19); this.lblAutomatico.Name = "lblAutomatico"; - this.lblAutomatico.Size = new System.Drawing.Size(99, 17); + this.lblAutomatico.Size = new System.Drawing.Size(26, 17); this.lblAutomatico.TabIndex = 13; - this.lblAutomatico.Text = "AUTOMÁTICO"; + this.lblAutomatico.Text = "AT"; // // pnlAutomatico // - this.pnlAutomatico.Location = new System.Drawing.Point(18, 26); + this.pnlAutomatico.Controls.Add(this.lblAutomatico); + this.pnlAutomatico.Location = new System.Drawing.Point(440, 118); this.pnlAutomatico.Name = "pnlAutomatico"; - this.pnlAutomatico.Size = new System.Drawing.Size(100, 100); + this.pnlAutomatico.Size = new System.Drawing.Size(50, 50); this.pnlAutomatico.TabIndex = 12; // // tabDirecional @@ -4211,6 +4221,45 @@ this.pnlSonarDeteccoes.TabIndex = 0; this.pnlSonarDeteccoes.Paint += new System.Windows.Forms.PaintEventHandler(this.pnlSonarDeteccoes_Paint); // + // tabTopDown + // + this.tabTopDown.Location = new System.Drawing.Point(4, 22); + this.tabTopDown.Name = "tabTopDown"; + this.tabTopDown.Padding = new System.Windows.Forms.Padding(3); + this.tabTopDown.Size = new System.Drawing.Size(479, 290); + this.tabTopDown.TabIndex = 3; + this.tabTopDown.Text = "Top Down"; + this.tabTopDown.UseVisualStyleBackColor = true; + // + // tabFrontal + // + this.tabFrontal.Location = new System.Drawing.Point(4, 22); + this.tabFrontal.Name = "tabFrontal"; + this.tabFrontal.Padding = new System.Windows.Forms.Padding(3); + this.tabFrontal.Size = new System.Drawing.Size(479, 290); + this.tabFrontal.TabIndex = 4; + this.tabFrontal.Text = "Frontal"; + this.tabFrontal.UseVisualStyleBackColor = true; + // + // tabTridimensional + // + this.tabTridimensional.Controls.Add(this.pnlTridimensional); + this.tabTridimensional.Location = new System.Drawing.Point(4, 22); + this.tabTridimensional.Name = "tabTridimensional"; + this.tabTridimensional.Padding = new System.Windows.Forms.Padding(3); + this.tabTridimensional.Size = new System.Drawing.Size(479, 290); + this.tabTridimensional.TabIndex = 5; + this.tabTridimensional.Text = "Tridimensional"; + this.tabTridimensional.UseVisualStyleBackColor = true; + // + // pnlTridimensional + // + this.pnlTridimensional.Dock = System.Windows.Forms.DockStyle.Fill; + this.pnlTridimensional.Location = new System.Drawing.Point(3, 3); + this.pnlTridimensional.Name = "pnlTridimensional"; + this.pnlTridimensional.Size = new System.Drawing.Size(473, 284); + this.pnlTridimensional.TabIndex = 0; + // // gridObstaculos // this.gridObstaculos.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -4512,6 +4561,11 @@ // // tabCPU // + this.tabCPU.Controls.Add(this.lblVentilacaoTemperatura); + this.tabCPU.Controls.Add(this.lblVentilacaoRLOUT); + this.tabCPU.Controls.Add(this.lblVentilacaoRLIN); + this.tabCPU.Controls.Add(this.lblVentilacaoModo); + this.tabCPU.Controls.Add(this.label145); this.tabCPU.Controls.Add(this.gpbCpu_Analise); this.tabCPU.Controls.Add(this.gpbCpu_Filtro); this.tabCPU.Controls.Add(this.chartCpu); @@ -5794,44 +5848,65 @@ this.btnPlay.UseVisualStyleBackColor = true; this.btnPlay.Click += new System.EventHandler(this.btnPlay_Click); // - // tabTopDown + // rtbImpedimento // - this.tabTopDown.Location = new System.Drawing.Point(4, 22); - this.tabTopDown.Name = "tabTopDown"; - this.tabTopDown.Padding = new System.Windows.Forms.Padding(3); - this.tabTopDown.Size = new System.Drawing.Size(479, 290); - this.tabTopDown.TabIndex = 3; - this.tabTopDown.Text = "Top Down"; - this.tabTopDown.UseVisualStyleBackColor = true; + this.rtbImpedimento.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.rtbImpedimento.Location = new System.Drawing.Point(9, 6); + this.rtbImpedimento.Name = "rtbImpedimento"; + this.rtbImpedimento.ReadOnly = true; + this.rtbImpedimento.Size = new System.Drawing.Size(425, 145); + this.rtbImpedimento.TabIndex = 20; + this.rtbImpedimento.Text = ""; // - // tabFrontal + // label145 // - this.tabFrontal.Location = new System.Drawing.Point(4, 22); - this.tabFrontal.Name = "tabFrontal"; - this.tabFrontal.Padding = new System.Windows.Forms.Padding(3); - this.tabFrontal.Size = new System.Drawing.Size(479, 290); - this.tabFrontal.TabIndex = 4; - this.tabFrontal.Text = "Frontal"; - this.tabFrontal.UseVisualStyleBackColor = true; + this.label145.AutoSize = true; + this.label145.Location = new System.Drawing.Point(226, 406); + this.label145.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label145.Name = "label145"; + this.label145.Size = new System.Drawing.Size(57, 13); + this.label145.TabIndex = 137; + this.label145.Text = "Ventilação"; // - // tabTridimensional + // lblVentilacaoModo // - this.tabTridimensional.Controls.Add(this.pnlTridimensional); - this.tabTridimensional.Location = new System.Drawing.Point(4, 22); - this.tabTridimensional.Name = "tabTridimensional"; - this.tabTridimensional.Padding = new System.Windows.Forms.Padding(3); - this.tabTridimensional.Size = new System.Drawing.Size(479, 290); - this.tabTridimensional.TabIndex = 5; - this.tabTridimensional.Text = "Tridimensional"; - this.tabTridimensional.UseVisualStyleBackColor = true; + this.lblVentilacaoModo.AutoSize = true; + this.lblVentilacaoModo.Location = new System.Drawing.Point(226, 422); + this.lblVentilacaoModo.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblVentilacaoModo.Name = "lblVentilacaoModo"; + this.lblVentilacaoModo.Size = new System.Drawing.Size(40, 13); + this.lblVentilacaoModo.TabIndex = 138; + this.lblVentilacaoModo.Text = "Modo: "; // - // pnlTridimensional + // lblVentilacaoRLIN // - this.pnlTridimensional.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlTridimensional.Location = new System.Drawing.Point(3, 3); - this.pnlTridimensional.Name = "pnlTridimensional"; - this.pnlTridimensional.Size = new System.Drawing.Size(473, 284); - this.pnlTridimensional.TabIndex = 0; + this.lblVentilacaoRLIN.AutoSize = true; + this.lblVentilacaoRLIN.Location = new System.Drawing.Point(226, 455); + this.lblVentilacaoRLIN.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblVentilacaoRLIN.Name = "lblVentilacaoRLIN"; + this.lblVentilacaoRLIN.Size = new System.Drawing.Size(38, 13); + this.lblVentilacaoRLIN.TabIndex = 139; + this.lblVentilacaoRLIN.Text = "RLIN: "; + // + // lblVentilacaoRLOUT + // + this.lblVentilacaoRLOUT.AutoSize = true; + this.lblVentilacaoRLOUT.Location = new System.Drawing.Point(226, 472); + this.lblVentilacaoRLOUT.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblVentilacaoRLOUT.Name = "lblVentilacaoRLOUT"; + this.lblVentilacaoRLOUT.Size = new System.Drawing.Size(50, 13); + this.lblVentilacaoRLOUT.TabIndex = 140; + this.lblVentilacaoRLOUT.Text = "RLOUT: "; + // + // lblVentilacaoTemperatura + // + this.lblVentilacaoTemperatura.AutoSize = true; + this.lblVentilacaoTemperatura.Location = new System.Drawing.Point(226, 438); + this.lblVentilacaoTemperatura.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblVentilacaoTemperatura.Name = "lblVentilacaoTemperatura"; + this.lblVentilacaoTemperatura.Size = new System.Drawing.Size(73, 13); + this.lblVentilacaoTemperatura.TabIndex = 141; + this.lblVentilacaoTemperatura.Text = "Temperatura: "; // // frmResultadosOperacao // @@ -5862,6 +5937,12 @@ this.tabControl1.ResumeLayout(false); this.tabSituacao.ResumeLayout(false); this.tabSituacao.PerformLayout(); + this.pnlManual.ResumeLayout(false); + this.pnlManual.PerformLayout(); + this.pnlOperacao.ResumeLayout(false); + this.pnlOperacao.PerformLayout(); + this.pnlAutomatico.ResumeLayout(false); + this.pnlAutomatico.PerformLayout(); this.tabDirecional.ResumeLayout(false); this.tabDirecional.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.picDIR_DT)).EndInit(); @@ -5934,10 +6015,12 @@ this.tabSonarCalor.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.picMapaCalor)).EndInit(); this.tabSonarDeteccoes.ResumeLayout(false); + this.tabTridimensional.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gridObstaculos)).EndInit(); this.tabSegmentacao.ResumeLayout(false); this.tabSegmentacao.PerformLayout(); this.tabCPU.ResumeLayout(false); + this.tabCPU.PerformLayout(); this.gpbCpu_Analise.ResumeLayout(false); this.gpbCpu_Analise.PerformLayout(); this.gpbCpu_Filtro.ResumeLayout(false); @@ -5959,7 +6042,6 @@ this.pnlInformacoesOperacao.ResumeLayout(false); this.pnlInformacoesOperacao.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.picCameraCaminho)).EndInit(); - this.tabTridimensional.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -6439,5 +6521,11 @@ private System.Windows.Forms.TabPage tabFrontal; private System.Windows.Forms.TabPage tabTridimensional; private System.Windows.Forms.Panel pnlTridimensional; + private System.Windows.Forms.RichTextBox rtbImpedimento; + private System.Windows.Forms.Label lblVentilacaoModo; + private System.Windows.Forms.Label label145; + private System.Windows.Forms.Label lblVentilacaoRLOUT; + private System.Windows.Forms.Label lblVentilacaoRLIN; + private System.Windows.Forms.Label lblVentilacaoTemperatura; } } \ No newline at end of file diff --git a/AgroBase/AgroBase/Forms/Operacoes/frmResultadosOperacao.cs b/AgroBase/AgroBase/Forms/Operacoes/frmResultadosOperacao.cs index e641c49f1..dee177bd7 100644 --- a/AgroBase/AgroBase/Forms/Operacoes/frmResultadosOperacao.cs +++ b/AgroBase/AgroBase/Forms/Operacoes/frmResultadosOperacao.cs @@ -712,7 +712,7 @@ namespace AgroBase.Forms.Operacoes new GraficoInterativoSerieModel() { Titulo = "A Bat", - Valores = LogsOperacao.Select(x => (double?)(x?.Bateria?.CorrenteInstantanea) ?? 0).ToList(), + Valores = LogsOperacao.Select(x => ((double?)(x?.Bateria?.CorrenteInstantanea) ?? 0) * 1000.0).ToList(), Visivel = true, MostrarValor = true }, @@ -1185,8 +1185,7 @@ namespace AgroBase.Forms.Operacoes OperacaoModel.PopularTreeView(tvwFalhas, Log.ModulosSaude); tvwFalhas.ExpandAll(); - label117.Text = $"Impedimento: {Log.ErroOperacaoLiberada}"; - //label117.Text = $"Bat {Log.Bateria?.TensaoInstantanea} A, {Log.Bateria?.CorrenteInstantanea} A, {Log.Bateria?.PercentualBateria} %"; + rtbImpedimento.Text = $"Impedimento: {Log.ErroOperacaoLiberada}"; } private void AtualizarInformacoesCameras() @@ -1634,6 +1633,12 @@ namespace AgroBase.Forms.Operacoes txtCpu_Minimo.Text = Valores.Min().ToString("0.00"); txtCpu_Maximo.Text = Valores.Max().ToString("0.00"); } + + var logVent = LogsOperacao[idxMomentoAtual].CoolerControl; + lblVentilacaoModo.Text = $"Modo: {logVent?.Modo ?? CoolerControlService.CoolerMode.Off}"; + lblVentilacaoModo.Text = $"Temperatura: {logVent?.Temperatura ?? 0:F2} ºC"; + lblVentilacaoRLIN.Text = $"RLIN: {logVent?.EstadoEntrada ?? Enums.Estado.Desligado} ({logVent?.LeituraEntrada ?? Enums.Estado.Desligado})"; + lblVentilacaoRLIN.Text = $"RLOUT: {logVent?.EstadoSaida ?? Enums.Estado.Desligado} ({logVent?.LeituraSaida ?? Enums.Estado.Desligado})"; } private void AtualizarInformacoesComandos() @@ -2169,7 +2174,6 @@ namespace AgroBase.Forms.Operacoes } } } - } } diff --git a/AgroBase/AgroBase/Services/MKS057DCanService.cs b/AgroBase/AgroBase/Services/MKS057DCanService.cs index ee5ad7c79..b986cacd0 100644 --- a/AgroBase/AgroBase/Services/MKS057DCanService.cs +++ b/AgroBase/AgroBase/Services/MKS057DCanService.cs @@ -34,7 +34,7 @@ namespace AgroBase.Services { get { - return Referenciando ? 250 : 500; + return Referenciando ? 250 : 1000; } } diff --git a/AgroBase/OperationControl/Controls/ManualControlPad.xaml b/AgroBase/OperationControl/Controls/ManualControlPad.xaml index a4fbb4982..c136361c0 100644 --- a/AgroBase/OperationControl/Controls/ManualControlPad.xaml +++ b/AgroBase/OperationControl/Controls/ManualControlPad.xaml @@ -173,7 +173,7 @@ - + diff --git a/AgroBase/OperationControl/Controls/ManualControlPad.xaml.cs b/AgroBase/OperationControl/Controls/ManualControlPad.xaml.cs index 357a20652..b7f9f64c8 100644 --- a/AgroBase/OperationControl/Controls/ManualControlPad.xaml.cs +++ b/AgroBase/OperationControl/Controls/ManualControlPad.xaml.cs @@ -322,7 +322,8 @@ namespace OperationControl.Controls if (System.Windows.MessageBox.Show("Deseja iniciar a operação com os parâmetros atuais?", "Iniciar Operação", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes) { - VariaveisControleOperacao.EnviarComandoIniciarOperacao(true, true); + bool simulador = VariaveisControleOperacao.RoverEmFoco?.DadosLeitura?.Gnss?.Iniciado != true; + VariaveisControleOperacao.EnviarComandoIniciarOperacao(true, simulador); } } } diff --git a/AgroBase/OperationControl/Windows/MainWindow.xaml b/AgroBase/OperationControl/Windows/MainWindow.xaml index b1e377710..9c0db0330 100644 --- a/AgroBase/OperationControl/Windows/MainWindow.xaml +++ b/AgroBase/OperationControl/Windows/MainWindow.xaml @@ -795,7 +795,7 @@ - +