Commit 9af0bb6c authored by tecnosapiens's avatar tecnosapiens

clean code

parent 0f064266
...@@ -28,14 +28,10 @@ void SlugsPadCameraControl::mouseMoveEvent(QMouseEvent *event) ...@@ -28,14 +28,10 @@ void SlugsPadCameraControl::mouseMoveEvent(QMouseEvent *event)
{ {
//emit mouseMoveCoord(event->x(),event->y()); //emit mouseMoveCoord(event->x(),event->y());
if(dragging) if(dragging)
{
if(abs(x1-event->x())>20 || abs(y1-event->y())>20)
{ {
getDeltaPositionPad(event->x(), event->y()); // getDeltaPositionPad(event->x(), event->y());
x1 = event->x();
y1 = event->y();
}
} }
...@@ -54,7 +50,7 @@ void SlugsPadCameraControl::mouseReleaseEvent(QMouseEvent *event) ...@@ -54,7 +50,7 @@ void SlugsPadCameraControl::mouseReleaseEvent(QMouseEvent *event)
{ {
dragging = false; dragging = false;
//emit mouseReleaseCoord(event->x(),event->y()); //emit mouseReleaseCoord(event->x(),event->y());
//getDeltaPositionPad(event->x(), event->y()); getDeltaPositionPad(event->x(), event->y());
xFin = event->x(); xFin = event->x();
yFin = event->y(); yFin = event->y();
...@@ -105,6 +101,10 @@ void SlugsPadCameraControl::getDeltaPositionPad(int x2, int y2) ...@@ -105,6 +101,10 @@ void SlugsPadCameraControl::getDeltaPositionPad(int x2, int y2)
double bearing = localMeasures.x(); double bearing = localMeasures.x();
double dist = getDistPixel(y1,x1,y2,x2); double dist = getDistPixel(y1,x1,y2,x2);
// this only convert real bearing to frame widget bearing
bearing = bearing +90;
if(bearing>= 360) bearing = bearing - 360;
if(((bearing > 330)&&(bearing < 360)) || ((bearing >= 0)&&(bearing <= 30))) if(((bearing > 330)&&(bearing < 360)) || ((bearing >= 0)&&(bearing <= 30)))
...@@ -210,16 +210,9 @@ double SlugsPadCameraControl::getDistPixel(int x1, int y1, int x2, int y2) ...@@ -210,16 +210,9 @@ double SlugsPadCameraControl::getDistPixel(int x1, int y1, int x2, int y2)
// distancia = (float) hipotenusa; // distancia = (float) hipotenusa;
} }
/**
* Esta funcin xxxxxxxxx QPointF SlugsPadCameraControl::ObtenerMarcacionDistanciaPixel(double lon1, double lat1,
* @param double lat1 --> double lon2, double lat2)
* @param double lon1 -->
* @param double lat2 -->
* @param double lon2 -->
* @param ref double rumbo -->
* @param ref double distancia -->
*/
QPointF SlugsPadCameraControl::ObtenerMarcacionDistanciaPixel(double lon1, double lat1, double lon2, double lat2)
{ {
double cateto_opuesto,cateto_adyacente, hipotenusa, distancia, marcacion; double cateto_opuesto,cateto_adyacente, hipotenusa, distancia, marcacion;
...@@ -256,9 +249,7 @@ QPointF SlugsPadCameraControl::ObtenerMarcacionDistanciaPixel(double lon1, doubl ...@@ -256,9 +249,7 @@ QPointF SlugsPadCameraControl::ObtenerMarcacionDistanciaPixel(double lon1, doubl
else if((lat1 == lat2) && (lon1 == lon2)) //0 else if((lat1 == lat2) && (lon1 == lon2)) //0
marcacion = 0.0; marcacion = 0.0;
// this only convert real bearing to frame widget bearing
marcacion = marcacion +90;
if(marcacion>= 360) marcacion = marcacion - 360;
return QPointF(marcacion,distancia); return QPointF(marcacion,distancia);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment