Trik Studio 3D Visualization

plugins/robots/common/twoDModel/include/twoDModel/engine/model/robotModel.h

@@ -118,7 +118,7 @@ class TWO_D_MODEL_EXPORT RobotModel : public QObject
 
 	bool isRiding() const;
 
-	void serialize(QDomElement &parent) const;
+	QDomElement serialize(QDomElement &parent) const;
 	void serializeWorldModel(QDomElement &parent) const;
 	void deserialize(const QDomElement &robotElement);
 	void deserializeWorldModel(const QDomElement &world);

plugins/robots/common/twoDModel/src/engine/model/robotModel.cpp

@@ -427,23 +427,19 @@ bool RobotModel::onTheGround() const
 	return mIsOnTheGround;
 }
 
-void RobotModel::serialize(QDomElement &parent) const
-{
-	QDomElement curRobot = parent.ownerDocument().createElement("robot");
-	curRobot.setAttribute("id", mRobotModel.robotId());	
-	mSensorsConfiguration.serialize(curRobot);
-	serializeWheels(curRobot);
-
-	bool replaced = false;
-	for (QDomElement robot = parent.firstChildElement("robot"); !robot.isNull()
-			; robot = robot.nextSiblingElement("robot")) {
-		if (robot.attribute("id") == mRobotModel.robotId()) {
-			parent.replaceChild(curRobot, robot);
-			replaced = true;
-			break;
-		}
-	}
-	if (!replaced) parent.appendChild(curRobot);
+QDomElement RobotModel::serialize(QDomElement &parent) const
+{
+	QDomElement robot = parent.ownerDocument().createElement("robot");
+	parent.appendChild(robot);
+	robot.setAttribute("id", mRobotModel.robotId());
+	robot.setAttribute("position", QString::number(mPos.x()) + ":" + QString::number(mPos.y()));
+	robot.setAttribute("direction", QString::number(mAngle));
+
+	mSensorsConfiguration.serialize(robot);
+	mStartPositionMarker->serialize(robot);
+	serializeWheels(robot);
+
+	return robot;
 }
 
 void RobotModel::serializeWorldModel(QDomElement &parent) const
@@ -483,8 +479,16 @@ void RobotModel::deserializeWorldModel(const QDomElement &world)
 
 void RobotModel::deserialize(const QDomElement &robotElement)
 {
+	const QString positionStr = robotElement.attribute("position", "0:0");
+	const QStringList splittedStr = positionStr.split(":");
+	const qreal x = static_cast<qreal>(splittedStr[0].toDouble());
+	const qreal y = static_cast<qreal>(splittedStr[1].toDouble());
+	onRobotReturnedOnGround();
+	setPosition(QPointF(x, y));
+	setRotation(robotElement.attribute("direction", "0").toDouble());
+	mStartPositionMarker->deserializeCompatibly(robotElement);
 	deserializeWheels(robotElement);
-	configuration().deserialize(robotElement);
+	emit deserialized(QPointF(x, y), robotElement.attribute("direction", "0").toDouble());
 	nextFragment();
 }
 

plugins/robots/common/twoDModel/src/engine/trajectory/connectionToVizualizator.cpp

@@ -13,7 +13,6 @@
  * limitations under the License. */
 
 #include <QEventLoop>
-#include <QtNetwork/QNetworkProxy>
 #include "connectionToVizualizator.h"
 #include <qrkernel/settingsManager.h>
 #include <qrkernel/settingsListener.h>

plugins/robots/common/twoDModel/src/engine/trajectory/connectionToVizualizator.h

@@ -14,6 +14,7 @@
 
 #pragma once
 
+#include <QtNetwork/QNetworkProxy>
 #include <QtNetwork/QTcpSocket>
 #include <QtCore/QIODevice>
 #include <QScopedPointer>

plugins/robots/common/twoDModel/twoDModel.pri

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 QT += widgets xml svg
+QT += network
 
 DEFINES += TWO_D_MODEL_LIBRARY