Clean-up

Added QT_DEPRECATED makro to deprecated functions

Added Setting for Flight Time Format

Migrated ACalc::minutesToString to ATime::minutesToString

src/classes/aflightentry.cpp

@@ -18,6 +18,8 @@
 #include "aflightentry.h"
 #include "src/database/adatabase.h"
 #include "src/oplconstants.h"
+#include "src/functions/atime.h"
+#include "src/classes/asettings.h"
 
 AFlightEntry::AFlightEntry()
     : AEntry::AEntry(DEFAULT_FLIGHT_POSITION)
@@ -37,11 +39,18 @@ const QString AFlightEntry::summary()
         return QString();
 
     QString flight_summary;
-    flight_summary.append(tableData.value(opl::db::FLIGHTS_DOFT).toString() + " ");
-    flight_summary.append(tableData.value(opl::db::FLIGHTS_DEPT).toString() + " ");
-    flight_summary.append(ACalc::minutesToString(tableData.value(opl::db::FLIGHTS_TOFB).toString()) + " ");
-    flight_summary.append(ACalc::minutesToString(tableData.value(opl::db::FLIGHTS_TONB).toString()) + " ");
-    flight_summary.append(tableData.value(opl::db::FLIGHTS_DEST).toString() + " ");
+    auto space = QStringLiteral(" ");
+    flight_summary.append(tableData.value(opl::db::FLIGHTS_DOFT).toString() + space);
+    flight_summary.append(tableData.value(opl::db::FLIGHTS_DEPT).toString() + space);
+    flight_summary.append(ATime::minutesToString(
+                              tableData.value(opl::db::FLIGHTS_TOFB).toInt(),
+                              opl::time::Default)
+                          + space);
+    flight_summary.append(ATime::minutesToString(
+                              tableData.value(opl::db::FLIGHTS_TONB).toInt(),
+                              opl::time::Default)
+                          + space);
+    flight_summary.append(tableData.value(opl::db::FLIGHTS_DEST).toString());
 
     return flight_summary;
 }

src/classes/aflightentry.h

@@ -19,7 +19,6 @@
 #define AFLIGHTENTRY_H
 
 #include "src/classes/aentry.h"
-#include "src/functions/acalc.h"
 
 class AFlightEntry : public AEntry {
 public:

src/classes/asettings.cpp

@@ -48,6 +48,7 @@ QMap<ASettings::FlightLogging, QString> ASettings::flightLoggingMap = {
     {FlightLogging::PilotFlying,        QStringLiteral("pilotFlying")},
     {FlightLogging::NightAngle,         QStringLiteral("nightangle")},
     {FlightLogging::Rules,              QStringLiteral("rules")},
+    {FlightLogging::FlightTimeFormat,   QStringLiteral("flightTimeFormat")}
 };
 
 QMap<ASettings::Setup, QString> ASettings::setupMap = {

src/classes/asettings.h

@@ -58,6 +58,7 @@ public:
         PilotFlying,
         NightAngle,
         Rules,
+        FlightTimeFormat
     };
 
     enum class NewFlight {

src/functions/acalc.cpp

@@ -12,12 +12,10 @@ using namespace ACalc;
  * input as hh:mm, h:mm, hhmm or hmm.
  * \param userinput from a QLineEdit
  * \return formatted QString "hh:mm" or Empty String
- *
+ */
+QT_DEPRECATED
 QString ACalc::formatTimeInput(QString user_input)
 {
-    DEB << "#######################################";
-    DEB << "# WARNING: USE OF DEPRECATED FUNCTION #";
-    DEB << "#######################################";
     QString output; //
     QTime temp_time; //empty time object is invalid by default
 
@@ -42,7 +40,7 @@ QString ACalc::formatTimeInput(QString user_input)
         DEB << "Time input is invalid.";
     }
     return output;
-}*/
+}
 
 /*!
  * The purpose of the following functions is to provide functionality enabling the Calculation of

src/functions/acalc.h

@@ -22,12 +22,9 @@ namespace ACalc {
  * \param tonb QTime Time On Blocks
  * \return Block Time in minutes
  */
+QT_DEPRECATED
 inline QTime blocktime(QTime tofb, QTime tonb)
 {
-    DEB << "#######################################";
-    DEB << "# WARNING: USE OF DEPRECATED FUNCTION #";
-    DEB << "#######################################";
-
     QTime blocktime_out(0, 0); // initialise return value at midnight
 
     if (tonb > tofb) { // landing same day
@@ -47,11 +44,9 @@ inline QTime blocktime(QTime tofb, QTime tonb)
  * \param blockminutes from database
  * \return String hh:mm
  */
+QT_DEPRECATED
 inline QString minutesToString(QString block_minutes)
 {
-    DEB << "#######################################";
-    DEB << "# WARNING: USE OF DEPRECATED FUNCTION #";
-    DEB << "#######################################";
     int minutes = block_minutes.toInt();
     QString hour = QString::number(minutes / 60);
     if (hour.size() < 2) {
@@ -65,11 +60,9 @@ inline QString minutesToString(QString block_minutes)
     return block_time;
 };
 
+QT_DEPRECATED
 inline QString minutesToString(int block_minutes)
 {
-    DEB << "#######################################";
-    DEB << "# WARNING: USE OF DEPRECATED FUNCTION #";
-    DEB << "#######################################";
     QString hour = QString::number(block_minutes / 60);
     if (hour.size() < 2) {
         hour.prepend("0");
@@ -87,11 +80,9 @@ inline QString minutesToString(int block_minutes)
  * \param time QTime
  * \return int time as number of minutes
  */
+QT_DEPRECATED
 inline int QTimeToMinutes(QTime time)
 {
-    DEB << "#######################################";
-    DEB << "# WARNING: USE OF DEPRECATED FUNCTION #";
-    DEB << "#######################################";
     QString timestring = time.toString("hh:mm");
     int minutes = (timestring.left(2).toInt()) * 60;
     minutes += timestring.right(2).toInt();
@@ -103,11 +94,9 @@ inline int QTimeToMinutes(QTime time)
  * \param timestring "hh:mm"
  * \return String number of minutes
  */
+QT_DEPRECATED
 inline int stringToMinutes(QString timestring)
 {
-    DEB << "#######################################";
-    DEB << "# WARNING: USE OF DEPRECATED FUNCTION #";
-    DEB << "#######################################";
     int minutes = (timestring.left(2).toInt()) * 60;
     minutes += timestring.right(2).toInt();
     timestring = QString::number(minutes);

src/functions/adatetime.h

@@ -15,7 +15,8 @@ inline const QString toString (const QDateTime date_time, opl::datetime::DateTim
         return date_time.toString(Qt::ISODate);
     case opl::datetime::Backup:
         return date_time.toString(QStringLiteral("yyyy_MM_dd_T_hh_mm"));
-        break;
+    default:
+        return QString();
     }
 }
 

src/functions/atime.h

@@ -8,6 +8,9 @@
 
 namespace ATime {
 
+/*!
+ * \brief Converts a QTime to a String to be used in the UI
+ */
 inline const QString toString(const QTime &time, opl::time::FlightTimeFormat format)
 {
     switch (format) {
@@ -22,6 +25,37 @@ inline const QString toString(const QTime &time, opl::time::FlightTimeFormat for
     }
 }
 
+/*!
+ * \brief Converts an integer of minutes as received from the Datbase to a String
+ */
+inline const QString minutesToString(int minutes_in, opl::time::FlightTimeFormat format)
+{
+    DEB << "Hallo";
+    switch (format) {
+    case opl::time::Default:
+    {
+        QString hour = QString::number(minutes_in / 60);
+        if (hour.size() < 2) {
+            hour.prepend(QStringLiteral("0"));
+        }
+        QString minute = QString::number(minutes_in % 60);
+        if (minute.size() < 2) {
+            minute.prepend(QStringLiteral("0"));
+        }
+        return hour + ':' + minute;
+    }
+    case opl::time::Decimal:
+    {
+        int hour = minutes_in / 60;
+        double minute = (minutes_in % 60) / 60.0;
+        return QString::number(hour+minute);
+    }
+    default:
+        return QString();
+    }
+
+}
+
 inline double toDecimalHours(const QTime &time){
     return (time.hour() * 60 + time.minute()) / 60.0;
 }

src/gui/dialogues/firstrundialog.cpp

@@ -97,6 +97,7 @@ bool FirstRunDialog::finish()
     ASettings::write(ASettings::FlightLogging::NumberLandings, 1);
     ASettings::write(ASettings::FlightLogging::PopupCalendar, true);
     ASettings::write(ASettings::FlightLogging::PilotFlying, true);
+    ASettings::write(ASettings::FlightLogging::FlightTimeFormat, opl::time::Default);
 
     QMap<QString, QVariant> data;
     ASettings::write(ASettings::UserData::DisplaySelfAs, ui->aliasComboBox->currentIndex());

src/gui/dialogues/newflightdialog.cpp

@@ -24,7 +24,6 @@
 #include "src/database/adatabase.h"
 #include "src/oplconstants.h"
 
-
 #include "src/testing/adebug.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -173,7 +172,12 @@ void NewFlightDialog::readSettings()
     ui->FlightNumberLineEdit->setText(ASettings::read(ASettings::FlightLogging::FlightNumberPrefix).toString());
     ui->calendarCheckBox->setChecked(ASettings::read(ASettings::FlightLogging::PopupCalendar).toBool());
 
-    flightTimeFormat = opl::time::Default; // No support for Decimal Time implemented yet.
+    // Debug
+    ASettings::write(ASettings::FlightLogging::FlightTimeFormat, opl::time::Default);
+    //[F]: Support for Decimal Logging is not implemented yet.
+    flightTimeFormat = static_cast<opl::time::FlightTimeFormat>(
+                ASettings::read(ASettings::FlightLogging::FlightTimeFormat).toInt());
+
 
 }
 

src/gui/widgets/debugwidget.cpp

@@ -166,13 +166,7 @@ void DebugWidget::on_importCsvPushButton_clicked()
 
 void DebugWidget::on_debugPushButton_clicked()
 {
-    // space for debugging
-    QTime test(1,15,0);
-
-    DEB << "Qtime: " << test.toString(QStringLiteral("hh:mm"));
-
-    DEB << "ATime from String: " << ATime::fromString("12:45",opl::time::Default);
-    DEB << "ATime from String: " << ATime::fromString("12.75", opl::time::Decimal);
+    // debug space
 }
 
 /* //Comparing two functions template