Changeset 62 in flair-src for trunk/tools/FlairGCS/src

Timestamp:

Aug 22, 2016, 4:33:24 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

correction bug destruction map

Location:

trunk/tools/FlairGCS/src

Files:

• Map.cpp (modified) (2 diffs)
• mapwidget.cpp (modified) (1 diff)
• mapwidget.h (modified) (1 diff)

trunk/tools/FlairGCS/src/Map.cpp

@@ -19 +19 @@
 #include <qendian.h>
 
+//todo: merge Map and mapwidget
+
 using namespace QtMobility;
 
@@ -90 +92 @@
 }
 
-Map::~Map() {}
+Map::~Map() {
+  for (int i = 0; i < points.count(); i++) delete points.at(i);
+  delete mapWidget;
+
+  if(geoMap!=0) delete geoMap;
+}
 
 bool Map::findServices(void) {

trunk/tools/FlairGCS/src/mapwidget.cpp

@@ -75 +75 @@
   landmarks = new QList<Landmark *>;
   landmarks_old = new QList<Landmark *>;
+}
+
+MapWidget::~MapWidget() {
+  m_scene->removeItem(geoMap);
+  delete m_scene;
 }
 

trunk/tools/FlairGCS/src/mapwidget.h

@@ -62 +62 @@
 public:
   MapWidget(Map *map, QWidget *parent = 0);
+  ~MapWidget();
   void setMap(QtMobility::QGraphicsGeoMap *geoMap);
   QGraphicsScene *scene() const;