diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/0b8dedd9-a693-44b0-a811-1805cd12466b.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/0b8dedd9-a693-44b0-a811-1805cd12466b.vsidx
deleted file mode 100644
index d6b37f568..000000000
Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/0b8dedd9-a693-44b0-a811-1805cd12466b.vsidx and /dev/null differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/3a537cb1-509e-47fc-8e54-a3a3c7dc1b0b.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/3a537cb1-509e-47fc-8e54-a3a3c7dc1b0b.vsidx
deleted file mode 100644
index 1c7f28abd..000000000
Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/3a537cb1-509e-47fc-8e54-a3a3c7dc1b0b.vsidx and /dev/null differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/67132daf-2dca-4267-b420-828969673658.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/67132daf-2dca-4267-b420-828969673658.vsidx
new file mode 100644
index 000000000..5418f8a41
Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/67132daf-2dca-4267-b420-828969673658.vsidx differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/c9c3a863-e95b-4818-9241-fe1ec73e69cd.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/c9c3a863-e95b-4818-9241-fe1ec73e69cd.vsidx
new file mode 100644
index 000000000..8dcbb3655
Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/c9c3a863-e95b-4818-9241-fe1ec73e69cd.vsidx differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/dddcec6b-464d-41cd-a1e7-5861e7f86e5b.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/dddcec6b-464d-41cd-a1e7-5861e7f86e5b.vsidx
deleted file mode 100644
index 70aef67a0..000000000
Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/dddcec6b-464d-41cd-a1e7-5861e7f86e5b.vsidx and /dev/null differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/fb40c0db-222c-4a14-b34b-8bd99624cc9e.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/fb40c0db-222c-4a14-b34b-8bd99624cc9e.vsidx
new file mode 100644
index 000000000..696eee1ed
Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/fb40c0db-222c-4a14-b34b-8bd99624cc9e.vsidx differ
diff --git a/AgroBase/.vs/AgroBase/v17/.suo b/AgroBase/.vs/AgroBase/v17/.suo
index 68b9432e8..dab47df64 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 50e21863d..6baf48830 100644
--- a/AgroBase/AgroBase/AgroBase.csproj
+++ b/AgroBase/AgroBase/AgroBase.csproj
@@ -255,11 +255,11 @@
frmMovPlot.cs
-
+
Form
- frmOperacaoSeguidorLinha.cs
+ frmOperacaoMapaGPS.cs
Form
@@ -401,8 +401,8 @@
frmJoystick.cs
-
- frmOperacaoSeguidorLinha.cs
+
+ frmOperacaoMapaGPS.cs
frmParametrizacaoOperacao.cs
diff --git a/AgroBase/AgroBase/Forms/Atuador/frmAtuCamera.cs b/AgroBase/AgroBase/Forms/Atuador/frmAtuCamera.cs
index 4c664e112..f8196656a 100644
--- a/AgroBase/AgroBase/Forms/Atuador/frmAtuCamera.cs
+++ b/AgroBase/AgroBase/Forms/Atuador/frmAtuCamera.cs
@@ -87,9 +87,17 @@ namespace AgroBase.Forms
cameraService.ArquivoLeitura = ArquivoLeitura;
cameraService.IniciarCamera(
PythonService.ScriptWeedDetector,
- new string[] { MaxLeituras.ToString(), VideoPorta, VideoUrl, ArquivoLeitura, "1", SocketPorta },
+ new string[] {
+ MaxLeituras.ToString(),
+ VideoPorta,
+ VideoUrl,
+ ArquivoLeitura,
+ "1",
+ SocketPorta
+ },
VideoPorta,
VideoUrl,
+ true,
SocketPorta
);
diff --git a/AgroBase/AgroBase/Forms/Movimentacao/frmMovCamera.cs b/AgroBase/AgroBase/Forms/Movimentacao/frmMovCamera.cs
index 774d2d3ef..b3e101e5e 100644
--- a/AgroBase/AgroBase/Forms/Movimentacao/frmMovCamera.cs
+++ b/AgroBase/AgroBase/Forms/Movimentacao/frmMovCamera.cs
@@ -284,9 +284,17 @@ namespace AgroBase.Forms.Movimentacao
cameraService.ArquivoLeitura = ArquivoLeitura;
cameraService.IniciarCamera(
PythonService.ScriptStreetDetector,
- new string[] { MaxLeituras.ToString(), VideoPorta, VideoUrl, ArquivoLeitura, MostrarDebug ? "1" : "0", SocketPorta },
+ new string[] {
+ MaxLeituras.ToString(),
+ VideoPorta,
+ VideoUrl,
+ ArquivoLeitura,
+ MostrarDebug ? "1" : "0",
+ SocketPorta
+ },
VideoPorta,
VideoUrl,
+ false,
SocketPorta
);
diff --git a/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoSeguidorLinha.cs b/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoMapaGPS.cs
similarity index 92%
rename from AgroBase/AgroBase/Forms/Operacoes/frmOperacaoSeguidorLinha.cs
rename to AgroBase/AgroBase/Forms/Operacoes/frmOperacaoMapaGPS.cs
index 6b58e6772..31f17baf6 100644
--- a/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoSeguidorLinha.cs
+++ b/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoMapaGPS.cs
@@ -21,8 +21,10 @@ using static AgroBase.Models.Enuns;
namespace AgroBase.Forms.Operacoes
{
- public partial class frmOperacaoSeguidorLinha : Form
+ public partial class frmOperacaoMapaGPS : Form
{
+ #region Variáveis
+
private List CamerasSolo = new List();
private CameraCaminhoModel cameraCaminho;
@@ -32,10 +34,12 @@ namespace AgroBase.Forms.Operacoes
DispositivosService Movimentacao;
DispositivosService Direcional;
DispositivosService Atuador;
- DispositivosService Sensoriamento;
+ #endregion
- public frmOperacaoSeguidorLinha()
+ #region Eventos do formulário
+
+ public frmOperacaoMapaGPS()
{
InitializeComponent();
@@ -52,7 +56,7 @@ namespace AgroBase.Forms.Operacoes
}
- private void frmOperacaoSeguidorLinha_Load(object sender, EventArgs e)
+ private void frmOperacaoMapaGPS_Load(object sender, EventArgs e)
{
tmrLeituras.Tick += TmrLeituras_Tick;
tmrLeituras.Start();
@@ -60,10 +64,10 @@ namespace AgroBase.Forms.Operacoes
AtualizarDispositivos();
AtualizaListaCameras();
- Variaveis.OperacaoEmAndamento = new OperacaoModel(Enuns.ModoOperacao.SeguidorDeLinha, Movimentacao, Direcional, Atuador);
+ Variaveis.OperacaoEmAndamento = new OperacaoModel(ModoOperacao.MapaGPS, Movimentacao, Direcional, Atuador);
}
- private void frmOperacaoSeguidorLinha_FormClosing(object sender, FormClosingEventArgs e)
+ private void frmOperacaoMapaGPS_FormClosing(object sender, FormClosingEventArgs e)
{
tmrLeituras.Stop();
//DesligarCameraSoloE();
@@ -77,293 +81,26 @@ namespace AgroBase.Forms.Operacoes
private void AtualizarDispositivos()
{
- Movimentacao = (DispositivosService)Variaveis.DispositivosConectados.FirstOrDefault(x => x.Dispositivo == Enuns.T_Code.Mov);
- Direcional = (DispositivosService)Variaveis.DispositivosConectados.FirstOrDefault(x => x.Dispositivo == Enuns.T_Code.Dir);
- Atuador = (DispositivosService)Variaveis.DispositivosConectados.FirstOrDefault(x => x.Dispositivo == Enuns.T_Code.Atu);
- Sensoriamento = (DispositivosService)Variaveis.DispositivosConectados.FirstOrDefault(x => x.Dispositivo == Enuns.T_Code.Sen);
+ Movimentacao = (DispositivosService)Variaveis.DispositivosConectados.FirstOrDefault(x => x.Dispositivo == T_Code.Mov);
+ Direcional = (DispositivosService)Variaveis.DispositivosConectados.FirstOrDefault(x => x.Dispositivo == T_Code.Dir);
+ Atuador = (DispositivosService)Variaveis.DispositivosConectados.FirstOrDefault(x => x.Dispositivo == T_Code.Atu);
chbMOVativo.Checked = Movimentacao != null && Movimentacao._Porta.IsOpen;
chbDIRativo.Checked = Direcional != null && Direcional._Porta.IsOpen;
chbATUativo.Checked = Atuador != null && Atuador._Porta.IsOpen;
chbGPSativo.Checked = GPSService.PortaGPS != null && GPSService.PortaGPS.IsOpen;
-
+
AtualizarGrafico();
}
- private void AtualizaListaCameras()
- {
- var listaCameras = new CameraService