diff --git a/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/ChessTrackActivity.java b/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/ChessTrackActivity.java index 9672369fea1ea9e657fd2153618945e7fa208057..027551e45837c8b20631f953fd509aee13648225 100644 --- a/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/ChessTrackActivity.java +++ b/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/ChessTrackActivity.java @@ -133,7 +133,7 @@ public class ChessTrackActivity extends Activity implements int port = Integer.parseInt(value.toString()); Log.i(TAG, "PORT=" + port); - _manager.setConnection(ip, port); + //_manager.setConnection(ip, port); } } }); diff --git a/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/ajedrez/Logica.java b/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/ajedrez/Logica.java index e86db4f0037a0dcc5df5a06800f1711c2649fc67..dc06881a9b00c1ac7776e26b468ccfbf444fef90 100644 --- a/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/ajedrez/Logica.java +++ b/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/ajedrez/Logica.java @@ -6,6 +6,8 @@ import org.opencv.core.Mat; import org.opencv.core.Size; public class Logica { + + private static final String TAG = "CHESSTRACK::Logica"; private Mat _tableroInicio; private Mat _tableroAnterior; @@ -26,7 +28,7 @@ public class Logica { public boolean validarNuevoTablero(Mat actual) { Mat result = new Mat(8, 8, CvType.CV_8UC1); Core.absdiff(actual, _tableroAnterior, result); - if (Core.countNonZero(result) == 0) { + if (Core.countNonZero(result) != 0) { _tableroAnterior = actual; } return (Core.countNonZero(result) != 0); diff --git a/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/modulovision/Manager.java b/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/modulovision/Manager.java index 9d58966d0b24a262b549b40c031f2e7d24bc9fc7..65dc8fe1db3d00c8af2c35dd48440c0507d22bb5 100644 --- a/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/modulovision/Manager.java +++ b/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/modulovision/Manager.java @@ -133,8 +133,8 @@ public class Manager { if (_logica.validarNuevoTablero(aux)) { if (_salida == OK) { - _client.SendData("Nuevo Tablero Valido = \n" - + String.valueOf(_cantJugada)); + _client.SendData("Nuevo Tablero Valido = [" + + String.valueOf(_cantJugada) + "]\n"); _cantJugada++; _client.SendData(" ".concat(aux.dump().concat("\n"))); } diff --git a/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/modulovision/imgproc/Homografia.java b/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/modulovision/imgproc/Homografia.java index e4d37c569470d8e58ed8bd0d912a7418a0938d45..1834f33e88b04dbc596559e5adfed001279d31ac 100644 --- a/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/modulovision/imgproc/Homografia.java +++ b/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/modulovision/imgproc/Homografia.java @@ -72,11 +72,20 @@ public class Homografia implements ImgProcInterface { @Override public Mat procesarImagen(Mat inputFrame) { Log.i(TAG, "processing Frame - INI"); + double x = inputFrame.size().width; + double y = inputFrame.size().height; + if (x < _rectROI.size().width){ + x = _rectROI.size().width; + } + if (y < _rectROI.size().height){ + y = _rectROI.size().height; + } + Mat aux = new Mat(); // hace la homografia con la matriz calculada en un ppio - Imgproc.warpPerspective(inputFrame,inputFrame, _matrizTransformada, inputFrame.size()); + Imgproc.warpPerspective(inputFrame,aux, _matrizTransformada, new Size(x,y)); Mat tmp = Mat.zeros(_rectROI.size(), CvType.CV_8UC4); - (inputFrame.submat(_rectROI)).copyTo(tmp); + (aux.submat(_rectROI)).copyTo(tmp); Log.i(TAG, "processing Frame - FIN"); return tmp;