GPS fixes, part 2: Fix compilation on Linux.

Logic tests not completed, sorry.
robot0x · Apr 21, 2018 · cb287b0 · cb287b0
1 parent 3c01674
commit cb287b0
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/core/StelLocationMgr.cpp b/src/core/StelLocationMgr.cpp
@@ -52,6 +52,7 @@ LibGPSLookupHelper::LibGPSLookupHelper(QObject *parent)
 	QString gpsdHostname=conf->value("gui/gpsd_hostname", "localhost").toString();
 	QString gpsdPort=conf->value("gui/gpsd_port", DEFAULT_GPSD_PORT).toString();
 
+	timer.setSingleShot(false);
 	// Example almost straight from http://www.catb.org/gpsd/client-howto.html
 	gps_rec = new gpsmm(gpsdHostname.toUtf8(), gpsdPort.toUtf8());
 	if(gps_rec->is_open())
@@ -83,12 +84,13 @@ void LibGPSLookupHelper::setPeriodicQuery(int interval)
 		timer.stop();
 	else
 		{
-			timer.setSingleShot(false);
 			timer.start(interval);
 		}
 }
 void LibGPSLookupHelper::query()
 {
+	bool verbose=StelApp::getInstance().property("verbose").toBool();
+
 	if(!ready)
 	{
 		emit queryError("GPSD helper not ready");
@@ -137,16 +139,19 @@ void LibGPSLookupHelper::query()
 			loc.longitude=newdata->fix.longitude;
 			loc.latitude=newdata->fix.latitude;
 			// Frequently hdop, vdop and satellite counts are NaN. Sometimes they show OK. This is minor issue.
-			if (fixmode<3)
+			if ((verbose) && (fixmode<3))
 			{
 				qDebug() << "GPSDfix " << fixmode << ": Location" << QString("lat %1, long %2, alt %3").arg(loc.latitude).arg(loc.longitude).arg(loc.altitude);
 				qDebug() << "    Estimated HDOP " << newdata->dop.hdop << "m from " << newdata->satellites_used << "(of" << newdata->satellites_visible  << "visible) satellites";
 			}
 			else
 			{
 				loc.altitude=newdata->fix.altitude;
-				qDebug() << "GPSDfix " << fixmode << ": Location" << QString("lat %1, long %2, alt %3").arg(loc.latitude).arg(loc.longitude).arg(loc.altitude);
-				qDebug() << "    Estimated HDOP " << newdata->dop.hdop << "m, VDOP " << newdata->dop.vdop <<  "m from " << newdata->satellites_used << "(of" << newdata->satellites_visible  << "visible) satellites";
+				if (verbose)
+				{
+					qDebug() << "GPSDfix " << fixmode << ": Location" << QString("lat %1, long %2, alt %3").arg(loc.latitude).arg(loc.longitude).arg(loc.altitude);
+					qDebug() << "    Estimated HDOP " << newdata->dop.hdop << "m, VDOP " << newdata->dop.vdop <<  "m from " << newdata->satellites_used << "(of" << newdata->satellites_visible  << "visible) satellites";
+				}
 				break; // escape from the tries loop
 			}
 		}
@@ -157,11 +162,12 @@ void LibGPSLookupHelper::query()
 		emit queryError("GPSD: Could not get valid position.");
 		return;
 	}
-	if (fixmode<3)
+	if ((verbose) && (fixmode<3))
 	{
 		qDebug() << "Fix only quality " << fixmode << " after " << tries << " tries";
 	}
-	qDebug() << "GPSD location" << QString("lat %1, long %2, alt %3").arg(loc.latitude).arg(loc.longitude).arg(loc.altitude);
+	if (verbose)
+		qDebug() << "GPSD location" << QString("lat %1, long %2, alt %3").arg(loc.latitude).arg(loc.longitude).arg(loc.altitude);
 
 	loc.bortleScaleIndex=StelLocation::DEFAULT_BORTLE_SCALE_INDEX;
 	// Usually you don't leave your time zone with GPS.