Add period from DataView list to DataView item for client

serhmarch · serhmarch · commit e85bb37f2d27 · 2024-12-14T15:58:27.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5) # 2.2 - case insensitive syntax
 
-project(ModbusTools VERSION 0.3.8 LANGUAGES CXX)
+project(ModbusTools VERSION 0.3.9 LANGUAGES CXX)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
diff --git a/src/client/gui/client_ui.cpp b/src/client/gui/client_ui.cpp
@@ -170,16 +170,6 @@ void mbClientUi::setCachedSettings(const MBSETTINGS &settings)
     m_scannerUi->setCachedSettings(settings);
 }
 
-void mbClientUi::menuSlotViewProject()
-{
-    ui->dockProject->show();
-}
-
-void mbClientUi::menuSlotViewLogView()
-{
-    ui->dockLogView->show();
-}
-
 void mbClientUi::menuSlotEditPaste()
 {
     if (core()->isRunning())
@@ -611,3 +601,11 @@ void mbClientUi::editDevice(mbClientDevice *device)
         m_project->setModifiedFlag(true);
     }
 }
+
+MBSETTINGS mbClientUi::getDataViewItemCreateSettings()
+{
+    MBSETTINGS res;
+    if (mbClientDataView *wl = dataViewManager()->activeDataView())
+        res[mbClientDataViewItem::Strings::instance().period] = wl->period();
+    return res;
+}
diff --git a/src/client/gui/client_ui.h b/src/client/gui/client_ui.h
@@ -71,18 +71,13 @@ class mbClientUi : public mbCoreUi
     void setCachedSettings(const MBSETTINGS &settings) override;
 
 private Q_SLOTS:
-    // ----------------------------
-    // ------------VIEW------------
-    // ----------------------------
-    void menuSlotViewProject() override;
-    void menuSlotViewLogView() override;
     // ----------------------------
     // ------------EDIT------------
     // ----------------------------
-    void menuSlotEditPaste    () override;
-    void menuSlotEditInsert   () override;
-    void menuSlotEditEdit     () override;
-    void menuSlotEditDelete   () override;
+    void menuSlotEditPaste () override;
+    void menuSlotEditInsert() override;
+    void menuSlotEditEdit  () override;
+    void menuSlotEditDelete() override;
     // ----------------------------
     // ------------PORT------------
     // ----------------------------
@@ -127,6 +122,9 @@ private Q_SLOTS:
     void editPort(mbCorePort *port);
     void editDevice(mbClientDevice *device);
 
+private:
+    MBSETTINGS getDataViewItemCreateSettings() override;
+
 private:
     Ui::mbClientUi *ui;
     // status bar labels
diff --git a/src/client/gui/dialogs/client_dialogdataviewitem.cpp b/src/client/gui/dialogs/client_dialogdataviewitem.cpp
@@ -101,13 +101,22 @@ void mbClientDialogDataViewItem::setCachedSettings(const MBSETTINGS &settings)
     it = settings.find(prefix+sItem.period); if (it != end) ui->spPeriod->setValue(it.value().toInt());
 }
 
-void mbClientDialogDataViewItem::fillFormInner(const MBSETTINGS &settings)
+void mbClientDialogDataViewItem::fillFormEditInner(const MBSETTINGS &settings)
 {
     const mbClientDataViewItem::Strings &sItem = mbClientDataViewItem::Strings::instance();
     int period = settings.value(sItem.period).toInt();
     ui->spPeriod->setValue(period);
 }
 
+void mbClientDialogDataViewItem::fillFormNewInner(const MBSETTINGS &settings)
+{
+    const mbClientDataViewItem::Strings &sItem = mbClientDataViewItem::Strings::instance();
+    MBSETTINGS::const_iterator it;
+    MBSETTINGS::const_iterator end = settings.end();
+
+    it = settings.find(sItem.period); if (it != end) ui->spPeriod->setValue(settings.value(sItem.period).toInt());
+}
+
 void mbClientDialogDataViewItem::fillDataInner(MBSETTINGS &settings) const
 {
     const mbClientDataViewItem::Strings &sItem = mbClientDataViewItem::Strings::instance();
diff --git a/src/client/gui/dialogs/client_dialogdataviewitem.h b/src/client/gui/dialogs/client_dialogdataviewitem.h
@@ -50,7 +50,8 @@ class mbClientDialogDataViewItem : public mbCoreDialogDataViewItem
     void setCachedSettings(const MBSETTINGS &settings) override;
 
 private:
-    void fillFormInner(const MBSETTINGS &settings) override;
+    void fillFormEditInner(const MBSETTINGS &settings) override;
+    void fillFormNewInner(const MBSETTINGS &settings) override;
     void fillDataInner(MBSETTINGS &settings) const override;
 
 private:
diff --git a/src/client/win_resource.rc b/src/client/win_resource.rc
@@ -3,8 +3,8 @@
 IDI_ICON1	ICON	DISCARDABLE	"gui\\icons\\client.ico"
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 0,3,8,0
-	PRODUCTVERSION 0,3,8,0
+	FILEVERSION 0,3,9,0
+	PRODUCTVERSION 0,3,9,0
 	FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 	FILEFLAGS VS_FF_DEBUG
@@ -21,11 +21,11 @@ VS_VERSION_INFO VERSIONINFO
 			BEGIN
 				VALUE "CompanyName", "\0"
 				VALUE "FileDescription", "\0"
-				VALUE "FileVersion", "0.3.8.0\0"
+				VALUE "FileVersion", "0.3.9.0\0"
 				VALUE "LegalCopyright", "\0"
 				VALUE "OriginalFilename", "client.exe\0"
 				VALUE "ProductName", "client\0"
-				VALUE "ProductVersion", "0.3.8.0\0"
+				VALUE "ProductVersion", "0.3.9.0\0"
 			END
 		END
 		BLOCK "VarFileInfo"
diff --git a/src/core/core/core.cpp b/src/core/core/core.cpp
@@ -414,7 +414,7 @@ void mbCore::logMessageThreadUnsafe(mb::LogFlag /*flag*/, const QString &source,
     if (m_settings.useTimestamp)
         msg = QString("%1 %2").arg(QDateTime::currentDateTime().toString(m_settings.formatDateTime), msg);
     if (m_ui)
-        m_ui->showMessage(msg);
+        m_ui->logMessage(msg);
     else
         std::cout << msg.toStdString();
 }
diff --git a/src/core/gui/core_logview.cpp b/src/core/gui/core_logview.cpp
@@ -76,7 +76,7 @@ void mbCoreLogView::exportLog()
     file.close();
 }
 
-void mbCoreLogView::showMessage(const QString &message)
+void mbCoreLogView::logMessage(const QString &message)
 {
     m_text->appendPlainText(message);
 }
diff --git a/src/core/gui/core_logview.h b/src/core/gui/core_logview.h
@@ -37,7 +37,7 @@ class mbCoreLogView : public QWidget
 public Q_SLOTS:
     void clear();
     void exportLog();
-    void showMessage(const QString& message);
+    void logMessage(const QString& message);
 
 Q_SIGNALS:
 
diff --git a/src/core/gui/core_ui.cpp b/src/core/gui/core_ui.cpp
@@ -126,6 +126,13 @@ void mbCoreUi::initialize()
 
     this->setCentralWidget(m_windowManager->centralWidget());
 
+    // Output
+    m_dockOutput = new QDockWidget("Output", this);
+    m_dockOutput->setObjectName(QStringLiteral("dockOutput"));
+    //m_outputView = new mbCoreOutputView(m_dockOutput);
+    this->addDockWidget(Qt::BottomDockWidgetArea, m_dockOutput);
+    this->tabifyDockWidget(m_dockOutput, m_ui.dockLogView);
+
     // Menu File
     m_ui.actionFileRecent->setMenu(m_menuRecent);
     m_ui.actionFileNew   ->setShortcuts(QKeySequence::New   );
@@ -279,7 +286,6 @@ void mbCoreUi::initialize()
         m_tray->show();
         qApp->setQuitOnLastWindowClosed(false);
     }
-
 }
 
 bool mbCoreUi::useNameWithSettings() const
@@ -344,9 +350,9 @@ void mbCoreUi::setCachedSettings(const MBSETTINGS &settings)
     m_help->setCachedSettings(settings);
 }
 
-void mbCoreUi::showMessage(const QString &message)
+void mbCoreUi::logMessage(const QString &message)
 {
-    m_logView->showMessage(message);
+    m_logView->logMessage(message);
 }
 
 void mbCoreUi::menuSlotFileNew()
@@ -399,6 +405,7 @@ void mbCoreUi::menuSlotFileSave()
             menuSlotFileSaveAs();
             return;
         }
+        saveProjectInner();
         m_project->setWindowsData(m_windowManager->saveWindowsState());
         m_project->resetVersion();
         if (m_core->builderCore()->saveCore(m_project))
@@ -500,12 +507,17 @@ void mbCoreUi::menuSlotEditSelectAll()
 
 void mbCoreUi::menuSlotViewProject()
 {
-    
+    m_ui.dockProject->show();
 }
 
 void mbCoreUi::menuSlotViewLogView()
 {
-    
+    m_ui.dockLogView->show();
+}
+
+void mbCoreUi::menuSlotViewOutput()
+{
+    m_dockOutput->show();
 }
 
 void mbCoreUi::menuSlotPortNew()
@@ -575,7 +587,8 @@ void mbCoreUi::menuSlotDeviceExport()
 
 void mbCoreUi::menuSlotDataViewItemNew()
 {
-    MBSETTINGS p = dialogsCore()->getDataViewItem(MBSETTINGS(), "New Item(s)");
+    MBSETTINGS ns = getDataViewItemCreateSettings();
+    MBSETTINGS p = dialogsCore()->getDataViewItem(ns, "New Item(s)");
     if (p.count())
     {
         const mbCoreDataViewItem::Strings &sItem = mbCoreDataViewItem::Strings::instance();
@@ -1231,3 +1244,13 @@ void mbCoreUi::closeEvent(QCloseEvent *e)
     }
 }
 
+void mbCoreUi::saveProjectInner()
+{
+    // Note: base implementation do nothing
+}
+
+MBSETTINGS mbCoreUi::getDataViewItemCreateSettings()
+{
+    return MBSETTINGS();
+}
+
diff --git a/src/core/gui/core_ui.h b/src/core/gui/core_ui.h
@@ -42,6 +42,7 @@ class mbCoreDataView;
 class mbCoreDataViewUi;
 class mbCoreProjectUi;
 class mbCoreLogView;
+class mbCoreOutputView;
 class mbCoreHelpUi;
 
 namespace Ui {
@@ -84,6 +85,7 @@ class MB_EXPORT mbCoreUi : public QMainWindow
     inline mbCoreProjectUi *projectUiCore() const { return m_projectUi; }
     inline mbCoreWindowManager *windowManagerCore() const { return m_windowManager; }
     inline mbCoreDataViewManager *dataViewManagerCore() const { return m_dataViewManager; }
+    inline mbCoreProject *projectCore() const { return m_project; }
 
 public:
     virtual void initialize();
@@ -96,7 +98,7 @@ class MB_EXPORT mbCoreUi : public QMainWindow
     virtual void setCachedSettings(const MBSETTINGS &settings);
 
 public Q_SLOTS:
-    void showMessage(const QString& message);
+    void logMessage(const QString& message);
 
 protected Q_SLOTS:
     // ----------------------------
@@ -127,6 +129,7 @@ protected Q_SLOTS:
     // ----------------------------
     virtual void menuSlotViewProject();
     virtual void menuSlotViewLogView();
+    virtual void menuSlotViewOutput();
     // ----------------------------
     // ------------PORT------------
     // ----------------------------
@@ -222,6 +225,8 @@ protected Q_SLOTS:
 
 protected:
     void closeEvent(QCloseEvent *e) override;
+    virtual void saveProjectInner();
+    virtual MBSETTINGS getDataViewItemCreateSettings();
 
 protected:
     mbCore *m_core;
@@ -310,6 +315,9 @@ protected Q_SLOTS:
 
     QMenu *m_menuRecent;
     QAction *m_actionFileRecentClear;
+    // Output
+    QDockWidget *m_dockOutput;
+    mbCoreOutputView *m_outputView;
 
     QLabel *m_lbSystemName;
     QLabel *m_lbSystemStatus;
diff --git a/src/core/gui/dialogs/core_dialogdataviewitem.cpp b/src/core/gui/dialogs/core_dialogdataviewitem.cpp
@@ -230,16 +230,6 @@ MBSETTINGS mbCoreDialogDataViewItem::getSettings(const MBSETTINGS &settings, con
     return r;
 }
 
-void mbCoreDialogDataViewItem::fillFormInner(const MBSETTINGS &/*settings*/)
-{
-    // base implementation do nothing
-}
-
-void mbCoreDialogDataViewItem::fillDataInner(MBSETTINGS &/*settings*/) const
-{
-    // base implementation do nothing
-}
-
 void mbCoreDialogDataViewItem::fillForm(const MBSETTINGS &settings)
 {
     const Strings &s = Strings::instance();
@@ -283,12 +273,13 @@ void mbCoreDialogDataViewItem::fillForm(const MBSETTINGS &settings)
         it = settings.find(sItem.stringLengthType  ); if (it != end) fillFormStringLengthType  (it.value());
         it = settings.find(sItem.stringEncoding    ); if (it != end) fillFormStringEncoding    (it.value());
 
-        fillFormInner(settings);
+        fillFormEditInner(settings);
         m_ui.spCount->setValue(count);
         m_ui.spCount->setDisabled(true);
     }
     else // new data
     {
+        fillFormNewInner(settings);
         deviceChanged(m_ui.cmbDevice->currentIndex());
         m_ui.spCount->setDisabled(false);
     }
@@ -538,6 +529,26 @@ void mbCoreDialogDataViewItem::fillDataStringEncoding(MBSETTINGS &settings, cons
         settings[key] = cmb->currentText();
 }
 
+void mbCoreDialogDataViewItem::setNonDefaultByteArraySeparator(const QString &s) const
+{
+    m_nonDefaultByteArraySeparator = mb::makeEscapeSequnces(s);
+}
+
+void mbCoreDialogDataViewItem::fillFormEditInner(const MBSETTINGS &/*settings*/)
+{
+    // base implementation do nothing
+}
+
+void mbCoreDialogDataViewItem::fillFormNewInner(const MBSETTINGS &settings)
+{
+    // base implementation do nothing
+}
+
+void mbCoreDialogDataViewItem::fillDataInner(MBSETTINGS &/*settings*/) const
+{
+    // base implementation do nothing
+}
+
 void mbCoreDialogDataViewItem::deviceChanged(int i)
 {
     mbCoreProject *project = mbCore::globalCore()->projectCore();
@@ -642,8 +653,3 @@ bool mbCoreDialogDataViewItem::isDefaultByteArraySeparator() const
     return !m_ui.lnByteArraySeparator->isEnabled();
 }
 
-void mbCoreDialogDataViewItem::setNonDefaultByteArraySeparator(const QString &s) const
-{
-    m_nonDefaultByteArraySeparator = mb::makeEscapeSequnces(s);
-}
-
diff --git a/src/core/gui/dialogs/core_dialogdataviewitem.h b/src/core/gui/dialogs/core_dialogdataviewitem.h
@@ -60,10 +60,6 @@ class MB_EXPORT mbCoreDialogDataViewItem : public mbCoreDialogSettings
 public:
     MBSETTINGS getSettings(const MBSETTINGS &settings = MBSETTINGS(), const QString &title = QString()) override;
 
-protected:
-    virtual void fillFormInner(const MBSETTINGS &settings);
-    virtual void fillDataInner(MBSETTINGS &settings) const;
-
 protected:
     void fillForm(const MBSETTINGS &settings);
     void fillFormFormat(const QVariant &v);
@@ -83,6 +79,11 @@ class MB_EXPORT mbCoreDialogDataViewItem : public mbCoreDialogSettings
     void fillDataStringLengthType(MBSETTINGS &settings, const QString &key) const;
     void fillDataStringEncoding(MBSETTINGS &settings, const QString &key) const;
 
+protected:
+    virtual void fillFormEditInner(const MBSETTINGS &settings);
+    virtual void fillFormNewInner(const MBSETTINGS &settings);
+    virtual void fillDataInner(MBSETTINGS &settings) const;
+
 protected Q_SLOTS:
     void deviceChanged(int i);
     void adrTypeChanged(int i);
diff --git a/src/core/sdk/mbcore_config.h b/src/core/sdk/mbcore_config.h
diff --git a/src/core/win_resource.rc b/src/core/win_resource.rc
diff --git a/src/modbus b/src/modbus
diff --git a/src/server/win_resource.rc b/src/server/win_resource.rc
diff --git a/src/version.pri b/src/version.pri

Original file line number	Diff line number	Diff line change
`@@ -101,13 +101,22 @@ void mbClientDialogDataViewItem::setCachedSettings(const MBSETTINGS &settings)`
`101`	`101`	`it = settings.find(prefix+sItem.period); if (it != end) ui->spPeriod->setValue(it.value().toInt());`
`102`	`102`	`}`
`103`	`103`
`104`		`-void mbClientDialogDataViewItem::fillFormInner(const MBSETTINGS &settings)`
	`104`	`+void mbClientDialogDataViewItem::fillFormEditInner(const MBSETTINGS &settings)`
`105`	`105`	`{`
`106`	`106`	`const mbClientDataViewItem::Strings &sItem = mbClientDataViewItem::Strings::instance();`
`107`	`107`	`int period = settings.value(sItem.period).toInt();`
`108`	`108`	`ui->spPeriod->setValue(period);`
`109`	`109`	`}`
`110`	`110`
	`111`	`+void mbClientDialogDataViewItem::fillFormNewInner(const MBSETTINGS &settings)`
	`112`	`+{`
	`113`	`+ const mbClientDataViewItem::Strings &sItem = mbClientDataViewItem::Strings::instance();`
	`114`	`+ MBSETTINGS::const_iterator it;`
	`115`	`+ MBSETTINGS::const_iterator end = settings.end();`
	`116`	`+`
	`117`	`+ it = settings.find(sItem.period); if (it != end) ui->spPeriod->setValue(settings.value(sItem.period).toInt());`
	`118`	`+}`
	`119`	`+`
`111`	`120`	`void mbClientDialogDataViewItem::fillDataInner(MBSETTINGS &settings) const`
`112`	`121`	`{`
`113`	`122`	`const mbClientDataViewItem::Strings &sItem = mbClientDataViewItem::Strings::instance();`
Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ void mbCore::logMessageThreadUnsafe(mb::LogFlag /flag/, const QString &source,`
`414`	`414`	`if (m_settings.useTimestamp)`
`415`	`415`	`msg = QString("%1 %2").arg(QDateTime::currentDateTime().toString(m_settings.formatDateTime), msg);`
`416`	`416`	`if (m_ui)`
`417`		`- m_ui->showMessage(msg);`
	`417`	`+ m_ui->logMessage(msg);`
`418`	`418`	`else`
`419`	`419`	`std::cout << msg.toStdString();`
`420`	`420`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ void mbCoreLogView::exportLog()`
`76`	`76`	`file.close();`
`77`	`77`	`}`
`78`	`78`
`79`		`-void mbCoreLogView::showMessage(const QString &message)`
	`79`	`+void mbCoreLogView::logMessage(const QString &message)`
`80`	`80`	`{`
`81`	`81`	`m_text->appendPlainText(message);`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,13 @@ void mbCoreUi::initialize()`
`126`	`126`
`127`	`127`	`this->setCentralWidget(m_windowManager->centralWidget());`
`128`	`128`
	`129`	`+ // Output`
	`130`	`+ m_dockOutput = new QDockWidget("Output", this);`
	`131`	`+ m_dockOutput->setObjectName(QStringLiteral("dockOutput"));`
	`132`	`+ //m_outputView = new mbCoreOutputView(m_dockOutput);`
	`133`	`+ this->addDockWidget(Qt::BottomDockWidgetArea, m_dockOutput);`
	`134`	`+ this->tabifyDockWidget(m_dockOutput, m_ui.dockLogView);`
	`135`	`+`
`129`	`136`	`// Menu File`
`130`	`137`	`m_ui.actionFileRecent->setMenu(m_menuRecent);`
`131`	`138`	`m_ui.actionFileNew ->setShortcuts(QKeySequence::New );`
`@@ -279,7 +286,6 @@ void mbCoreUi::initialize()`
`279`	`286`	`m_tray->show();`
`280`	`287`	`qApp->setQuitOnLastWindowClosed(false);`
`281`	`288`	`}`
`282`		`-`
`283`	`289`	`}`
`284`	`290`
`285`	`291`	`bool mbCoreUi::useNameWithSettings() const`
`@@ -344,9 +350,9 @@ void mbCoreUi::setCachedSettings(const MBSETTINGS &settings)`
`344`	`350`	`m_help->setCachedSettings(settings);`
`345`	`351`	`}`
`346`	`352`
`347`		`-void mbCoreUi::showMessage(const QString &message)`
	`353`	`+void mbCoreUi::logMessage(const QString &message)`
`348`	`354`	`{`
`349`		`- m_logView->showMessage(message);`
	`355`	`+ m_logView->logMessage(message);`
`350`	`356`	`}`
`351`	`357`
`352`	`358`	`void mbCoreUi::menuSlotFileNew()`
`@@ -399,6 +405,7 @@ void mbCoreUi::menuSlotFileSave()`
`399`	`405`	`menuSlotFileSaveAs();`
`400`	`406`	`return;`
`401`	`407`	`}`
	`408`	`+ saveProjectInner();`
`402`	`409`	`m_project->setWindowsData(m_windowManager->saveWindowsState());`
`403`	`410`	`m_project->resetVersion();`
`404`	`411`	`if (m_core->builderCore()->saveCore(m_project))`
`@@ -500,12 +507,17 @@ void mbCoreUi::menuSlotEditSelectAll()`
`500`	`507`
`501`	`508`	`void mbCoreUi::menuSlotViewProject()`
`502`	`509`	`{`
`503`		`-`
	`510`	`+ m_ui.dockProject->show();`
`504`	`511`	`}`
`505`	`512`
`506`	`513`	`void mbCoreUi::menuSlotViewLogView()`
`507`	`514`	`{`
`508`		`-`
	`515`	`+ m_ui.dockLogView->show();`
	`516`	`+}`
	`517`	`+`
	`518`	`+void mbCoreUi::menuSlotViewOutput()`
	`519`	`+{`
	`520`	`+ m_dockOutput->show();`
`509`	`521`	`}`
`510`	`522`
`511`	`523`	`void mbCoreUi::menuSlotPortNew()`
`@@ -575,7 +587,8 @@ void mbCoreUi::menuSlotDeviceExport()`
`575`	`587`
`576`	`588`	`void mbCoreUi::menuSlotDataViewItemNew()`
`577`	`589`	`{`
`578`		`- MBSETTINGS p = dialogsCore()->getDataViewItem(MBSETTINGS(), "New Item(s)");`
	`590`	`+ MBSETTINGS ns = getDataViewItemCreateSettings();`
	`591`	`+ MBSETTINGS p = dialogsCore()->getDataViewItem(ns, "New Item(s)");`
`579`	`592`	`if (p.count())`
`580`	`593`	`{`
`581`	`594`	`const mbCoreDataViewItem::Strings &sItem = mbCoreDataViewItem::Strings::instance();`
`@@ -1231,3 +1244,13 @@ void mbCoreUi::closeEvent(QCloseEvent *e)`
`1231`	`1244`	`}`
`1232`	`1245`	`}`
`1233`	`1246`
	`1247`	`+void mbCoreUi::saveProjectInner()`
	`1248`	`+{`
	`1249`	`+ // Note: base implementation do nothing`
	`1250`	`+}`
	`1251`	`+`
	`1252`	`+MBSETTINGS mbCoreUi::getDataViewItemCreateSettings()`
	`1253`	`+{`
	`1254`	`+ return MBSETTINGS();`
	`1255`	`+}`
	`1256`	`+`