Migrate project (xml to json)

src/communication/modbuspoll.cpp

@@ -5,7 +5,6 @@
 #include "util/formatdatetime.h"
 #include "util/scopelogging.h"
 
-
 ModbusPoll::ModbusPoll(SettingsModel* pSettingsModel, QObject* parent) : QObject(parent), _bPollActive(false)
 {
     _pPollTimer = new QTimer(this);
@@ -107,7 +106,6 @@ void ModbusPoll::onReadDataResult(ResultDoubleList results)
     }
 }
 
-
 /*! \brief Returns the AdapterManager owned by this instance. */
 AdapterManager* ModbusPoll::adapterManager() const
 {

src/dialogs/addregisterwidget.cpp

@@ -77,7 +77,8 @@ AddRegisterWidget::AddRegisterWidget(SettingsModel* pSettingsModel,
     }
 
     connect(_pUi->btnAdd, &QPushButton::clicked, this, &AddRegisterWidget::handleResultAccept);
-    connect(_pAdapterManager, &AdapterManager::buildExpressionResult, this, &AddRegisterWidget::onBuildExpressionResult);
+    connect(_pAdapterManager, &AdapterManager::buildExpressionResult, this,
+            &AddRegisterWidget::onBuildExpressionResult);
 
     _axisGroup.setExclusive(true);
     _axisGroup.addButton(_pUi->radioPrimary);

src/importexport/projectfiledefinitions.h

@@ -10,10 +10,26 @@ const char cModbusScopeTag[] = "modbusscope";
 const char cModbusTag[] = "modbus";
 const char cScopeTag[] = "scope";
 const char cViewTag[] = "view";
+const char cConnectionTag[] = "connection";
 const char cDeviceTag[] = "device";
 const char cDeviceIdTag[] = "deviceid";
 const char cDeviceNameTag[] = "name";
 const char cLogTag[] = "log";
+const char cConnectionIdTag[] = "connectionid";
+const char cConnectionEnabledTag[] = "enabled";
+const char cConnectionTypeTag[] = "type";
+const char cIpTag[] = "ip";
+const char cPortTag[] = "port";
+const char cPortNameTag[] = "portname";
+const char cBaudrateTag[] = "baudrate";
+const char cParityTag[] = "parity";
+const char cDataBitsTag[] = "databits";
+const char cStopBitsTag[] = "stopbits";
+const char cSlaveIdTag[] = "slaveid";
+const char cTimeoutTag[] = "timeout";
+const char cConsecutiveMaxTag[] = "consecutivemax";
+const char cInt32LittleEndianTag[] = "int32littleendian";
+const char cPersistentConnectionTag[] = "persistentconnection";
 const char cPollTimeTag[] = "polltime";
 const char cAbsoluteTimesTag[] = "absolutetimes";
 const char cLogToFileTag[] = "logtofile";
@@ -58,7 +74,9 @@ const char cAdapterSettingsKey[] = "settings";
 const char cAdapterIdKey[] = "adapterId";
 const char cAdapterKey[] = "adapter";
 const char cIdJsonKey[] = "id";
+const char cConnectionsJsonKey[] = "connections";
 const char cDevicesJsonKey[] = "devices";
+const char cConnectionTypeJsonKey[] = "connectiontype";
 
 /* JSON constant values */
 const quint32 cMinimumJsonVersion = 6;

src/importexport/projectfilehandler.cpp

@@ -4,6 +4,7 @@
 #include "importexport/projectfiledata.h"
 #include "importexport/projectfilejsonexporter.h"
 #include "importexport/projectfilejsonparser.h"
+#include "importexport/projectfilexmlparser.h"
 #include "models/device.h"
 #include "models/graphdatamodel.h"
 #include "models/guimodel.h"
@@ -35,8 +36,22 @@ void ProjectFileHandler::openProjectFile(QString projectFilePath)
         QTextStream in(&file);
         QString projectFileContents = in.readAll();
 
-        ProjectFileJsonParser jsonParser;
-        GeneralError parseErr = jsonParser.parseFile(projectFileContents, &loadedSettings);
+        GeneralError parseErr;
+        QString trimmed = projectFileContents.trimmed();
+        if (trimmed.startsWith('{'))
+        {
+            ProjectFileJsonParser jsonParser;
+            parseErr = jsonParser.parseFile(projectFileContents, &loadedSettings);
+        }
+        else if (trimmed.startsWith('<'))
+        {
+            ProjectFileXmlParser xmlParser;
+            parseErr = xmlParser.parseFile(projectFileContents, &loadedSettings);
+        }
+        else
+        {
+            parseErr.reportError(tr("The file is not a valid MBS project file."));
+        }
 
         if (parseErr.result())
         {