修正临时点和背景图片内存泄漏问题，修正GPS临时点算法，处理触摸缩放问题还是不杂写，先放着几天

Geometry.cpp

@@ -103,6 +103,13 @@ int Geometry::getLabelPixeSize()
     return lb.fontMetrics().width(label);
 }
 
+void Geometry::setTempColor(QColor c)
+{
+    brush = c;
+    pen = c;
+    update();
+}
+
 void Geometry::checkRect()
 {
     if(list.size() == 0)

Geometry.h

@@ -81,6 +81,7 @@ class UMAPCONTROLSHARED_EXPORT Geometry : public QGraphicsObject
     void setLabel(QString lb);
     QString getLabel();
     int getLabelPixeSize();
+    void setTempColor(QColor c);
 protected:
     void checkRect();
     QList<QPointF> list;

Manager.cpp

@@ -1,7 +1,8 @@
 #include "Manager.h"
 
-Manager::Manager(UMapControl *iL, QObject *parent) : QObject(parent),uMap(iL),sqlExcute(&iL->sqlExcute)
+Manager::Manager(UMapControl *iL, QObject *parent) : QObject(parent),uMap(iL),sqlExcute(&iL->sqlExcute),tempGeo(0)
 {
+    qsrand(QDateTime::currentDateTime().time().second());
     QSqlQuery * query = sqlExcute->initLayerManager();
     while(query->next())
     {
@@ -88,38 +89,38 @@ void Manager::stopUpdateLayer()
 
 void Manager::addTempItem(QPointF world, UM::GeoType type)
 {
-    if(tempGeo)
-        uMap->scene()->removeItem(tempGeo);
-    qsrand(QDateTime::currentDateTime().time().second());
-    tempGeoType = type;
-    tempGeoWorldPos = world;
     QColor pen = QColor(qrand()%255,qrand()%255,qrand()%255);
-    switch (tempGeoType) {
-    case UM::iGeoCircle:
-        tempGeo = new GeoCircle(tempGeoWorldPos,40,pen,pen);
-        break;
-    case UM::iGeoRect:
-        tempGeo = new GeoRect(tempGeoWorldPos,40,pen,pen);
-        break;
-    case UM::iGeoPie:
-        tempGeo = new GeoPie(tempGeoWorldPos,80,0,pen,pen);
-        break;
-    case UM::iGeoStar:
-        tempGeo = new GeoStar(tempGeoWorldPos,40,pen,pen);
-        break;
-    case UM::iGeoTri:
-        tempGeo = new GeoTri(tempGeoWorldPos,40,pen,pen);
-        break;
-    default:
-        break;
-    }
-    if(tempGeo)
+    if(!tempGeo)
     {
-        tempGeo->setPos(uMap->worldToScene(tempGeoWorldPos));
+        switch (type) {
+        case UM::iGeoCircle:
+            tempGeo = new GeoCircle(world,40,pen,pen);
+            break;
+        case UM::iGeoRect:
+            tempGeo = new GeoRect(world,40,pen,pen);
+            break;
+        case UM::iGeoPie:
+            tempGeo = new GeoPie(world,80,0,pen,pen);
+            break;
+        case UM::iGeoStar:
+            tempGeo = new GeoStar(world,40,pen,pen);
+            break;
+        case UM::iGeoTri:
+            tempGeo = new GeoTri(world,40,pen,pen);
+            break;
+        default:
+            break;
+        }
+        tempGeo->setPos(uMap->worldToScene(world));
         tempGeo->setScale(uMap->itemScale);
         tempGeo->setZValue(3);
         emit addGeoToScene(tempGeo);
     }
+    else
+    {
+        tempGeo->setTempColor(pen);
+        tempGeo->setPos(uMap->worldToScene(world));
+    }
 }
 
 bool Manager::moveLayer(QString name, bool up)
@@ -143,9 +144,13 @@ bool Manager::moveLayer(QString name, bool up)
     return true;
 }
 
-void Manager::updatLayer()
+void Manager::resetTempGeo()
 {
     tempGeo = nullptr;
+}
+
+void Manager::updatLayer()
+{
     isUpdate = true;
     for(int i=0; i<list.size() && isUpdate; i++)
     {
@@ -154,7 +159,6 @@ void Manager::updatLayer()
             list.at(i)->updatLayer(&isUpdate);
         }
     }
-    addTempItem(tempGeoWorldPos,tempGeoType);
     this->thread()->exit();
 }
 

Manager.h

@@ -74,6 +74,7 @@ class UMAPCONTROLSHARED_EXPORT Manager : public QObject
     void stopUpdateLayer();
     void addTempItem(QPointF world, UM::GeoType type = UM::iGeoCircle);
     bool moveLayer(QString name, bool up = true);
+    void resetTempGeo();
 private:
     /*
      * 检查图层名称@name是否在图层管理表里,如果有,就自动在@name后面加*号,暂时这样处理导入多个同名图层
@@ -90,9 +91,6 @@ class UMAPCONTROLSHARED_EXPORT Manager : public QObject
     QList<Layer *> list;
     SQLExcute * sqlExcute;
     bool isUpdate;
-
-    QPointF tempGeoWorldPos;
-    UM::GeoType tempGeoType;
     Geometry * tempGeo;
 signals:
     void addGeoToScene(Geometry *);

UMapControl.cpp

@@ -589,12 +589,14 @@ void UMapControl::tilesUrlMatrix(bool onlyBackground)
             if(l.at(i)->zValue() == 0)
             {
                 scene()->removeItem(l.at(i));
+                delete l.at(i);
             }
         }
     }
     else
     {
         scene()->clear();
+        manager->resetTempGeo();
     }
     /*
      * 再从数据库里读取当前场景有效的瓦片,如果读取失败,直接把@tList里的所有坐标生成path保存到@list里,