From c868a9f74ebe2344c2b49d401ab8d72d26505936 Mon Sep 17 00:00:00 2001 From: LM Date: Wed, 27 Jul 2011 16:39:48 +0200 Subject: [PATCH] Commented out a lot of debug output, silencing the debug console mostly --- src/Waypoint.cc | 4 ++-- src/comm/SerialLink.cc | 6 +++--- src/comm/UDPLink.cc | 6 +++--- src/input/JoystickInput.cc | 6 +++--- src/libs/opmapcontrol/src/core/tilecachequeue.cpp | 4 ++++ src/ui/map/MAV2DIcon.cc | 10 +++++----- src/ui/map/QGCMapWidget.cc | 8 ++++---- src/ui/map/Waypoint2DIcon.cc | 8 ++++---- src/ui/uas/UASView.cc | 12 ++++++------ 9 files changed, 34 insertions(+), 30 deletions(-) diff --git a/src/Waypoint.cc b/src/Waypoint.cc index 48efb69..2fd5a70 100644 --- a/src/Waypoint.cc +++ b/src/Waypoint.cc @@ -221,8 +221,8 @@ void Waypoint::setAcceptanceRadius(double radius) void Waypoint::setParam1(double param1) { - qDebug() << "SENDER:" << QObject::sender(); - qDebug() << "PARAM1 SET REQ:" << param1; + //qDebug() << "SENDER:" << QObject::sender(); + //qDebug() << "PARAM1 SET REQ:" << param1; if (this->param1 != param1) { this->param1 = param1; emit changed(this); diff --git a/src/comm/SerialLink.cc b/src/comm/SerialLink.cc index db53054..952f2f2 100644 --- a/src/comm/SerialLink.cc +++ b/src/comm/SerialLink.cc @@ -300,7 +300,7 @@ bool SerialLink::hardwareConnect() emit connected(true); } - qDebug() << "CONNECTING LINK: " << __FILE__ << __LINE__ << "with settings" << port->portName() << getBaudRate() << getDataBits() << getParityType() << getStopBits(); + //qDebug() << "CONNECTING LINK: " << __FILE__ << __LINE__ << "with settings" << port->portName() << getBaudRate() << getDataBits() << getParityType() << getStopBits(); writeSettings(); @@ -627,7 +627,7 @@ bool SerialLink::setBaudRateString(const QString& rate) bool SerialLink::setBaudRate(int rate) { - qDebug() << "BAUD RATE:" << rate; + //qDebug() << "BAUD RATE:" << rate; bool reconnect = false; bool accepted = true; // This is changed if none of the data rates matches @@ -796,7 +796,7 @@ bool SerialLink::setParityType(int parity) bool SerialLink::setDataBits(int dataBits) { - qDebug() << "Setting" << dataBits << "data bits"; + //qDebug() << "Setting" << dataBits << "data bits"; bool reconnect = false; if (isConnected()) reconnect = true; bool accepted = true; diff --git a/src/comm/UDPLink.cc b/src/comm/UDPLink.cc index af8a891..5147379 100644 --- a/src/comm/UDPLink.cc +++ b/src/comm/UDPLink.cc @@ -85,9 +85,9 @@ void UDPLink::setPort(int port) */ void UDPLink::addHost(const QString& host) { - qDebug() << "UDP:" << "ADDING HOST:" << host; + //qDebug() << "UDP:" << "ADDING HOST:" << host; if (host.contains(":")) { - qDebug() << "HOST: " << host.split(":").first(); + //qDebug() << "HOST: " << host.split(":").first(); QHostInfo info = QHostInfo::fromName(host.split(":").first()); if (info.error() == QHostInfo::NoError) { @@ -103,7 +103,7 @@ void UDPLink::addHost(const QString& host) } } hosts.append(address); - qDebug() << "Address:" << address.toString(); + //qDebug() << "Address:" << address.toString(); // Set port according to user input ports.append(host.split(":").last().toInt()); } diff --git a/src/input/JoystickInput.cc b/src/input/JoystickInput.cc index d5bdb55..805f9a5 100644 --- a/src/input/JoystickInput.cc +++ b/src/input/JoystickInput.cc @@ -143,7 +143,7 @@ void JoystickInput::run() switch(event.type) { case SDL_KEYDOWN: /* handle keyboard stuff here */ - qDebug() << "KEY PRESSED!"; + //qDebug() << "KEY PRESSED!"; break; case SDL_QUIT: @@ -153,7 +153,7 @@ void JoystickInput::run() case SDL_JOYBUTTONDOWN: /* Handle Joystick Button Presses */ if ( event.jbutton.button == 0 ) { - qDebug() << "BUTTON PRESSED!"; + //qDebug() << "BUTTON PRESSED!"; } break; @@ -170,7 +170,7 @@ void JoystickInput::run() break; default: - qDebug() << "SDL event occured"; + //qDebug() << "SDL event occured"; break; } } diff --git a/src/libs/opmapcontrol/src/core/tilecachequeue.cpp b/src/libs/opmapcontrol/src/core/tilecachequeue.cpp index 166e66a..db8e4d4 100644 --- a/src/libs/opmapcontrol/src/core/tilecachequeue.cpp +++ b/src/libs/opmapcontrol/src/core/tilecachequeue.cpp @@ -98,7 +98,9 @@ void TileCacheQueue::run() else { + #ifdef DEBUG_TILECACHEQUEUE qDebug()<<"Cache engine BEGIN WAIT"; + #endif //DEBUG_TILECACHEQUEUE waitmutex.lock(); int tout=4000; if(!waitc.wait(&waitmutex,tout)) @@ -115,7 +117,9 @@ void TileCacheQueue::run() } mutex.unlock(); } + #ifdef DEBUG_TILECACHEQUEUE qDebug()<<"Cache Engine DID NOT TimeOut"; + #endif //DEBUG_TILECACHEQUEUE waitmutex.unlock(); } } diff --git a/src/ui/map/MAV2DIcon.cc b/src/ui/map/MAV2DIcon.cc index 4fd3781..d36b2f9 100644 --- a/src/ui/map/MAV2DIcon.cc +++ b/src/ui/map/MAV2DIcon.cc @@ -53,7 +53,7 @@ void MAV2DIcon::setSelectedUAS(bool selected) */ void MAV2DIcon::setYaw(float yaw) { - //qDebug() << "MAV2Icon" << yaw; + //// qDebug() << "MAV2Icon" << yaw; float diff = fabs(yaw - this->yaw); while (diff > (float)M_PI) { diff -= (float)M_PI; @@ -111,7 +111,7 @@ void MAV2DIcon::drawAirframePolygon(int airframe, QPainter& painter, int radius, painter.rotate(yawRotate); - //qDebug() << "ICON SIZE:" << radius; + //// qDebug() << "ICON SIZE:" << radius; float iconSize = radius*0.9f; QPolygonF poly(24); @@ -158,7 +158,7 @@ void MAV2DIcon::drawAirframePolygon(int airframe, QPainter& painter, int radius, painter.rotate(yawRotate); - //qDebug() << "ICON SIZE:" << radius; + //// qDebug() << "ICON SIZE:" << radius; QPointF front(0, 0.2); front = front *iconSize; @@ -199,7 +199,7 @@ void MAV2DIcon::drawAirframePolygon(int airframe, QPainter& painter, int radius, int yawRotate = static_cast(yawDeg) % 360; painter.rotate(yawRotate); - //qDebug() << "ICON SIZE:" << radius; + //// qDebug() << "ICON SIZE:" << radius; float iconSize = radius*0.7f; @@ -254,7 +254,7 @@ void MAV2DIcon::drawAirframePolygon(int airframe, QPainter& painter, int radius, painter.rotate(yawRotate); - //qDebug() << "ICON SIZE:" << radius; + //// qDebug() << "ICON SIZE:" << radius; float iconSize = radius*0.9f; QPolygonF poly(3); diff --git a/src/ui/map/QGCMapWidget.cc b/src/ui/map/QGCMapWidget.cc index 3b3c62c..62cfca8 100644 --- a/src/ui/map/QGCMapWidget.cc +++ b/src/ui/map/QGCMapWidget.cc @@ -171,7 +171,7 @@ void QGCMapWidget::mouseDoubleClickEvent(QMouseEvent* event) */ void QGCMapWidget::addUAS(UASInterface* uas) { - qDebug() << "ADDING UAS"; + // // qDebug() << "ADDING UAS"; connect(uas, SIGNAL(globalPositionChanged(UASInterface*,double,double,double,quint64)), this, SLOT(updateGlobalPosition(UASInterface*,double,double,double,quint64))); //connect(uas, SIGNAL(attitudeChanged(UASInterface*,double,double,double,quint64)), this, SLOT(updateAttitude(UASInterface*,double,double,double,quint64))); connect(uas, SIGNAL(systemSpecsChanged(int)), this, SLOT(updateSystemSpecs(int))); @@ -390,7 +390,7 @@ void QGCMapWidget::handleMapWaypointEdit(mapcontrol::WayPointItem* waypoint) if (firingWaypointChange == wp) return; // Not in cycle, block now from entering it firingWaypointChange = wp; - qDebug() << "UPDATING WP FROM MAP"; + // // qDebug() << "UPDATING WP FROM MAP"; // Update WP values internals::PointLatLng pos = waypoint->Coord(); @@ -405,9 +405,9 @@ void QGCMapWidget::handleMapWaypointEdit(mapcontrol::WayPointItem* waypoint) internals::PointLatLng coord = waypoint->Coord(); QString coord_str = " " + QString::number(coord.Lat(), 'f', 6) + " " + QString::number(coord.Lng(), 'f', 6); - qDebug() << "MAP WP COORD (MAP):" << coord_str << __FILE__ << __LINE__; + // // qDebug() << "MAP WP COORD (MAP):" << coord_str << __FILE__ << __LINE__; QString wp_str = QString::number(wp->getLatitude(), 'f', 6) + " " + QString::number(wp->getLongitude(), 'f', 6); - qDebug() << "MAP WP COORD (WP):" << wp_str << __FILE__ << __LINE__; + // // qDebug() << "MAP WP COORD (WP):" << wp_str << __FILE__ << __LINE__; firingWaypointChange = NULL; diff --git a/src/ui/map/Waypoint2DIcon.cc b/src/ui/map/Waypoint2DIcon.cc index ab85b44..482d572 100644 --- a/src/ui/map/Waypoint2DIcon.cc +++ b/src/ui/map/Waypoint2DIcon.cc @@ -60,7 +60,7 @@ void Waypoint2DIcon::updateWaypoint() SetHeading(waypoint->getYaw()); SetCoord(internals::PointLatLng(waypoint->getLatitude(), waypoint->getLongitude())); - qDebug() << "UPDATING WP:" << waypoint->getId() << "LAT:" << waypoint->getLatitude() << "LON:" << waypoint->getLongitude(); + // qDebug() << "UPDATING WP:" << waypoint->getId() << "LAT:" << waypoint->getLatitude() << "LON:" << waypoint->getLongitude(); SetDescription(waypoint->getDescription()); SetAltitude(waypoint->getAltitude()); @@ -68,7 +68,7 @@ void Waypoint2DIcon::updateWaypoint() drawIcon(); QRectF newSize = boundingRect(); - qDebug() << "WIDTH" << newSize.width() << "<" << oldSize.width(); + // qDebug() << "WIDTH" << newSize.width() << "<" << oldSize.width(); // If new size is smaller than old size, update surrounding if ((newSize.width() <= oldSize.width()) || (newSize.height() <= oldSize.height())) @@ -78,8 +78,8 @@ void Waypoint2DIcon::updateWaypoint() int oldWidth = oldSize.width() + 20; int oldHeight = oldSize.height() + 20; map->update(this->x()-10, this->y()-10, oldWidth, oldHeight); - //qDebug() << "UPDATING DUE TO SMALLER SIZE"; - //qDebug() << "X:" << this->x()-1 << "Y:" << this->y()-1 << "WIDTH:" << oldWidth << "HEIGHT:" << oldHeight; + //// qDebug() << "UPDATING DUE TO SMALLER SIZE"; + //// qDebug() << "X:" << this->x()-1 << "Y:" << this->y()-1 << "WIDTH:" << oldWidth << "HEIGHT:" << oldHeight; } else { diff --git a/src/ui/uas/UASView.cc b/src/ui/uas/UASView.cc index 8f310ac..4d294e4 100644 --- a/src/ui/uas/UASView.cc +++ b/src/ui/uas/UASView.cc @@ -231,7 +231,7 @@ void UASView::mouseDoubleClickEvent (QMouseEvent * event) { Q_UNUSED(event); UASManager::instance()->setActiveUAS(uas); - qDebug() << __FILE__ << __LINE__ << "DOUBLECLICKED"; + // qDebug() << __FILE__ << __LINE__ << "DOUBLECLICKED"; } void UASView::enterEvent(QEvent* event) @@ -242,10 +242,10 @@ void UASView::enterEvent(QEvent* event) grabMouse(QCursor(Qt::PointingHandCursor)); } } - qDebug() << __FILE__ << __LINE__ << "IN FOCUS"; + // qDebug() << __FILE__ << __LINE__ << "IN FOCUS"; if (event->type() == QEvent::MouseButtonDblClick) { - qDebug() << __FILE__ << __LINE__ << "UAS CLICKED!"; + // qDebug() << __FILE__ << __LINE__ << "UAS CLICKED!"; } } @@ -499,7 +499,7 @@ void UASView::refresh() //repaint(); static quint64 lastupdate = 0; - //qDebug() << "UASVIEW update diff: " << MG::TIME::getGroundTimeNow() - lastupdate; + //// qDebug() << "UASVIEW update diff: " << MG::TIME::getGroundTimeNow() - lastupdate; lastupdate = MG::TIME::getGroundTimeNow(); // FIXME @@ -507,10 +507,10 @@ void UASView::refresh() if (generalUpdateCount == 4) { #if (QGC_EVENTLOOP_DEBUG) - qDebug() << "EVENTLOOP:" << __FILE__ << __LINE__; + // qDebug() << "EVENTLOOP:" << __FILE__ << __LINE__; #endif generalUpdateCount = 0; - //qDebug() << "UPDATING EVERYTHING"; + //// qDebug() << "UPDATING EVERYTHING"; // State m_ui->stateLabel->setText(state); m_ui->statusTextLabel->setText(stateDesc);