refactor: Remove build-in console

The console feature was not documented very well and was only used for a few messages.
swift-project · Oct 6, 2024 · c9ef304 · c9ef304
1 parent 7cdec8e
commit c9ef304
Show file tree

Hide file tree

Showing 24 changed files with 12 additions and 203 deletions.
diff --git a/src/blackcore/context/contextapplication.h b/src/blackcore/context/contextapplication.h
@@ -97,10 +97,6 @@ namespace BlackCore
             //! \note Used for hotkey action, do not use directly
             void remoteHotkeyAction(const QString &action, bool argument, const BlackMisc::CIdentifier &origin);
 
-            //! Request a message to be displayed on console, whatever the console is
-            //! \note no guarantee it is really written to console
-            void requestDisplayOnConsole(const QString &message);
-
         public slots:
             //! Ratify some settings changed by another process
             //! \note Not pure because it can be called from the base class constructor.

diff --git a/src/blackcore/context/contextapplicationproxy.cpp b/src/blackcore/context/contextapplicationproxy.cpp
@@ -45,8 +45,6 @@ namespace BlackCore::Context
         s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(),
                                "remoteHotkeyAction", this, SIGNAL(remoteHotkeyAction(QString, bool, BlackMisc::CIdentifier)));
         Q_ASSERT(s);
-        s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(),
-                               "requestDisplayOnConsole", this, SIGNAL(requestDisplayOnConsole(QString)));
         Q_UNUSED(s);
         this->relayBaseClassSignals(serviceName, connection, IContextApplication::ObjectPath(), IContextApplication::InterfaceName());
     }

diff --git a/src/blackcore/context/contextsimulator.h b/src/blackcore/context/contextsimulator.h
@@ -149,9 +149,6 @@ namespace BlackCore::Context
         //! Relevant simulator messages to be explicitly displayed
         void driverMessages(const BlackMisc::CStatusMessageList &messages);
 
-        //! Request a console message (whatever the console maybe)
-        void requestUiConsoleMessage(const QString &driverMessage, bool clear);
-
         //! Validated model set
         void validatedModelSet(const BlackMisc::Simulation::CSimulatorInfo &simulator,
                                const BlackMisc::Simulation::CAircraftModelList &valid, const BlackMisc::Simulation::CAircraftModelList &invalid,

diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp
@@ -515,8 +515,6 @@ namespace BlackCore::Context
         Q_ASSERT(c);
         c = connect(simulator, &ISimulator::driverMessages, this, &IContextSimulator::driverMessages);
         Q_ASSERT(c);
-        c = connect(simulator, &ISimulator::requestUiConsoleMessage, this, &IContextSimulator::requestUiConsoleMessage);
-        Q_ASSERT(c);
         c = connect(simulator, &ISimulator::autoPublishDataWritten, this, &IContextSimulator::autoPublishDataWritten);
         Q_ASSERT(c);
 
@@ -1074,14 +1072,6 @@ namespace BlackCore::Context
         {
             CInterpolationAndRenderingSetupGlobal rs = this->getInterpolationAndRenderingSetupGlobal();
             const QString p1 = parser.part(1);
-            if (p1 == "show")
-            {
-                if (this->getIContextApplication())
-                {
-                    emit this->getIContextApplication()->requestDisplayOnConsole(rs.toQString(true));
-                }
-                return true;
-            }
             if (!parser.hasPart(2)) { return false; }
             const bool on = stringToBool(parser.part(2));
             if (p1 == "debug") { rs.setSimulatorDebuggingMessages(on); }

diff --git a/src/blackcore/context/contextsimulatorimpl.h b/src/blackcore/context/contextsimulatorimpl.h
@@ -270,7 +270,6 @@ namespace BlackCore
             {
                 if (BlackMisc::CSimpleCommandParser::registered("BlackCore::CContextSimulator")) { return; }
                 BlackMisc::CSimpleCommandParser::registerCommand({ ".ris", "rendering/interpolation setup (global setup)" });
-                BlackMisc::CSimpleCommandParser::registerCommand({ ".ris show", "display rendering/interpolation setup on console (global setup)" });
                 BlackMisc::CSimpleCommandParser::registerCommand({ ".ris debug on|off", "rendering/interpolation debug messages (global setup)" });
                 BlackMisc::CSimpleCommandParser::registerCommand({ ".ris parts on|off", "aircraft parts (global setup)" });
             }

diff --git a/src/blackcore/context/contextsimulatorproxy.cpp b/src/blackcore/context/contextsimulatorproxy.cpp
@@ -91,9 +91,6 @@ namespace BlackCore::Context
                                "driverMessages", this, SIGNAL(driverMessages(BlackMisc::CStatusMessageList)));
 
         Q_ASSERT(s);
-        s = connection.connect(serviceName, IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName(),
-                               "requestUiConsoleMessage", this, SIGNAL(requestUiConsoleMessage(QString, bool)));
-        Q_ASSERT(s);
         s = connection.connect(serviceName, IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName(),
                                "validatedModelSet", this, SIGNAL(validatedModelSet(BlackMisc::Simulation::CSimulatorInfo, BlackMisc::Simulation::CAircraftModelList, BlackMisc::Simulation::CAircraftModelList, bool, BlackMisc::CStatusMessageList)));
         Q_ASSERT(s);

diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp
@@ -1285,7 +1285,6 @@ namespace BlackCore
         if (!dm.isEmpty())
         {
             this->displayStatusMessage(CStatusMessage(this).info(dm));
-            emit this->requestUiConsoleMessage(dm, true);
         }
 
         const int t = CMathUtils::randomInteger(4500, 5500); // makes sure not always using the same time difference

diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h
@@ -379,9 +379,6 @@ namespace BlackCore
         //! Relevant simulator messages to be explicitly displayed
         void driverMessages(const BlackMisc::CStatusMessageList &messages);
 
-        //! Request a console message (whatever the console maybe)
-        void requestUiConsoleMessage(const QString &driverMessage, bool clear);
-
         //! Requested elevation, call pending
         void requestedElevation(const BlackMisc::Aviation::CCallsign &callsign);
 

diff --git a/src/blackgui/components/datamaininfoareacomponent.cpp b/src/blackgui/components/datamaininfoareacomponent.cpp
@@ -67,14 +67,6 @@ namespace BlackGui::Components
         this->getLogComponent()->displayLog();
     }
 
-    void CDataMainInfoAreaComponent::displayConsole()
-    {
-        this->selectArea(InfoAreaLog);
-        BLACK_VERIFY_X(this->getLogComponent(), Q_FUNC_INFO, "No log component");
-        if (!this->getLogComponent()) { return; }
-        this->getLogComponent()->displayConsole();
-    }
-
     void CDataMainInfoAreaComponent::selectLog()
     {
         this->selectArea(InfoAreaLog);

diff --git a/src/blackgui/components/datamaininfoareacomponent.h b/src/blackgui/components/datamaininfoareacomponent.h
@@ -68,9 +68,6 @@ namespace BlackGui::Components
         //! Display the log
         void displayLog();
 
-        //! Display console
-        void displayConsole();
-
     public slots:
         //! Select log area
         void selectLog();

diff --git a/src/blackgui/components/logcomponent.cpp b/src/blackgui/components/logcomponent.cpp
@@ -45,7 +45,6 @@ namespace BlackGui::Components
     CLogComponent::CLogComponent(QWidget *parent) : QFrame(parent), ui(new Ui::CLogComponent), m_history(this)
     {
         ui->setupUi(this);
-        connect(ui->comp_StatusMessages, &CStatusMessagesDetail::modelDataChangedDigest, this, &CLogComponent::onStatusMessageDataChanged);
 
         connect(&m_history, &CLogHistoryReplica::elementAdded, this, [this](const CStatusMessage &message) {
             ui->comp_StatusMessages->appendStatusMessageToList(message);
@@ -66,13 +65,6 @@ namespace BlackGui::Components
 
     void CLogComponent::displayLog(bool attention)
     {
-        ui->tw_StatusPage->setCurrentIndex(0);
-        if (attention) { emit this->requestAttention(); }
-    }
-
-    void CLogComponent::displayConsole(bool attention)
-    {
-        ui->tw_StatusPage->setCurrentIndex(1);
         if (attention) { emit this->requestAttention(); }
     }
 
@@ -118,33 +110,11 @@ namespace BlackGui::Components
 
     void CLogComponent::clear()
     {
-        ui->tep_StatusPageConsole->clear();
         ui->comp_StatusMessages->clear();
     }
 
-    void CLogComponent::clearConsole()
-    {
-        ui->tep_StatusPageConsole->clear();
-    }
-
     void CLogComponent::clearMessages()
     {
         ui->comp_StatusMessages->clear();
     }
-
-    void CLogComponent::appendPlainTextToConsole(const QString &text)
-    {
-        ui->tep_StatusPageConsole->appendPlainText(text);
-    }
-
-    void CLogComponent::onStatusMessageDataChanged(int count, bool withFilter)
-    {
-        Q_UNUSED(count);
-        Q_UNUSED(withFilter);
-        const int i = ui->tw_StatusPage->indexOf(ui->pg_LogPage);
-        QString o = ui->tw_StatusPage->tabText(i);
-        const QString f = withFilter ? "F" : "";
-        o = CGuiUtility::replaceTabCountValue(o, ui->comp_StatusMessages->rowCount()) + f;
-        ui->tw_StatusPage->setTabText(i, o);
-    }
 } // namespace
diff --git a/src/blackgui/components/logcomponent.h b/src/blackgui/components/logcomponent.h
@@ -55,9 +55,6 @@ namespace BlackGui::Components
         //! Display log
         void displayLog(bool attention = false);
 
-        //! Display console
-        void displayConsole(bool attention = false);
-
         //! \copydoc BlackGui::Components::CStatusMessagesDetail::filterUseRadioButtonDescriptiveIcons
         void filterUseRadioButtonDescriptiveIcons(bool oneLetterText);
 
@@ -85,25 +82,16 @@ namespace BlackGui::Components
         //! Clear
         void clear();
 
-        //! Clear
-        void clearConsole();
-
         //! Clear
         void clearMessages();
 
-        //! Append plain text to console
-        void appendPlainTextToConsole(const QString &text);
-
     signals:
         //! Make me visible
         void requestAttention();
 
     private:
         QScopedPointer<Ui::CLogComponent> ui;
         BlackMisc::CLogHistoryReplica m_history;
-
-        //! Status messages changed
-        void onStatusMessageDataChanged(int count, bool withFilter);
     };
 } // ns
 #endif // guard
diff --git a/src/blackgui/components/logcomponent.ui b/src/blackgui/components/logcomponent.ui
@@ -22,10 +22,6 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QTabWidget" name="tw_StatusPage">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
      <widget class="QWidget" name="pg_LogPage">
       <attribute name="title">
        <string>Log</string>
@@ -51,49 +47,6 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="pg_LogConsole">
-      <attribute name="title">
-       <string>Console</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="vl_StatusPageConsole">
-       <property name="spacing">
-        <number>4</number>
-       </property>
-       <property name="leftMargin">
-        <number>2</number>
-       </property>
-       <property name="topMargin">
-        <number>3</number>
-       </property>
-       <property name="rightMargin">
-        <number>2</number>
-       </property>
-       <property name="bottomMargin">
-        <number>2</number>
-       </property>
-       <item>
-        <widget class="BlackGui::Components::CConsoleTextEdit" name="tep_StatusPageConsole">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <italic>false</italic>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="documentTitle">
-          <string>Console output</string>
-         </property>
-         <property name="lineWrapMode">
-          <enum>QPlainTextEdit::NoWrap</enum>
-         </property>
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
    </item>
   </layout>
  </widget>

diff --git a/src/blackgui/components/maininfoareacomponent.cpp b/src/blackgui/components/maininfoareacomponent.cpp
@@ -99,12 +99,6 @@ namespace BlackGui::Components
         this->selectArea(InfoAreaLog);
     }
 
-    void CMainInfoAreaComponent::displayConsole()
-    {
-        ui->comp_Log->displayConsole();
-        this->selectArea(InfoAreaLog);
-    }
-
     void CMainInfoAreaComponent::selectArea(CMainInfoAreaComponent::InfoArea infoArea)
     {
         CInfoArea::selectArea(static_cast<int>(infoArea));

diff --git a/src/blackgui/components/maininfoareacomponent.h b/src/blackgui/components/maininfoareacomponent.h
@@ -110,9 +110,6 @@ namespace BlackGui::Components
         //! Display the log
         void displayLog();
 
-        //! Display console
-        void displayConsole();
-
         //! Toggle floating of given area
         void toggleFloating(InfoArea infoArea) { CInfoArea::toggleFloatingByIndex(static_cast<int>(infoArea)); }