Camera: Cleanup

Author: HTRamsey

src/Camera/CameraMetaData.cc

@@ -37,5 +37,10 @@ CameraMetaData::CameraMetaData(const QString &canonicalName,
     , minTriggerInterval(minTriggerInterval)
     , deprecatedTranslatedName(deprecatedTranslatedName)
 {
-    // qCDebug(AudioOutputLog) << Q_FUNC_INFO << this;
+    qCDebug(CameraMetaDataLog) << this;
+}
+
+CameraMetaData::~CameraMetaData()
+{
+    qCDebug(CameraMetaDataLog) << this;
 }

src/Camera/CameraMetaData.h

@@ -43,6 +43,7 @@ class CameraMetaData
                    bool fixedOrientation,
                    double minTriggerInterval,
                    const QString &deprecatedTranslatedName);
+    ~CameraMetaData();
 
     const QString canonicalName;        ///< Canonical name saved in plan files. Not translated.
     const QString brand;                ///< Camera brand. Used for grouping.

src/Camera/MavlinkCameraControl.cc

@@ -8,33 +8,33 @@
  ****************************************************************************/
 
 #include "MavlinkCameraControl.h"
-#include "QmlObjectListModel.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(CameraControlLog, "CameraControlLog")
-QGC_LOGGING_CATEGORY(CameraControlVerboseLog, "CameraControlVerboseLog")
+QGC_LOGGING_CATEGORY(CameraControlLog, "qgc.camera.mavlinkcameracontrol")
+QGC_LOGGING_CATEGORY(CameraControlVerboseLog, "qgc.camera.mavlinkcameracontrol")
 
-MavlinkCameraControl::MavlinkCameraControl(QObject *parent)
+MavlinkCameraControl::MavlinkCameraControl(Vehicle *vehicle, QObject *parent)
     : FactGroup(0, parent, true /* ignore camel case */)
+    , _vehicle(vehicle)
 {
-    // qCDebug(CameraControlLog) << Q_FUNC_INFO << this;
+    qCDebug(CameraControlLog) << this;
 }
 
 MavlinkCameraControl::~MavlinkCameraControl()
 {
-    // qCDebug(CameraControlLog) << Q_FUNC_INFO << this;
+    qCDebug(CameraControlLog) << this;
 }
 
 QString MavlinkCameraControl::captureImageStatusToStr(uint8_t image_status)
 {
     switch (image_status) {
-        case 0:
+        case PHOTO_CAPTURE_IDLE:
             return QStringLiteral("Idle");
-        case 1:
+        case PHOTO_CAPTURE_IN_PROGRESS:
             return QStringLiteral("Capturing");
-        case 2:
+        case PHOTO_CAPTURE_INTERVAL_IDLE:
             return QStringLiteral("Idle: Interval set");
-        case 3:
+        case PHOTO_CAPTURE_INTERVAL_IN_PROGRESS:
             return QStringLiteral("Capturing: Interval set");
         default:
             return QStringLiteral("Unknown");
@@ -44,9 +44,9 @@ QString MavlinkCameraControl::captureImageStatusToStr(uint8_t image_status)
 QString MavlinkCameraControl::captureVideoStatusToStr(uint8_t video_status)
 {
     switch (video_status) {
-        case 0:
+        case VIDEO_CAPTURE_STATUS_STOPPED:
             return QStringLiteral("Idle");
-        case 1:
+        case VIDEO_CAPTURE_STATUS_RUNNING:
             return QStringLiteral("Capturing");
         default:
             return QStringLiteral("Unknown");
@@ -72,10 +72,15 @@ QString MavlinkCameraControl::storageStatusToStr(uint8_t status)
 QString MavlinkCameraControl::cameraModeToStr(CameraMode mode)
 {
     switch (mode) {
-        case CAM_MODE_UNDEFINED:    return QStringLiteral("CAM_MODE_UNDEFINED");
-        case CAM_MODE_PHOTO:        return QStringLiteral("CAM_MODE_PHOTO");
-        case CAM_MODE_VIDEO:        return QStringLiteral("CAM_MODE_VIDEO");
-        case CAM_MODE_SURVEY:       return QStringLiteral("CAM_MODE_SURVEY");
-        default:                    return QStringLiteral("Unknown");
+        case CAM_MODE_UNDEFINED:
+            return QStringLiteral("CAM_MODE_UNDEFINED");
+        case CAM_MODE_PHOTO:
+            return QStringLiteral("CAM_MODE_PHOTO");
+        case CAM_MODE_VIDEO:
+            return QStringLiteral("CAM_MODE_VIDEO");
+        case CAM_MODE_SURVEY:
+            return QStringLiteral("CAM_MODE_SURVEY");
+        default:
+            return QStringLiteral("Unknown");
     }
 }