From a444862925bf47a641f8a0ca682505f56fe9df81 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Sat, 1 Feb 2020 16:24:30 -0500 Subject: [PATCH] Remove dead file --- qgroundcontrol.pro | 1 - src/MG.h | 305 ----------------------------------------- src/comm/SerialLink.cc | 1 - 3 files changed, 307 deletions(-) delete mode 100644 src/MG.h diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 4048ce939..4b6d3db54 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -587,7 +587,6 @@ HEADERS += \ src/JsonHelper.h \ src/KMLFileHelper.h \ src/LogCompressor.h \ - src/MG.h \ src/MissionManager/CameraCalc.h \ src/MissionManager/CameraSection.h \ src/MissionManager/CameraSpec.h \ diff --git a/src/MG.h b/src/MG.h deleted file mode 100644 index 6037c4efa..000000000 --- a/src/MG.h +++ /dev/null @@ -1,305 +0,0 @@ -/**************************************************************************** - * - * (c) 2009-2020 QGROUNDCONTROL PROJECT - * - * QGroundControl is licensed according to the terms in the file - * COPYING.md in the root of the source code directory. - * - ****************************************************************************/ - - -/** - * @file - * @brief Helper functions - * - * @author Lorenz Meier - * - */ - - -#ifndef _MG_H_ -#define _MG_H_ - -#include -#include -#include -#include -#include - -namespace MG -{ -const static int MAX_FLIGHT_TIME = 60 * 60 * 24 * 21; - -class VERSION -{ -public: - - static const int MAJOR = 1; - static const int MINOR = 01; -}; - -class SYSTEM -{ -public: - - static const int ID = 127; - static const int COMPID = 0; - static int getID() { - return SYSTEM::ID; - } -}; - -class UNITS -{ -public: - - /** The distance units supported for display by the groundstation **/ - enum DistanceUnit { - METER, - CENTIMETER, - MILLIMETER, - INCH, - FEET, - MILE - }; - - /** - * @brief Convert a distance in meters into another distance unit system - * - * @param in The distance to convert - * @param newUnit The new unit to convert to - * - * @return The converted distance - */ - static double convertFromMeter(double in, DistanceUnit newUnit) { - double result = in; - - // Conversion table in meter - static const double inInch = 39.3700787; - static const double inFeet = 3.2808399; - static const double inMile = 0.000000621371192; - static const double inCentimeter = 100; - static const double inMillimeter = 1000; - - switch (newUnit) { - case METER: - result = in; - break; - case CENTIMETER: - result = in * inCentimeter; - break; - case MILLIMETER: - result = in * inMillimeter; - break; - case INCH: - result = in * inInch; - break; - case FEET: - result = in * inFeet; - break; - case MILE: - result = in * inMile; - break; - } - - return result; - } - - /** - * @brief Convert between two distance units - * - * This convenience function allows to convert between arbitrary distance units - * - * @param in The input distance - * @param inputUnit The input unit - * @param outputUnit The output unit - * - * @return The converted distance - */ - static double convert(double in, DistanceUnit inputUnit, DistanceUnit outputUnit) { - double meters = convertToMeter(in, inputUnit); - return convertFromMeter(meters, outputUnit); - } - - /** - * @brief Convert a distance to the meter unit - * - * @param in The distance to convert - * @param inputUnit The unit the distance is represented in - * - * @return The converted distance - */ - static double convertToMeter(double in, DistanceUnit inputUnit) { - - double result = in; - - - // Conversion table in meter - static const double inInch = 39.3700787; - static const double inFeet = 3.2808399; - static const double inMile = 0.000000621371192; - static const double inCentimeter = 100; - static const double inMillimeter = 1000; - - // Don't convert if new unit is same unit - - switch (inputUnit) { - case METER: - result = in; - break; - case CENTIMETER: - result = in / inCentimeter; - break; - case MILLIMETER: - result = in / inMillimeter; - break; - case INCH: - result = in / inInch; - break; - case FEET: - result = in / inFeet; - break; - case MILE: - result = in / inMile; - break; - } - - return result; - } - -}; - -class DISPLAY -{ - -public: - - DISPLAY() { - // Initialize static class display with notebook display default value - //pixelSize = 0.224f; - //setPixelSize(0.224f); - } - - ~DISPLAY() { - - } - - /** - * @brief Get the size of a single pixel - * - * This value can be used to generate user interfaces with - * a size in physical units, for example a gauge which is - * always 50.8 mm (2") in diameter, regardless of the screen. - * - * @return The horizontal and vertical size of a pixel-square - */ - static double getPixelSize() { - return 0.224f; - } - - /** - * @brief Set the size of a single pixel - * - * @param size The horizontal and vertical size of a pixel-square - */ - static void setPixelSize(double size) { - pixelSize = size; - } - - /** - * @brief Set the size of a single pixel - * - * This method calculates the pixel size from the vertical and horizontal - * resolution and the screen diameter. The diameter is in mm (as this unit - * is a SI unit). One inch = 25.4 mm - * - * @param horizontalResolution The horizontal screen resolution, e.g. 1280. - * @param verticalResolution The vertical screen resolution, e.g. 800. - * @param screenDiameter The screen diameter in mm, e.g. 13.3" = 338 mm. - */ - static void setPixelSize(int horizontalResolution, int verticalResolution, double screenDiameter) { - pixelSize = screenDiameter / sqrt(static_cast(horizontalResolution*horizontalResolution + verticalResolution*verticalResolution)); - } - -private: - /** The size of a single pixel **/ - static double pixelSize; -}; - -class STAT -{ - /** The time interval for the last few moments in milliseconds **/ - static const int SHORT_TERM_INTERVAL = 300; - /** The time interval for the last moment in milliseconds **/ - static const int CURRENT_INTERVAL = 50; -}; - -class TIME -{ - -public: - - //static const QString ICONDIR = "./icons"; - - /** - * @brief Convenience method to get the milliseconds time stamp for now - * - * The timestamp is created at the instant of calling this method. It is - * defined as the number of milliseconds since unix epoch, which is - * 1.1.1970, 00:00 UTC. - * - * @return The number of milliseconds elapsed since unix epoch - * @deprecated Will the replaced by time helper class - **/ - static quint64 getGroundTimeNow() { - QDateTime time = QDateTime::currentDateTime(); - time = time.toUTC(); - /* Return seconds and milliseconds, in milliseconds unit */ - quint64 milliseconds = time.toTime_t() * static_cast(1000); - return static_cast(milliseconds + time.time().msec()); - } - - /** - * @brief Convenience method to get the milliseconds time stamp for now - * - * The timestamp is created at the instant of calling this method. It is - * defined as the number of milliseconds since unix epoch, which is - * 1.1.1970, 00:00 UTC. - * - * @return The number of milliseconds elapsed since unix epoch - * @deprecated Will the replaced by time helper class - **/ - static quint64 getGroundTimeNowUsecs() { - QDateTime time = QDateTime::currentDateTime(); - time = time.toUTC(); - /* Return seconds and milliseconds, in milliseconds unit */ - quint64 microseconds = time.toTime_t() * static_cast(1000000); - return static_cast(microseconds + (time.time().msec()*1000)); - } - - /*tatic quint64 getMissionTimeUsecs() - { - ; - }*/ - - /** - * Convert milliseconds to an QDateTime object. This method converts the amount of - * milliseconds since 1.1.1970, 00:00 UTC (unix epoch) to a QDateTime date object. - * - * @param msecs The milliseconds since unix epoch (in Qt unsigned 64bit integer type quint64) - * @return The QDateTime object set to corresponding date and time - * @deprecated Will the replaced by time helper class - **/ - static QDateTime msecToQDateTime(quint64 msecs) { - QDateTime time = QDateTime(); - /* Set date and time depending on the seconds since unix epoch, - * integer division truncates the milliseconds */ - time.setTime_t(msecs / 1000); - /* Add the milliseconds, modulo returns the milliseconds part */ - return time.addMSecs(msecs % 1000); - } - -}; -} - -#endif // _MG_H_ diff --git a/src/comm/SerialLink.cc b/src/comm/SerialLink.cc index 72d70b75f..dfc923d96 100644 --- a/src/comm/SerialLink.cc +++ b/src/comm/SerialLink.cc @@ -21,7 +21,6 @@ #include "SerialLink.h" #include "QGC.h" -#include "MG.h" #include "QGCLoggingCategory.h" #include "QGCApplication.h" #include "QGCSerialPortInfo.h" -- 2.22.0