Task/carlos cleaning map

DroneTrackingPanel.qml

@@ -2,6 +2,8 @@ import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
 import "qrc:/gcsStyle" as GcsStyle
+import "./components"
+import "./components" as Components
 
 /*
   Welcome to the wild west....
@@ -277,6 +279,7 @@ Rectangle {
                         }
 
                         ColumnLayout {
+                            Layout.fillWidth: true
                             Layout.alignment: Qt.AlignLeft
                             Layout.leftMargin: GcsStyle.PanelStyle.defaultMargin
                             spacing: 2
@@ -285,6 +288,8 @@ Rectangle {
                                 text: modelData.name
                                 color: GcsStyle.PanelStyle.textPrimaryColor
                                 font.pixelSize: GcsStyle.PanelStyle.fontSizeMedium
+                                Layout.fillWidth: true
+                                elide: Text.ElideRight
                                 font.family: GcsStyle.PanelStyle.fontFamily
                             }
                             Text {
@@ -295,7 +300,7 @@ Rectangle {
                                 font.family: GcsStyle.PanelStyle.fontFamily
                             }
                         }
-
+                        
                         Item { Layout.fillWidth: true } // spacer to push 
                                                 // items to right and column layout to left
 

MapController.cpp

@@ -14,65 +14,8 @@ MapController::MapController(QObject *parent)
     : QObject(parent), m_currentMapType(0), m_supportedMapTypesCount(3)
 {
 
-    // Populate with dummy drone objects for testing icon markers using setLattitude and setLongitude
-    DroneClass* drone1 = new DroneClass(this);
-    drone1->setName("Drone 1");
-    drone1->setLatitude(34.059174611493965);
-    drone1->setLongitude(-117.82051240067321);
-    addDrone(drone1);
-
-    DroneClass* drone2 = new DroneClass(this);
-    drone2->setName("Drone 2");
-    drone2->setLatitude(34.0600);
-    drone2->setLongitude(-117.8210);
-    addDrone(drone2);
-
-    DroneClass* drone3 = new DroneClass(this);
-    drone3->setName("Drone 3");
-    drone3->setLatitude(34.0615);
-    drone3->setLongitude(-117.8225);
-    addDrone(drone3);
-
-    DroneClass* drone4 = new DroneClass(this);
-    drone4->setName("Drone 4");
-    drone4->setLatitude(37.7749);
-    drone4->setLongitude(-122.4194);
-    addDrone(drone4);
-
-    DroneClass* drone5 = new DroneClass(this);
-    drone5->setName("Drone 5");
-    drone5->setLatitude(34.0119);
-    drone5->setLongitude(-118.4916);
-    addDrone(drone5);
 }
 
-void MapController::addDrone(DroneClass* drone)
-{
-    if (drone) {
-        m_drones.append(drone);
-    }
-}
-
-QVariantList MapController::getAllDrones() const
-{
-    QVariantList droneList;
-    for (const DroneClass* drone : m_drones) {
-        QVariantMap droneData;
-        droneData["name"] = drone->getName();
-        droneData["latitude"] = drone->getLatitude();
-        droneData["longitude"] = drone->getLongitude();
-        droneList.append(droneData);
-    }
-    return droneList;
-}
-
-void MapController::createDrone(const QString &input_name){
-    DroneClass* temp = new DroneClass(this);
-    temp->setName(input_name);
-    temp->setLatitude(34.06152);
-    temp->setLongitude(-117.82254);
-    addDrone(temp);
-}
 
 void MapController::setCenterPosition(const QVariant &lat, const QVariant &lon)
 {

MapController.h

@@ -25,17 +25,12 @@ class MapController : public QObject
 
 public:
     explicit MapController(QObject *parent = nullptr);
-    // Q_INVOKABLE void debugPrintDrones() const;
-    Q_INVOKABLE void createDrone(const QString &input_name);
-
 
 public slots:
     void setCenterPosition(const QVariant &lat, const QVariant &lon);
     void setLocationMarking(const QVariant &lat, const QVariant &lon);
     void changeMapType(int typeIndex);
     void setZoomLevel(double level);
-    Q_INVOKABLE void addDrone(DroneClass* drone);
-    Q_INVOKABLE QVariantList getAllDrones() const;
 signals:
     void centerPositionChanged(const QVariant &lat, const QVariant &lon);
     void locationMarked(const QVariant &lat, const QVariant &lon);
@@ -52,4 +47,4 @@ public slots:
 
     void updateCenter(const QPair<double, double> &center);
     void addMarker(const QPair<double, double> &position);
-};
+};

QtMap.qrc

@@ -8,10 +8,8 @@
         <file>DroneTrackingPanel.qml</file>
         <file>DroneMenuBar.qml</file>
         <file>manageDroneWindow.qml</file>
-        <file>armWindow.qml</file>
         <file>coordinateNavigationWindow.qml</file>
         <file>goHomeLandingWindow.qml</file>
-        <file>takeOffWindow.qml</file>
         <file>DroneLabelComponent.qml</file>
         <file>TelemetryPanel.qml</file>
         <file>components/MenuButton.qml</file>
@@ -46,4 +44,4 @@
         <file>panelStyle.qml</file>
         <file>qmldir</file>
     </qresource>
-</RCC>
+</RCC>