From ff662f21ad08fe4d205ab0cb24c00e6894a90c45 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 26 Apr 2014 16:09:34 +0200
Subject: [PATCH] refs #212, adjusted samples

---
 .../blackmiscquantities/samplesaviation.cpp   | 28 ++++++++++---------
 samples/blackmiscquantities/samplesaviation.h | 21 ++++++--------
 .../samplesphysicalquantities.cpp             |  6 ++--
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/samples/blackmiscquantities/samplesaviation.cpp b/samples/blackmiscquantities/samplesaviation.cpp
index 8e2741963..45a75d049 100644
--- a/samples/blackmiscquantities/samplesaviation.cpp
+++ b/samples/blackmiscquantities/samplesaviation.cpp
@@ -10,6 +10,10 @@
 #include "blackmisc/avionavsystem.h"
 #include "blackmisc/aviotransponder.h"
 #include "blackmisc/avatcstationlist.h"
+#include "blackmisc/avflightplan.h"
+#include "blackmisc/avaircrafticao.h"
+#include "blackmisc/avairporticao.h"
+
 
 #include <QDebug>
 
@@ -38,17 +42,6 @@ namespace BlackMiscTest
         qDebug() << c1;
         c1.setActiveUnicom();
         qDebug() << c1;
-        try
-        {
-            // uncomment to test assert
-            // CFrequency f1(-1.0, CFrequencyUnit::MHz());
-            // c1 = CComSystem("ups", f1, f1);
-            // qDebug() << "Why do I get here??";
-        }
-        catch (std::range_error &ex)
-        {
-            qDebug() << "As expected" << ex.what();
-        }
 
         // NAV system
         CNavSystem nav1;
@@ -92,9 +85,18 @@ namespace BlackMiscTest
         atcList = atcList.findBy(&CAtcStation::getCallsign, "eddm_twr", &CAtcStation::getFrequency, CFrequency(118.7, CFrequencyUnit::MHz()));
         atcList = atcList.sortedBy(&CAtcStation::getBookedFromUtc, &CAtcStation::getCallsign, &CAtcStation::getControllerRealName);
         qDebug() << atcList;
-
         qDebug() << "-----------------------------------------------";
+
+        // flight plan
+        CAltitude alt("FL110");
+        CAltitude altMsl(alt);
+        altMsl.toMeanSeaLevel();
+
+        qDebug() << alt << altMsl;
+        CAirportIcao frankfurt("eddf");
+        qDebug() << frankfurt;
+        qDebug() << "-----------------------------------------------";
+
         return 0;
     }
-
 } // namespace
diff --git a/samples/blackmiscquantities/samplesaviation.h b/samples/blackmiscquantities/samplesaviation.h
index a02e5f0f6..56aca0c82 100644
--- a/samples/blackmiscquantities/samplesaviation.h
+++ b/samples/blackmiscquantities/samplesaviation.h
@@ -6,19 +6,16 @@
 #ifndef BLACKMISCTEST_SAMPLESAVIATION_H
 #define BLACKMISCTEST_SAMPLESAVIATION_H
 
-namespace BlackMiscTest {
-
-/*!
- * \brief Samples for physical quantities
- */
-class CSamplesAviation
+namespace BlackMiscTest
 {
-public:
-    /*!
-     * \brief Run the samples
-     */
-    static int samples();
-};
+
+//! Samples for aviation
+    class CSamplesAviation
+    {
+    public:
+        //! Run the samples
+        static int samples();
+    };
 } // namespace
 
 #endif
diff --git a/samples/blackmiscquantities/samplesphysicalquantities.cpp b/samples/blackmiscquantities/samplesphysicalquantities.cpp
index 6a73ed3b1..ea942d3c4 100644
--- a/samples/blackmiscquantities/samplesphysicalquantities.cpp
+++ b/samples/blackmiscquantities/samplesphysicalquantities.cpp
@@ -15,9 +15,9 @@ namespace BlackMiscTest
      */
     int CSamplesPhysicalQuantities::samples()
     {
-        QVariant parsedPq = CPqString::parse("100 km/h");
-        parsedPq = CPqString::parse("-33ft");
-        parsedPq = CPqString::parse("666");
+        QVariant parsedPq = CPqString::parseToVariant("100 km/h");
+        parsedPq = CPqString::parseToVariant("-33ft");
+        parsedPq = CPqString::parseToVariant("666");
         CSpeed speedParsed = CPqString::parse<CSpeed>("111.33ft/s");
         CFrequency frequencyParsed = CPqString::parse<CFrequency>("122.8MHz");
         qDebug() << "parsed" << speedParsed << speedParsed.valueRoundedWithUnit(2, true) << frequencyParsed << frequencyParsed.valueRoundedWithUnit(2, true);