Caught off Output window from client

Author: serhmarch

src/core/gui/core_ui.cpp

@@ -50,7 +50,6 @@
 
 #include "core_windowmanager.h"
 #include "logview/core_logview.h"
-#include "core_outputview.h"
 
 #define RECENT_PROJECTS_COUNT 20
 
@@ -87,7 +86,6 @@ mbCoreUi::mbCoreUi(mbCore *core, QWidget *parent) :
     connect(core, &mbCore::projectChanged, this, &mbCoreUi::setProject);
 
     m_logView = new mbCoreLogView(this);
-    m_outputView = new mbCoreOutputView(this);
     m_builder = m_core->builderCore();
     m_dialogs = nullptr;
     m_windowManager = nullptr;
@@ -113,11 +111,6 @@ QWidget *mbCoreUi::logView() const
     return m_logView;
 }
 
-QWidget *mbCoreUi::outputView() const
-{
-    return m_outputView;
-}
-
 void mbCoreUi::initialize()
 {
     m_ui.dockLogView->setWidget(logView());
@@ -133,14 +126,6 @@ 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);
-    m_dockOutput->setWidget(m_outputView);
-    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   );
@@ -366,7 +351,6 @@ void mbCoreUi::logMessage(mb::LogFlag flag, const QString &source, const QString
 
 void mbCoreUi::outputMessage(const QString &message)
 {
-    m_outputView->showOutput(message);
 }
 
 void mbCoreUi::menuSlotFileNew()
@@ -526,12 +510,10 @@ void mbCoreUi::menuSlotViewProject()
 
 void mbCoreUi::menuSlotViewLogView()
 {
-    m_ui.dockLogView->show();
 }
 
 void mbCoreUi::menuSlotViewOutput()
 {
-    m_dockOutput->show();
 }
 
 void mbCoreUi::menuSlotPortNew()

src/core/gui/core_ui.h

@@ -77,7 +77,6 @@ class MB_EXPORT mbCoreUi : public QMainWindow
 
 public:
     QWidget *logView() const;
-    QWidget *outputView() const;
 
 public:
     inline mbCore* baseCore() const { return m_core; }
@@ -100,7 +99,7 @@ class MB_EXPORT mbCoreUi : public QMainWindow
 
 public Q_SLOTS:
     void logMessage(mb::LogFlag flag, const QString &source, const QString &text);
-    void outputMessage(const QString& message);
+    virtual void outputMessage(const QString& message);
 
 protected Q_SLOTS:
     // ----------------------------
@@ -318,9 +317,6 @@ protected Q_SLOTS:
 
     QMenu *m_menuRecent;
     QAction *m_actionFileRecentClear;
-    // Output
-    QDockWidget *m_dockOutput;
-    mbCoreOutputView *m_outputView;
 
     QLabel *m_lbSystemName;
     QLabel *m_lbSystemStatus;

src/core/gui/gui.pri

@@ -5,12 +5,10 @@ include(logview/logview.pri)
 include(help/help.pri)
 
 HEADERS += \
-    $$PWD/core_outputview.h \
     $$PWD/core_windowmanager.h \
     $$PWD/core_ui.h
 
 SOURCES += \
-    $$PWD/core_outputview.cpp \
     $$PWD/core_windowmanager.cpp \
     $$PWD/core_ui.cpp
 

src/server/gui/gui.pri

@@ -6,10 +6,12 @@ include(dataview/dataview.pri)
 include(script/script.pri)
 
 HEADERS += \
+    $$PWD/server_outputview.h \
     $$PWD/server_windowmanager.h    \
     $$PWD/server_ui.h               \
 
 SOURCES += \
+    $$PWD/server_outputview.cpp \
     $$PWD/server_windowmanager.cpp  \
     $$PWD/server_ui.cpp             \
 

src/core/gui/core_outputview.cpp src/server/gui/server_outputview.cppsrc/core/gui/core_outputview.cpp renamed to src/server/gui/server_outputview.cpp

@@ -20,7 +20,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-#include "core_outputview.h"
+#include "server_outputview.h"
 
 #include <QVBoxLayout>
 #include <QPlainTextEdit>
@@ -30,7 +30,7 @@
 #include <gui/core_ui.h>
 #include <gui/dialogs/core_dialogs.h>
 
-mbCoreOutputView::mbCoreOutputView(QWidget *parent)
+mbServerOutputView::mbServerOutputView(QWidget *parent)
     : QWidget{parent}
 {
     m_toolBar = new QToolBar(this);
@@ -42,7 +42,7 @@ mbCoreOutputView::mbCoreOutputView(QWidget *parent)
 
     QAction *actionClear = new QAction(m_toolBar);
     actionClear->setIcon(QIcon(":/core/icons/clear.png"));
-    connect(actionClear, &QAction::triggered, this, &mbCoreOutputView::clear);
+    connect(actionClear, &QAction::triggered, this, &mbServerOutputView::clear);
     m_toolBar->addAction(actionClear);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
@@ -53,12 +53,12 @@ mbCoreOutputView::mbCoreOutputView(QWidget *parent)
 
 }
 
-void mbCoreOutputView::clear()
+void mbServerOutputView::clear()
 {
     m_text->clear();
 }
 
-void mbCoreOutputView::showOutput(const QString &message)
+void mbServerOutputView::showOutput(const QString &message)
 {
     m_text->moveCursor (QTextCursor::End);
     m_text->insertPlainText(message);

src/core/gui/core_outputview.h src/server/gui/server_outputview.hsrc/core/gui/core_outputview.h renamed to src/server/gui/server_outputview.h

@@ -20,19 +20,19 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-#ifndef CORE_OUTPUTVIEW_H
-#define CORE_OUTPUTVIEW_H
+#ifndef SERVER_OUTPUTVIEW_H
+#define SERVER_OUTPUTVIEW_H
 
 #include <QWidget>
 
 class QPlainTextEdit;
 class QToolBar;
 
-class mbCoreOutputView : public QWidget
+class mbServerOutputView : public QWidget
 {
     Q_OBJECT
 public:
-    explicit mbCoreOutputView(QWidget *parent = nullptr);
+    explicit mbServerOutputView(QWidget *parent = nullptr);
 
 public Q_SLOTS:
     void clear();
@@ -45,4 +45,4 @@ public Q_SLOTS:
     QPlainTextEdit *m_text;
 };
 
-#endif // CORE_OUTPUTVIEW_H
+#endif // SERVER_OUTPUTVIEW_H

src/server/gui/server_ui.cpp

@@ -51,10 +51,9 @@
 #include "script/server_devicescripteditor.h"
 
 #include "device/server_deviceui.h"
-
 #include "dataview/server_dataviewmanager.h"
-
 #include "simactions/server_simactionsui.h"
+#include "server_outputview.h"
 
 mbServerUi::Strings::Strings() :
     cacheFormat(QStringLiteral("Ui.format"))
@@ -91,6 +90,7 @@ mbServerUi::mbServerUi(mbServer *core, QWidget *parent) :
     m_dockActions = nullptr;
     m_deviceManager = nullptr;
     m_helpFile = QStringLiteral("/help/ModbusServer.qhc");
+    m_outputView = new mbServerOutputView(this);
 
     m_ui.menuFile                        = ui->menuFile                       ;
     m_ui.menuEdit                        = ui->menuEdit                       ;
@@ -164,8 +164,21 @@ mbServerUi::~mbServerUi()
     delete ui;
 }
 
+QWidget *mbServerUi::outputView() const
+{
+    return m_outputView;
+}
+
 void mbServerUi::initialize()
 {
+    // Output
+    m_dockOutput = new QDockWidget("Output", this);
+    m_dockOutput->setObjectName(QStringLiteral("dockOutput"));
+    //m_outputView = new mbCoreOutputView(m_dockOutput);
+    m_dockOutput->setWidget(m_outputView);
+    this->addDockWidget(Qt::BottomDockWidgetArea, m_dockOutput);
+    this->tabifyDockWidget(m_dockOutput, ui->dockLogView);
+
     // Dialogs
     m_dialogs = new mbServerDialogs(this);
 
@@ -193,7 +206,7 @@ void mbServerUi::initialize()
     this->tabifyDockWidget(m_dockActions, ui->dockLogView);
 
     // Menu View
-    connect(ui->actionViewActions, &QAction::triggered, this, &mbServerUi::menuSlotViewActions);
+    connect(ui->actionViewActions, &QAction::triggered, this, &mbServerUi::menuSlotViewSimActions);
 
     // Menu Port
     connect(ui->actionPortDeviceNew   , &QAction::triggered, this, &mbServerUi::menuSlotPortDeviceNew   );
@@ -274,7 +287,12 @@ void mbServerUi::setCachedSettings(const MBSETTINGS &settings)
     m_scriptManager->setCachedSettings(settings);
 }
 
-void mbServerUi::menuSlotViewActions()
+void mbServerUi::outputMessage(const QString &message)
+{
+    m_outputView->showOutput(message);
+}
+
+void mbServerUi::menuSlotViewSimActions()
 {
     m_dockActions->show();
     m_dockActions->setFocus();
@@ -390,6 +408,11 @@ void mbServerUi::menuSlotEditSelectAll()
     mbCoreUi::menuSlotEditSelectAll();
 }
 
+void mbServerUi::menuSlotViewOutput()
+{
+    m_dockOutput->show();
+}
+
 void mbServerUi::menuSlotPortNew()
 {
     if (core()->isRunning())

src/server/gui/server_ui.h

@@ -38,6 +38,7 @@ class mbServerPort;
 class mbServerDevice;
 class mbServerDeviceRef;
 class mbServerSimAction;
+class mbServerOutputView;
 
 class mbServer;
 class mbServerBuilder;
@@ -90,6 +91,9 @@ class mbServerUi : public mbCoreUi
     inline mbServerDataViewManager *dataViewManager() const { return reinterpret_cast<mbServerDataViewManager*>(dataViewManagerCore()); }
     inline mbServerProject *project() const { return reinterpret_cast<mbServerProject*>(projectCore()); }
 
+public:
+    QWidget *outputView() const;
+
 public:
     void initialize() override;
 
@@ -99,10 +103,17 @@ class mbServerUi : public mbCoreUi
     MBSETTINGS cachedSettings() const override;
     void setCachedSettings(const MBSETTINGS &settings) override;
 
+public Q_SLOTS:
+    void outputMessage(const QString& message) override;
+
 Q_SIGNALS:
     void formatChanged(int format);
 
 private Q_SLOTS:
+    // ----------------------------
+    // ------------VIEW------------
+    // ----------------------------
+    void menuSlotViewOutput() override;
     // ----------------------------
     // ------------EDIT------------
     // ----------------------------
@@ -115,7 +126,7 @@ private Q_SLOTS:
     // ----------------------------
     // ------------VIEW------------
     // ----------------------------
-    void menuSlotViewActions();
+    void menuSlotViewSimActions();
     // ----------------------------
     // ------------PORT------------
     // ----------------------------
@@ -184,6 +195,9 @@ private Q_SLOTS:
     Ui::mbServerUi *ui;
     mb::DigitalFormat m_format;
     QComboBox *m_cmbFormat;
+    // Output
+    QDockWidget *m_dockOutput;
+    mbServerOutputView *m_outputView;
     // Action
     mbServerSimActionsUi *m_actionsUi;
     QDockWidget *m_dockActions;