Merge branch 'master' of github.com:w-mj/DataStructureProject

car.cpp

@@ -98,7 +98,8 @@ void Car::setPath(Path *path)
     m_target.point = m_target.point - QPoint(20, 30);
     m_current = m_target;
     m_target.action = Road::none;
-    this->setPos(m_target.point);
+
+    this->setPos(m_target.point - 0.5*QPoint(M_WID, M_LEN));
     this->setRotation(m_target.dir+90);
 }
 
@@ -148,8 +149,8 @@ void Car::followPath()
         break;
     case Road::queueHead:
         Log::i("发送请求车位信号");
-        // emit queueHead(this);
-        emit back(this);
+        emit queueHead(this);
+        // emit back(this);
         break;
     case Road::none:
         break;