Added import/export for simulation actions in csv-format

serhmarch · serhmarch · commit 17b97265916a · 2024-10-30T17:53:15.000+02:00
diff --git a/changelog.md b/changelog.md
@@ -73,9 +73,9 @@
 
 # 0.3.5
 
-* When you click `Insert` in the `DataView` window, the new value is added to the list, 
+* When click `Insert` in the `DataView` window, the new value is added to the list, 
   but taking into account the address and size of the element format above.
-* Added insert/delete hotkeys for port/device/actions elements (copy/paste for simulation actions)
+* Added insert/delete hotkeys for port/device/actions elements (+copy/paste for simulation actions)
 * Added a confirmation prompt when deleting items such as port and device
-* Import/Export whole DataView list in csv-format
-* Import/Export simulation actions in csv-format
+* Added import/export whole DataView list in csv-format
+* Added import/export for simulation actions in csv-format
diff --git a/src/client/project/client_builder.cpp b/src/client/project/client_builder.cpp
@@ -47,10 +47,10 @@ mbClientBuilder::mbClientBuilder(QObject *parent) : mbCoreBuilder(parent)
 {
 }
 
-QStringList mbClientBuilder::csvAttributes() const
+QStringList mbClientBuilder::csvDataViewItemAttributes() const
 {
     const mbClientDataViewItem::Strings &s = mbClientDataViewItem::Strings::instance();
-    QStringList ls = mbCoreBuilder::csvAttributes();
+    QStringList ls = mbCoreBuilder::csvDataViewItemAttributes();
     ls.insert(3, s.period);
     return ls;
 }
diff --git a/src/client/project/client_builder.h b/src/client/project/client_builder.h
@@ -57,7 +57,7 @@ class mbClientBuilder : public mbCoreBuilder
     inline bool save(mbClientProject* project) { return saveCore(reinterpret_cast<mbCoreProject*>(project)); }
 
 public:
-    QStringList csvAttributes() const override;
+    QStringList csvDataViewItemAttributes() const override;
 
     mbCoreProject         *newProject        () const override;
     mbCorePort            *newPort           () const override;
diff --git a/src/core/project/core_builder.cpp b/src/core/project/core_builder.cpp
@@ -112,7 +112,7 @@ bool mbCoreBuilder::saveXml(mbCoreProject *project)
     return saveXml(project->absoluteFilePath(), dom.data());
 }
 
-QStringList mbCoreBuilder::csvAttributes() const
+QStringList mbCoreBuilder::csvDataViewItemAttributes() const
 {
     const mbCoreDataViewItem::Strings &s = mbCoreDataViewItem::Strings::instance();
     return QStringList() << s.device            
@@ -494,7 +494,7 @@ QList<mbCoreDataViewItem *> mbCoreBuilder::importDataViewItemsCsv(QIODevice *io)
     {
         QByteArray line = io->readLine();
         QString row = QString::fromUtf8(line);
-        MBSETTINGS settings = parseCsvDataViewItem(attrNames, row);
+        MBSETTINGS settings = parseCsvRowItem(attrNames, row);
         if (settings.isEmpty())
             continue;
         mbCoreDataViewItem *item = toDataViewItem(settings);
@@ -600,13 +600,13 @@ bool mbCoreBuilder::exportDataViewItemsXml(QIODevice *io, const QList<mbCoreData
 
 bool mbCoreBuilder::exportDataViewItemsCsv(QIODevice *io, const QList<mbCoreDataViewItem *> &cfg)
 {
-    QStringList lsHeader = csvAttributes();
+    QStringList lsHeader = csvDataViewItemAttributes();
     QString sHeader = makeCsvRow(lsHeader);
     io->write(sHeader.toUtf8());
     Q_FOREACH (const mbCoreDataViewItem *item, cfg)
     {
         MBSETTINGS settings = toSettings(item);
-        QString sLine = makeCsvDataViewItem(lsHeader, settings);
+        QString sLine = makeCsvRowItem(lsHeader, settings);
         io->write(sLine.toUtf8());
     }
     return true;;
@@ -748,7 +748,7 @@ QString mbCoreBuilder::makeCsvDataViewSettings(const QStringList &attrNames, con
     return v;
 }
 
-MBSETTINGS mbCoreBuilder::parseCsvDataViewItem(const QStringList &attrNames, const QString &row)
+MBSETTINGS mbCoreBuilder::parseCsvRowItem(const QStringList &attrNames, const QString &row)
 {
     MBSETTINGS settings;
     QStringList attrs = parseCsvRow(row);
@@ -765,7 +765,7 @@ MBSETTINGS mbCoreBuilder::parseCsvDataViewItem(const QStringList &attrNames, con
     return settings;
 }
 
-QString mbCoreBuilder::makeCsvDataViewItem(const QStringList &attrNames, const MBSETTINGS &settings)
+QString mbCoreBuilder::makeCsvRowItem(const QStringList &attrNames, const MBSETTINGS &settings)
 {
     QStringList attrs;
 
diff --git a/src/core/project/core_builder.h b/src/core/project/core_builder.h
@@ -84,7 +84,7 @@ class MB_EXPORT mbCoreBuilder : public QObject
     virtual bool saveXml(mbCoreProject *project);
 
 public:
-    virtual QStringList csvAttributes() const;
+    virtual QStringList csvDataViewItemAttributes() const;
 
     virtual mbCoreProject         *newProject        () const = 0;
     virtual mbCorePort            *newPort           () const = 0;
@@ -164,8 +164,8 @@ protected Q_SLOTS:
 protected:
     MBSETTINGS parseCsvDataViewSettings(const QString &row);
     QString makeCsvDataViewSettings(const QStringList &attrNames, const MBSETTINGS &settings);
-    MBSETTINGS parseCsvDataViewItem(const QStringList &attrNames, const QString &row);
-    QString makeCsvDataViewItem(const QStringList &attrNames, const MBSETTINGS &settings);
+    MBSETTINGS parseCsvRowItem(const QStringList &attrNames, const QString &row);
+    QString makeCsvRowItem(const QStringList &attrNames, const MBSETTINGS &settings);
     QStringList parseCsvRow(const QString &row);
     QString makeCsvRow(const QStringList &items);
 
diff --git a/src/server/gui/server_ui.cpp b/src/server/gui/server_ui.cpp
@@ -65,7 +65,8 @@ const mbServerUi::Strings &mbServerUi::Strings::instance()
 }
 
 mbServerUi::Defaults::Defaults() :
-    cacheFormat(mb::Dec)
+    cacheFormat(mb::Dec),
+    filterFileActions(mbCoreDialogs::Filter_CsvFiles|mbCoreDialogs::Filter_XmlFiles|mbCoreDialogs::Filter_AllFiles)
 {
 }
 
@@ -780,7 +781,7 @@ void mbServerUi::menuSlotActionImport()
         QString file = m_dialogs->getOpenFileName(this,
                                                   QStringLiteral("Import Actions ..."),
                                                   QString(),
-                                                  m_dialogs->getFilterString(mbCoreDialogs::Filter_XmlFiles|mbCoreDialogs::Filter_AllFiles));
+                                                  m_dialogs->getFilterString(Defaults::instance().filterFileActions));
         if (!file.isEmpty())
         {
             auto actions = builder()->importActions(file);
@@ -798,15 +799,17 @@ void mbServerUi::menuSlotActionExport()
     mbServerProject *project = core()->project();
     if (project)
     {
-        auto selected = m_actionsUi->selectedItems();
-        if (selected.count())
+        auto items = m_actionsUi->selectedItems();
+        if (items.isEmpty())
+            items = project->actions();
+        if (items.count())
         {
             QString file = m_dialogs->getSaveFileName(this,
                                                       QStringLiteral("Export Actions ..."),
                                                       QString(),
-                                                      m_dialogs->getFilterString(mbCoreDialogs::Filter_XmlFiles|mbCoreDialogs::Filter_AllFiles));
+                                                      m_dialogs->getFilterString(Defaults::instance().filterFileActions));
             if (!file.isEmpty())
-                builder()->exportActions(file, selected);
+                builder()->exportActions(file, items);
         }
     }
 }
@@ -838,7 +841,7 @@ void mbServerUi::slotActionCopy()
     {
         QBuffer buff;
         buff.open(QIODevice::ReadWrite);
-        builder()->exportActions(&buff, selectedItems);
+        builder()->exportActionsXml(&buff, selectedItems);
         buff.seek(0);
         QByteArray b = buff.readAll();
         QApplication::clipboard()->setText(QString::fromUtf8(b));
@@ -858,7 +861,7 @@ void mbServerUi::slotActionPaste()
         QByteArray b = text.toUtf8();
         QBuffer buff(&b);
         buff.open(QIODevice::ReadOnly);
-        QList<mbServerAction*> items = builder()->importActions(&buff);
+        QList<mbServerAction*> items = builder()->importActionsXml(&buff);
         if (items.count())
         {
             int index = -1;
diff --git a/src/server/gui/server_ui.h b/src/server/gui/server_ui.h
@@ -69,6 +69,7 @@ class mbServerUi : public mbCoreUi
     struct Defaults : public mbCoreUi::Defaults
     {
         mb::DigitalFormat cacheFormat;
+        int filterFileActions;
         Defaults();
         static const Defaults &instance();
     };
diff --git a/src/server/project/server_action.cpp b/src/server/project/server_action.cpp
@@ -31,6 +31,7 @@ mbServerAction::Strings::Strings() :
     actionType       (QStringLiteral("actionType")),
     byteOrder        (QStringLiteral("byteOrder")),
     registerOrder    (QStringLiteral("registerOrder")),
+    extended         (QStringLiteral("extended")),
     incrementValue   (QStringLiteral("incrementValue")),
     sinePeriod       (QStringLiteral("sinePeriod")),
     sinePhaseShift   (QStringLiteral("sinePhaseShift")),
@@ -142,6 +143,7 @@ MBSETTINGS mbServerAction::commonSettings() const
     p[s.actionType   ] = mb::enumKey(actionType());
     p[s.byteOrder    ] = mb::enumDataOrderKey(byteOrder());
     p[s.registerOrder] = mb::enumDataOrderKey(registerOrder());
+    p[s.extended     ] = extendedSettingsStr();
     return p;
 }
 
@@ -214,6 +216,15 @@ void mbServerAction::setCommonSettings(const MBSETTINGS &settings)
         if (ok)
             setRegisterOrder(v);
     }
+
+    it = settings.find(s.extended);
+    if (it != end)
+    {
+        QString v = it.value().toString();
+        setExtendedSettingsStr(v);
+    }
+
+
 }
 
 MBSETTINGS mbServerAction::extendedSettings() const
diff --git a/src/server/project/server_action.h b/src/server/project/server_action.h
@@ -51,6 +51,7 @@ class mbServerAction : public QObject
         const QString actionType       ;
         const QString byteOrder        ;
         const QString registerOrder    ;
+        const QString extended         ;
         const QString incrementValue   ;
         const QString sinePeriod       ;
         const QString sinePhaseShift   ;
diff --git a/src/server/project/server_builder.cpp b/src/server/project/server_builder.cpp
diff --git a/src/server/project/server_builder.h b/src/server/project/server_builder.h

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,10 @@ mbClientBuilder::mbClientBuilder(QObject *parent) : mbCoreBuilder(parent)`
`47`	`47`	`{`
`48`	`48`	`}`
`49`	`49`
`50`		`-QStringList mbClientBuilder::csvAttributes() const`
	`50`	`+QStringList mbClientBuilder::csvDataViewItemAttributes() const`
`51`	`51`	`{`
`52`	`52`	`const mbClientDataViewItem::Strings &s = mbClientDataViewItem::Strings::instance();`
`53`		`- QStringList ls = mbCoreBuilder::csvAttributes();`
	`53`	`+ QStringList ls = mbCoreBuilder::csvDataViewItemAttributes();`
`54`	`54`	`ls.insert(3, s.period);`
`55`	`55`	`return ls;`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ bool mbCoreBuilder::saveXml(mbCoreProject *project)`
`112`	`112`	`return saveXml(project->absoluteFilePath(), dom.data());`
`113`	`113`	`}`
`114`	`114`
`115`		`-QStringList mbCoreBuilder::csvAttributes() const`
	`115`	`+QStringList mbCoreBuilder::csvDataViewItemAttributes() const`
`116`	`116`	`{`
`117`	`117`	`const mbCoreDataViewItem::Strings &s = mbCoreDataViewItem::Strings::instance();`
`118`	`118`	`return QStringList() << s.device`
`@@ -494,7 +494,7 @@ QList<mbCoreDataViewItem > mbCoreBuilder::importDataViewItemsCsv(QIODevice io)`
`494`	`494`	`{`
`495`	`495`	`QByteArray line = io->readLine();`
`496`	`496`	`QString row = QString::fromUtf8(line);`
`497`		`- MBSETTINGS settings = parseCsvDataViewItem(attrNames, row);`
	`497`	`+ MBSETTINGS settings = parseCsvRowItem(attrNames, row);`
`498`	`498`	`if (settings.isEmpty())`
`499`	`499`	`continue;`
`500`	`500`	`mbCoreDataViewItem *item = toDataViewItem(settings);`
`@@ -600,13 +600,13 @@ bool mbCoreBuilder::exportDataViewItemsXml(QIODevice *io, const QList<mbCoreData`
`600`	`600`
`601`	`601`	`bool mbCoreBuilder::exportDataViewItemsCsv(QIODevice io, const QList<mbCoreDataViewItem > &cfg)`
`602`	`602`	`{`
`603`		`- QStringList lsHeader = csvAttributes();`
	`603`	`+ QStringList lsHeader = csvDataViewItemAttributes();`
`604`	`604`	`QString sHeader = makeCsvRow(lsHeader);`
`605`	`605`	`io->write(sHeader.toUtf8());`
`606`	`606`	`Q_FOREACH (const mbCoreDataViewItem *item, cfg)`
`607`	`607`	`{`
`608`	`608`	`MBSETTINGS settings = toSettings(item);`
`609`		`- QString sLine = makeCsvDataViewItem(lsHeader, settings);`
	`609`	`+ QString sLine = makeCsvRowItem(lsHeader, settings);`
`610`	`610`	`io->write(sLine.toUtf8());`
`611`	`611`	`}`
`612`	`612`	`return true;;`
`@@ -748,7 +748,7 @@ QString mbCoreBuilder::makeCsvDataViewSettings(const QStringList &attrNames, con`
`748`	`748`	`return v;`
`749`	`749`	`}`
`750`	`750`
`751`		`-MBSETTINGS mbCoreBuilder::parseCsvDataViewItem(const QStringList &attrNames, const QString &row)`
	`751`	`+MBSETTINGS mbCoreBuilder::parseCsvRowItem(const QStringList &attrNames, const QString &row)`
`752`	`752`	`{`
`753`	`753`	`MBSETTINGS settings;`
`754`	`754`	`QStringList attrs = parseCsvRow(row);`
`@@ -765,7 +765,7 @@ MBSETTINGS mbCoreBuilder::parseCsvDataViewItem(const QStringList &attrNames, con`
`765`	`765`	`return settings;`
`766`	`766`	`}`
`767`	`767`
`768`		`-QString mbCoreBuilder::makeCsvDataViewItem(const QStringList &attrNames, const MBSETTINGS &settings)`
	`768`	`+QString mbCoreBuilder::makeCsvRowItem(const QStringList &attrNames, const MBSETTINGS &settings)`
`769`	`769`	`{`
`770`	`770`	`QStringList attrs;`
`771`	`771`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@ const mbServerUi::Strings &mbServerUi::Strings::instance()`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`mbServerUi::Defaults::Defaults() :`
`68`		`- cacheFormat(mb::Dec)`
	`68`	`+ cacheFormat(mb::Dec),`
	`69`	`+ filterFileActions(mbCoreDialogs::Filter_CsvFiles\|mbCoreDialogs::Filter_XmlFiles\|mbCoreDialogs::Filter_AllFiles)`
`69`	`70`	`{`
`70`	`71`	`}`
`71`	`72`
`@@ -780,7 +781,7 @@ void mbServerUi::menuSlotActionImport()`
`780`	`781`	`QString file = m_dialogs->getOpenFileName(this,`
`781`	`782`	`QStringLiteral("Import Actions ..."),`
`782`	`783`	`QString(),`
`783`		`- m_dialogs->getFilterString(mbCoreDialogs::Filter_XmlFiles\|mbCoreDialogs::Filter_AllFiles));`
	`784`	`+ m_dialogs->getFilterString(Defaults::instance().filterFileActions));`
`784`	`785`	`if (!file.isEmpty())`
`785`	`786`	`{`
`786`	`787`	`auto actions = builder()->importActions(file);`
`@@ -798,15 +799,17 @@ void mbServerUi::menuSlotActionExport()`
`798`	`799`	`mbServerProject *project = core()->project();`
`799`	`800`	`if (project)`
`800`	`801`	`{`
`801`		`- auto selected = m_actionsUi->selectedItems();`
`802`		`- if (selected.count())`
	`802`	`+ auto items = m_actionsUi->selectedItems();`
	`803`	`+ if (items.isEmpty())`
	`804`	`+ items = project->actions();`
	`805`	`+ if (items.count())`
`803`	`806`	`{`
`804`	`807`	`QString file = m_dialogs->getSaveFileName(this,`
`805`	`808`	`QStringLiteral("Export Actions ..."),`
`806`	`809`	`QString(),`
`807`		`- m_dialogs->getFilterString(mbCoreDialogs::Filter_XmlFiles\|mbCoreDialogs::Filter_AllFiles));`
	`810`	`+ m_dialogs->getFilterString(Defaults::instance().filterFileActions));`
`808`	`811`	`if (!file.isEmpty())`
`809`		`- builder()->exportActions(file, selected);`
	`812`	`+ builder()->exportActions(file, items);`
`810`	`813`	`}`
`811`	`814`	`}`
`812`	`815`	`}`
`@@ -838,7 +841,7 @@ void mbServerUi::slotActionCopy()`
`838`	`841`	`{`
`839`	`842`	`QBuffer buff;`
`840`	`843`	`buff.open(QIODevice::ReadWrite);`
`841`		`- builder()->exportActions(&buff, selectedItems);`
	`844`	`+ builder()->exportActionsXml(&buff, selectedItems);`
`842`	`845`	`buff.seek(0);`
`843`	`846`	`QByteArray b = buff.readAll();`
`844`	`847`	`QApplication::clipboard()->setText(QString::fromUtf8(b));`
`@@ -858,7 +861,7 @@ void mbServerUi::slotActionPaste()`
`858`	`861`	`QByteArray b = text.toUtf8();`
`859`	`862`	`QBuffer buff(&b);`
`860`	`863`	`buff.open(QIODevice::ReadOnly);`
`861`		`- QList<mbServerAction*> items = builder()->importActions(&buff);`
	`864`	`+ QList<mbServerAction*> items = builder()->importActionsXml(&buff);`
`862`	`865`	`if (items.count())`
`863`	`866`	`{`
`864`	`867`	`int index = -1;`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ class mbServerUi : public mbCoreUi`
`69`	`69`	`struct Defaults : public mbCoreUi::Defaults`
`70`	`70`	`{`
`71`	`71`	`mb::DigitalFormat cacheFormat;`
	`72`	`+ int filterFileActions;`
`72`	`73`	`Defaults();`
`73`	`74`	`static const Defaults &instance();`
`74`	`75`	`};`