diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/0349cb14-edbb-4c8b-ba96-9730e6c581d8.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/0349cb14-edbb-4c8b-ba96-9730e6c581d8.vsidx new file mode 100644 index 000000000..0078defe8 Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/0349cb14-edbb-4c8b-ba96-9730e6c581d8.vsidx differ diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/e9e0055a-dc00-4c9d-a54b-7695f79b3fec.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/e9e0055a-dc00-4c9d-a54b-7695f79b3fec.vsidx deleted file mode 100644 index 82a58a5bc..000000000 Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/e9e0055a-dc00-4c9d-a54b-7695f79b3fec.vsidx and /dev/null differ diff --git a/AgroBase/.vs/AgroBase/v17/.suo b/AgroBase/.vs/AgroBase/v17/.suo index 36da73696..c1bbfc7ae 100644 Binary files a/AgroBase/.vs/AgroBase/v17/.suo and b/AgroBase/.vs/AgroBase/v17/.suo differ diff --git a/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoMapaGPS.cs b/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoMapaGPS.cs index 5cfbb7d61..fd0d124a2 100644 --- a/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoMapaGPS.cs +++ b/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoMapaGPS.cs @@ -833,43 +833,6 @@ namespace AgroBase.Forms.Operacoes - - - #region SIMULACAO GPS - - private void btnSimular_Click(object sender, EventArgs e) - { - GPSService.SimularGPS(); - Timer tmr = new Timer() { Interval = 500 }; - tmr.Tick += Tmr_Tick; - tmr.Start(); - } - - private void Tmr_Tick(object sender, EventArgs e) - { - if (!GPSService.Iniciado) - { - ((Timer)sender).Stop(); - } - lblStatus.Text = "Status: " + Enum.GetName(typeof(StatusCarroMapa), Variaveis.OperacaoEmAndamento.OpMapaGPS.ReferencialRuaGPS.StatusAtual); - lblDirecao.Text = "Direção: " + Enum.GetName(typeof(DirecaoCarroRua), Variaveis.OperacaoEmAndamento.OpMapaGPS.ReferencialRuaGPS.Direcao); - //var Ponto = Variaveis.OperacaoEmAndamento.Mapa.Trajetoria[Variaveis.OperacaoEmAndamento.Mapa.IdxRuaAtual][Variaveis.OperacaoEmAndamento.ReferencialRuaGPS.IdxPontoAproximadoRua]; - } - - private void btnManobraConcluida_Click(object sender, EventArgs e) - { - if (Variaveis.OperacaoEmAndamento.OpMapaGPS.ReferencialRuaGPS.StatusAtual == StatusCarroMapa.Manobrando) - { - Variaveis.OperacaoEmAndamento.OpMapaGPS.ReferencialRuaGPS.ManobraConcluida = true; - } - } - - - - - #endregion - - } } diff --git a/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoSeguidorLinha.Designer.cs b/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoSeguidorLinha.Designer.cs index 395e16cb6..54f3572ae 100644 --- a/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoSeguidorLinha.Designer.cs +++ b/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoSeguidorLinha.Designer.cs @@ -47,10 +47,8 @@ namespace AgroBase.Forms.Operacoes this.picSonar = new System.Windows.Forms.PictureBox(); this.pnlNiveis = new System.Windows.Forms.Panel(); this.lblPorcentagemProgressoRua = new System.Windows.Forms.Label(); - this.btnSimular = new System.Windows.Forms.Button(); this.pgbProgressoRua = new System.Windows.Forms.ProgressBar(); this.lblProgressoRua = new System.Windows.Forms.Label(); - this.btnManobraConcluida = new System.Windows.Forms.Button(); this.lblDirecao = new System.Windows.Forms.Label(); this.lblStatus = new System.Windows.Forms.Label(); this.lblProgressoT = new System.Windows.Forms.Label(); @@ -111,7 +109,7 @@ namespace AgroBase.Forms.Operacoes this.pnlCameraSolo.Controls.Add(this.pnlCameraSoloD); this.pnlCameraSolo.Controls.Add(this.pnlCameraSoloE); this.pnlCameraSolo.Location = new System.Drawing.Point(9, 217); - this.pnlCameraSolo.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pnlCameraSolo.Margin = new System.Windows.Forms.Padding(2); this.pnlCameraSolo.Name = "pnlCameraSolo"; this.pnlCameraSolo.Size = new System.Drawing.Size(592, 268); this.pnlCameraSolo.TabIndex = 0; @@ -136,7 +134,7 @@ namespace AgroBase.Forms.Operacoes // this.pnlCameraCaminho.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.pnlCameraCaminho.Location = new System.Drawing.Point(361, 10); - this.pnlCameraCaminho.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pnlCameraCaminho.Margin = new System.Windows.Forms.Padding(2); this.pnlCameraCaminho.Name = "pnlCameraCaminho"; this.pnlCameraCaminho.Size = new System.Drawing.Size(262, 203); this.pnlCameraCaminho.TabIndex = 1; @@ -147,7 +145,7 @@ namespace AgroBase.Forms.Operacoes this.pnlAtuadores.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.pnlAtuadores.Controls.Add(this.lblPressao); this.pnlAtuadores.Location = new System.Drawing.Point(9, 491); - this.pnlAtuadores.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pnlAtuadores.Margin = new System.Windows.Forms.Padding(2); this.pnlAtuadores.Name = "pnlAtuadores"; this.pnlAtuadores.Size = new System.Drawing.Size(594, 71); this.pnlAtuadores.TabIndex = 2; @@ -166,7 +164,7 @@ namespace AgroBase.Forms.Operacoes // this.pnlCaminho.BackColor = System.Drawing.Color.White; this.pnlCaminho.Location = new System.Drawing.Point(627, 21); - this.pnlCaminho.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pnlCaminho.Margin = new System.Windows.Forms.Padding(2); this.pnlCaminho.Name = "pnlCaminho"; this.pnlCaminho.Size = new System.Drawing.Size(384, 279); this.pnlCaminho.TabIndex = 3; @@ -176,7 +174,7 @@ namespace AgroBase.Forms.Operacoes // this.pnlGraficos.Controls.Add(this.tabControl1); this.pnlGraficos.Location = new System.Drawing.Point(606, 307); - this.pnlGraficos.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pnlGraficos.Margin = new System.Windows.Forms.Padding(2); this.pnlGraficos.Name = "pnlGraficos"; this.pnlGraficos.Size = new System.Drawing.Size(405, 254); this.pnlGraficos.TabIndex = 4; @@ -187,7 +185,7 @@ namespace AgroBase.Forms.Operacoes this.tabControl1.Controls.Add(this.tabSonar); this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControl1.Location = new System.Drawing.Point(0, 0); - this.tabControl1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tabControl1.Margin = new System.Windows.Forms.Padding(2); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; this.tabControl1.Size = new System.Drawing.Size(405, 254); @@ -197,9 +195,9 @@ namespace AgroBase.Forms.Operacoes // this.tabGrafico.Controls.Add(this.chartGraficos); this.tabGrafico.Location = new System.Drawing.Point(4, 22); - this.tabGrafico.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tabGrafico.Margin = new System.Windows.Forms.Padding(2); this.tabGrafico.Name = "tabGrafico"; - this.tabGrafico.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tabGrafico.Padding = new System.Windows.Forms.Padding(2); this.tabGrafico.Size = new System.Drawing.Size(397, 228); this.tabGrafico.TabIndex = 0; this.tabGrafico.Text = "Desempenho"; @@ -213,7 +211,7 @@ namespace AgroBase.Forms.Operacoes legend1.Name = "Legend1"; this.chartGraficos.Legends.Add(legend1); this.chartGraficos.Location = new System.Drawing.Point(2, 2); - this.chartGraficos.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.chartGraficos.Margin = new System.Windows.Forms.Padding(2); this.chartGraficos.Name = "chartGraficos"; series1.ChartArea = "ChartArea1"; series1.Legend = "Legend1"; @@ -227,9 +225,9 @@ namespace AgroBase.Forms.Operacoes // this.tabSonar.Controls.Add(this.picSonar); this.tabSonar.Location = new System.Drawing.Point(4, 22); - this.tabSonar.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tabSonar.Margin = new System.Windows.Forms.Padding(2); this.tabSonar.Name = "tabSonar"; - this.tabSonar.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tabSonar.Padding = new System.Windows.Forms.Padding(2); this.tabSonar.Size = new System.Drawing.Size(397, 228); this.tabSonar.TabIndex = 1; this.tabSonar.Text = "Sonar"; @@ -239,7 +237,7 @@ namespace AgroBase.Forms.Operacoes // this.picSonar.Dock = System.Windows.Forms.DockStyle.Fill; this.picSonar.Location = new System.Drawing.Point(2, 2); - this.picSonar.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.picSonar.Margin = new System.Windows.Forms.Padding(2); this.picSonar.Name = "picSonar"; this.picSonar.Size = new System.Drawing.Size(393, 224); this.picSonar.TabIndex = 1; @@ -249,10 +247,8 @@ namespace AgroBase.Forms.Operacoes // this.pnlNiveis.BackColor = System.Drawing.SystemColors.Control; this.pnlNiveis.Controls.Add(this.lblPorcentagemProgressoRua); - this.pnlNiveis.Controls.Add(this.btnSimular); this.pnlNiveis.Controls.Add(this.pgbProgressoRua); this.pnlNiveis.Controls.Add(this.lblProgressoRua); - this.pnlNiveis.Controls.Add(this.btnManobraConcluida); this.pnlNiveis.Controls.Add(this.lblDirecao); this.pnlNiveis.Controls.Add(this.lblStatus); this.pnlNiveis.Controls.Add(this.lblProgressoT); @@ -266,7 +262,7 @@ namespace AgroBase.Forms.Operacoes this.pnlNiveis.Controls.Add(this.pgbReservatorio); this.pnlNiveis.Font = new System.Drawing.Font("Mongolian Baiti", 9F, System.Drawing.FontStyle.Bold); this.pnlNiveis.Location = new System.Drawing.Point(9, 570); - this.pnlNiveis.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pnlNiveis.Margin = new System.Windows.Forms.Padding(2); this.pnlNiveis.Name = "pnlNiveis"; this.pnlNiveis.Size = new System.Drawing.Size(592, 69); this.pnlNiveis.TabIndex = 6; @@ -281,21 +277,10 @@ namespace AgroBase.Forms.Operacoes this.lblPorcentagemProgressoRua.TabIndex = 16; this.lblPorcentagemProgressoRua.Text = "00,00%"; // - // btnSimular - // - this.btnSimular.Location = new System.Drawing.Point(479, 42); - this.btnSimular.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.btnSimular.Name = "btnSimular"; - this.btnSimular.Size = new System.Drawing.Size(61, 21); - this.btnSimular.TabIndex = 12; - this.btnSimular.Text = "Simular"; - this.btnSimular.UseVisualStyleBackColor = true; - this.btnSimular.Click += new System.EventHandler(this.btnSimular_Click); - // // pgbProgressoRua // this.pgbProgressoRua.Location = new System.Drawing.Point(375, 23); - this.pgbProgressoRua.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pgbProgressoRua.Margin = new System.Windows.Forms.Padding(2); this.pgbProgressoRua.Name = "pgbProgressoRua"; this.pgbProgressoRua.Size = new System.Drawing.Size(150, 13); this.pgbProgressoRua.TabIndex = 15; @@ -310,17 +295,6 @@ namespace AgroBase.Forms.Operacoes this.lblProgressoRua.TabIndex = 14; this.lblProgressoRua.Text = "% Rua"; // - // btnManobraConcluida - // - this.btnManobraConcluida.Location = new System.Drawing.Point(544, 43); - this.btnManobraConcluida.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.btnManobraConcluida.Name = "btnManobraConcluida"; - this.btnManobraConcluida.Size = new System.Drawing.Size(39, 21); - this.btnManobraConcluida.TabIndex = 13; - this.btnManobraConcluida.Text = "MC"; - this.btnManobraConcluida.UseVisualStyleBackColor = true; - this.btnManobraConcluida.Click += new System.EventHandler(this.btnManobraConcluida_Click); - // // lblDirecao // this.lblDirecao.AutoSize = true; @@ -396,7 +370,7 @@ namespace AgroBase.Forms.Operacoes // pgbBateria // this.pgbBateria.Location = new System.Drawing.Point(98, 36); - this.pgbBateria.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pgbBateria.Margin = new System.Windows.Forms.Padding(2); this.pgbBateria.Name = "pgbBateria"; this.pgbBateria.Size = new System.Drawing.Size(175, 27); this.pgbBateria.TabIndex = 2; @@ -404,7 +378,7 @@ namespace AgroBase.Forms.Operacoes // pgbProgresso // this.pgbProgresso.Location = new System.Drawing.Point(375, 6); - this.pgbProgresso.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pgbProgresso.Margin = new System.Windows.Forms.Padding(2); this.pgbProgresso.Name = "pgbProgresso"; this.pgbProgresso.Size = new System.Drawing.Size(150, 13); this.pgbProgresso.TabIndex = 4; @@ -423,7 +397,7 @@ namespace AgroBase.Forms.Operacoes // pgbReservatorio // this.pgbReservatorio.Location = new System.Drawing.Point(98, 5); - this.pgbReservatorio.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pgbReservatorio.Margin = new System.Windows.Forms.Padding(2); this.pgbReservatorio.Name = "pgbReservatorio"; this.pgbReservatorio.Size = new System.Drawing.Size(175, 27); this.pgbReservatorio.TabIndex = 0; @@ -437,9 +411,9 @@ namespace AgroBase.Forms.Operacoes this.gpbOpcoes.Controls.Add(this.btnIniciarOperacao); this.gpbOpcoes.Font = new System.Drawing.Font("Mongolian Baiti", 9F, System.Drawing.FontStyle.Bold); this.gpbOpcoes.Location = new System.Drawing.Point(813, 566); - this.gpbOpcoes.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.gpbOpcoes.Margin = new System.Windows.Forms.Padding(2); this.gpbOpcoes.Name = "gpbOpcoes"; - this.gpbOpcoes.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.gpbOpcoes.Padding = new System.Windows.Forms.Padding(2); this.gpbOpcoes.Size = new System.Drawing.Size(198, 119); this.gpbOpcoes.TabIndex = 7; this.gpbOpcoes.TabStop = false; @@ -468,7 +442,7 @@ namespace AgroBase.Forms.Operacoes // nudPressaoSP // this.nudPressaoSP.Location = new System.Drawing.Point(104, 19); - this.nudPressaoSP.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.nudPressaoSP.Margin = new System.Windows.Forms.Padding(2); this.nudPressaoSP.Maximum = new decimal(new int[] { 200, 0, @@ -482,7 +456,7 @@ namespace AgroBase.Forms.Operacoes // btnCarregarMapa // this.btnCarregarMapa.Location = new System.Drawing.Point(22, 58); - this.btnCarregarMapa.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnCarregarMapa.Margin = new System.Windows.Forms.Padding(2); this.btnCarregarMapa.Name = "btnCarregarMapa"; this.btnCarregarMapa.Size = new System.Drawing.Size(154, 21); this.btnCarregarMapa.TabIndex = 5; @@ -493,7 +467,7 @@ namespace AgroBase.Forms.Operacoes // btnIniciarOperacao // this.btnIniciarOperacao.Location = new System.Drawing.Point(22, 87); - this.btnIniciarOperacao.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnIniciarOperacao.Margin = new System.Windows.Forms.Padding(2); this.btnIniciarOperacao.Name = "btnIniciarOperacao"; this.btnIniciarOperacao.Size = new System.Drawing.Size(154, 21); this.btnIniciarOperacao.TabIndex = 6; @@ -512,9 +486,9 @@ namespace AgroBase.Forms.Operacoes this.gpbInformacoesGerais.Controls.Add(this.lblDistanciaPercorrida); this.gpbInformacoesGerais.Font = new System.Drawing.Font("Mongolian Baiti", 9F, System.Drawing.FontStyle.Bold); this.gpbInformacoesGerais.Location = new System.Drawing.Point(606, 566); - this.gpbInformacoesGerais.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.gpbInformacoesGerais.Margin = new System.Windows.Forms.Padding(2); this.gpbInformacoesGerais.Name = "gpbInformacoesGerais"; - this.gpbInformacoesGerais.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.gpbInformacoesGerais.Padding = new System.Windows.Forms.Padding(2); this.gpbInformacoesGerais.Size = new System.Drawing.Size(202, 119); this.gpbInformacoesGerais.TabIndex = 9; this.gpbInformacoesGerais.TabStop = false; @@ -602,7 +576,7 @@ namespace AgroBase.Forms.Operacoes this.pnlInferior.Controls.Add(this.lblUltimaLeituraSolo); this.pnlInferior.Font = new System.Drawing.Font("Mongolian Baiti", 9F, System.Drawing.FontStyle.Bold); this.pnlInferior.Location = new System.Drawing.Point(9, 644); - this.pnlInferior.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pnlInferior.Margin = new System.Windows.Forms.Padding(2); this.pnlInferior.Name = "pnlInferior"; this.pnlInferior.Size = new System.Drawing.Size(592, 41); this.pnlInferior.TabIndex = 13; @@ -702,7 +676,7 @@ namespace AgroBase.Forms.Operacoes this.pnlOrientacao.BackgroundImage = global::AgroBase.Properties.Resources.rosa_dos_ventos; this.pnlOrientacao.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.pnlOrientacao.Location = new System.Drawing.Point(283, 6); - this.pnlOrientacao.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pnlOrientacao.Margin = new System.Windows.Forms.Padding(2); this.pnlOrientacao.Name = "pnlOrientacao"; this.pnlOrientacao.Size = new System.Drawing.Size(78, 84); this.pnlOrientacao.TabIndex = 11; @@ -714,7 +688,7 @@ namespace AgroBase.Forms.Operacoes this.pnlInclinacao.BackgroundImage = global::AgroBase.Properties.Resources.transferidor; this.pnlInclinacao.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.pnlInclinacao.Location = new System.Drawing.Point(937, 6); - this.pnlInclinacao.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pnlInclinacao.Margin = new System.Windows.Forms.Padding(2); this.pnlInclinacao.Name = "pnlInclinacao"; this.pnlInclinacao.Size = new System.Drawing.Size(78, 84); this.pnlInclinacao.TabIndex = 10; @@ -726,7 +700,7 @@ namespace AgroBase.Forms.Operacoes this.pnlAnguloCamera.BackgroundImage = global::AgroBase.Properties.Resources.transferidor; this.pnlAnguloCamera.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.pnlAnguloCamera.Location = new System.Drawing.Point(623, 6); - this.pnlAnguloCamera.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pnlAnguloCamera.Margin = new System.Windows.Forms.Padding(2); this.pnlAnguloCamera.Name = "pnlAnguloCamera"; this.pnlAnguloCamera.Size = new System.Drawing.Size(78, 84); this.pnlAnguloCamera.TabIndex = 15; @@ -762,7 +736,7 @@ namespace AgroBase.Forms.Operacoes this.Controls.Add(this.pnlAtuadores); this.Controls.Add(this.pnlCameraCaminho); this.Controls.Add(this.pnlCameraSolo); - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(2); this.Name = "frmOperacaoMapaGPS"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Operação Mapa GPS"; @@ -837,8 +811,6 @@ namespace AgroBase.Forms.Operacoes private System.Windows.Forms.Label lblDirecao; private System.Windows.Forms.Label lblStatus; private System.Windows.Forms.Label lblDistancia; - private System.Windows.Forms.Button btnSimular; - private System.Windows.Forms.Button btnManobraConcluida; private System.Windows.Forms.Label lblPorcentagemProgressoRua; private System.Windows.Forms.ProgressBar pgbProgressoRua; private System.Windows.Forms.Label lblProgressoRua; diff --git a/AgroBase/AgroBase/bin/Debug/AgroBase.pdb b/AgroBase/AgroBase/bin/Debug/AgroBase.pdb index eef25e3d5..8f579c673 100644 Binary files a/AgroBase/AgroBase/bin/Debug/AgroBase.pdb and b/AgroBase/AgroBase/bin/Debug/AgroBase.pdb differ diff --git a/AgroBase/AgroBase/obj/Debug/AgroBase.csproj.GenerateResource.cache b/AgroBase/AgroBase/obj/Debug/AgroBase.csproj.GenerateResource.cache index fd6dbcc1d..f469017a9 100644 Binary files a/AgroBase/AgroBase/obj/Debug/AgroBase.csproj.GenerateResource.cache and b/AgroBase/AgroBase/obj/Debug/AgroBase.csproj.GenerateResource.cache differ diff --git a/AgroBase/AgroBase/obj/Debug/AgroBase.pdb b/AgroBase/AgroBase/obj/Debug/AgroBase.pdb index eef25e3d5..8f579c673 100644 Binary files a/AgroBase/AgroBase/obj/Debug/AgroBase.pdb and b/AgroBase/AgroBase/obj/Debug/AgroBase.pdb differ