Merge pull request #150 from electux/dev

[microhil] Maps home view and serial view (serial port settings confirm and control menu-items), update docs
electux · Oct 3, 2023 · fa38b3a · fa38b3a
2 parents 62f5554 + 84afe0d
commit fa38b3a
Show file tree

Hide file tree

Showing 359 changed files with 1,504 additions and 2,888 deletions.
diff --git a/sw/microhildesk/view/home/microhil_view_home.cc b/sw/microhildesk/view/home/microhil_view_home.cc
@@ -209,6 +209,12 @@ MHViewHome::MHViewHome(BaseObjectType *object, MHRPtr<Gtk::Builder> const &ui)
     }
 
     ////////////////////////////////////////////////////////////////////////
-    /// Disables Serial settings (enabled if serial port is active)
-    m_serialSettings->set_sensitive(false);
+    /// Disables disconnect menu-item by default
+    m_disconnect->set_sensitive(false);
+}
+
+void MHViewHome::serialSettingsConfirm(bool state)
+{
+    m_connect->set_sensitive(!state);
+    m_disconnect->set_sensitive(state);
 }
diff --git a/sw/microhildesk/view/home/microhil_view_home.h b/sw/microhildesk/view/home/microhil_view_home.h
@@ -120,6 +120,11 @@ class MHViewHome : public AbMHViewHome, public Gtk::ApplicationWindow
     /// @brief Slot for processing About meni-item
     void onAboutClicked();
 
+    ////////////////////////////////////////////////////////////////////////
+    /// @brief Sets widgets after confirming changes for the serial port
+    /// @param state true for confirmed changes, else false
+    void serialSettingsConfirm(bool state) final;
+
 private:
     ////////////////////////////////////////////////////////////////////////
     /// @brief Maps channels (signals and slots)

diff --git a/sw/microhildesk/view/home/microhil_view_home_abstract.h b/sw/microhildesk/view/home/microhil_view_home_abstract.h
@@ -159,4 +159,9 @@ class AbMHViewHome
     /// @brief Slot for processing toggle buttons (turn on/turn off timer)
     /// @param id represents id for channel (Channel::MICROHIL_ID0 .. 7)
     virtual void onToggleTimerChanged(Channel id) = 0;
+
+    ////////////////////////////////////////////////////////////////////////
+    /// @brief Sets widgets after confirming changes for the serial port
+    /// @param state true for confirmed changes, else false
+    virtual void serialSettingsConfirm(bool state) = 0;
 };
diff --git a/sw/microhildesk/view/microhil_iview.h b/sw/microhildesk/view/microhil_iview.h
@@ -64,4 +64,9 @@ class IMHView
     /// @brief Slot for processing requests for triggering view
     /// @param id represents id of requested view
     virtual void onViewChanged(ViewId id) = 0;
+
+    ////////////////////////////////////////////////////////////////////////
+    /// @brief Slot for processing Ok request for serial port changes
+    /// @param state true for confirm operation, else false
+    virtual void onConfirmSerialSettings(bool state) = 0;
 };
diff --git a/sw/microhildesk/view/microhil_view.h b/sw/microhildesk/view/microhil_view.h
@@ -61,6 +61,11 @@ class MHView : public IMHView
     /// @param id represents id of requested view
     void onViewChanged(ViewId id) final;
 
+    ////////////////////////////////////////////////////////////////////////
+    /// @brief Slot for processing Ok request for serial port changes
+    /// @param state true for confirm operation, else false
+    void onConfirmSerialSettings(bool state) final;
+
 private:
     ////////////////////////////////////////////////////////////////////////
     /// @brief UI builder instance

diff --git a/sw/microhildesk/view/microhil_view_map.cc b/sw/microhildesk/view/microhil_view_map.cc
@@ -21,4 +21,8 @@
 void MHView::mapping()
 {
     m_home->viewChanged().connect(sigc::mem_fun(*this, &MHView::onViewChanged));
+
+    m_serial->okSerialTriggered().connect(
+        sigc::mem_fun(*this, &MHView::onConfirmSerialSettings)
+    );
 }
diff --git a/sw/microhildesk/view/microhil_view_slots.cc b/sw/microhildesk/view/microhil_view_slots.cc
@@ -51,3 +51,8 @@ void MHView::onViewChanged(ViewId id)
         break;
     }
 }
+
+void MHView::onConfirmSerialSettings(bool state)
+{
+    m_home->serialSettingsConfirm(state);
+}
diff --git a/sw/microhildesk/view/settings/serial/microhil_view_serial.h b/sw/microhildesk/view/settings/serial/microhil_view_serial.h
@@ -41,51 +41,6 @@ class MHViewSerial : public AbMHViewSerial, public Gtk::Dialog
     /// @return Signal for changed serial settings
     SigSerialSetup serialSetupChanged() final;
 
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Signal for device file path input
-    /// @return Signal for changed device file path entry
-    SigSerialDevicePath serialFilePathChanged() final;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Slot for processing device file path input
-    void onSerialFilePathChanged() final;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Signal for baud-rate combobox
-    /// @return Signal for selected baud-rate combobox
-    SigSerialBaudRate serialBaudRateChanged() final;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Slot for processing baud-rate combobox
-    void onSerialBaudRateChanged() final;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Signal for data-bits combobox
-    /// @return Signal for selected data-bits combobox
-    SigSerialDataBits serialDataBitsChanged() final;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Slot for processing data-bits combobox
-    void onSerialDataBitsChanged() final;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Signal for parity combobox
-    /// @return Signal for selected parity combobox
-    SigSerialParity serialParityChanged() final;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Slot for processing parity combobox
-    void onSerialParityChanged() final;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Signal for stop-bits combobox
-    /// @return Signal for selected stop-bits combobox
-    SigSerialStopBits serialStopBitsChanged() final;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Slot for processing stop-bits combobox
-    void onSerialStopBitsChanged() final;
-
     ////////////////////////////////////////////////////////////////////////
     /// @brief Signal for Cancel button
     /// @return Signal for clicked Cancel button
@@ -151,26 +106,6 @@ class MHViewSerial : public AbMHViewSerial, public Gtk::Dialog
     /// @brief Signal for the serial settings
     SigSerialSetup m_serialSetup{};
 
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Signal for device path input
-    SigSerialDevicePath m_serialDevicePath{};
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Signal for baud-rate combobox
-    SigSerialBaudRate m_serialBaudeRate{};
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Signal for data-bits combobox
-    SigSerialDataBits m_serialDataBits{};
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Signal for parity combobox
-    SigSerialParity m_serialParity{};
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Signal for stop-bits combobox
-    SigSerialStopBits m_serialStopBits{};
-
     ////////////////////////////////////////////////////////////////////////
     /// @brief Signal for Cancel button (dismiss)
     SigCancelSerial m_cancelSerial{};

diff --git a/sw/microhildesk/view/settings/serial/microhil_view_serial_abstract.h b/sw/microhildesk/view/settings/serial/microhil_view_serial_abstract.h
@@ -25,26 +25,6 @@
 /// @brief Signal type for serial settings
 using SigSerialSetup = sigc::signal<void(MHString &, MHVecUInt &)>;
 
-////////////////////////////////////////////////////////////////////////
-/// @brief Signal type for serial device file path input
-using SigSerialDevicePath = sigc::signal<void(MHString &)>;
-
-////////////////////////////////////////////////////////////////////////
-/// @brief Signal type for serial baud rate combobox
-using SigSerialBaudRate = sigc::signal<void(int)>;
-
-////////////////////////////////////////////////////////////////////////
-/// @brief Signal type for serial data bits combobox
-using SigSerialDataBits = sigc::signal<void(int)>;
-
-////////////////////////////////////////////////////////////////////////
-/// @brief Signal type for serial parity combobox
-using SigSerialParity = sigc::signal<void(int)>;
-
-////////////////////////////////////////////////////////////////////////
-/// @brief Signal type for serial stop bits combobox
-using SigSerialStopBits = sigc::signal<void(int)>;
-
 ////////////////////////////////////////////////////////////////////////
 /// @brief Signal type for Cancel button
 using SigCancelSerial = sigc::signal<void(bool)>;
@@ -67,51 +47,6 @@ class AbMHViewSerial
     /// @return Signal for changed serial settings
     virtual SigSerialSetup serialSetupChanged() = 0;
 
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Signal for device file path input
-    /// @return Signal for changed device file path entry
-    virtual SigSerialDevicePath serialFilePathChanged() = 0;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Slot for processing device file path input
-    virtual void onSerialFilePathChanged() = 0;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Signal for baud rate combobox
-    /// @return Signal for selected baud rate combobox
-    virtual SigSerialBaudRate serialBaudRateChanged() = 0;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Slot for processing baud rate combobox
-    virtual void onSerialBaudRateChanged() = 0;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Signal for data bits combobox
-    /// @return Signal for selected data bits combobox
-    virtual SigSerialDataBits serialDataBitsChanged() = 0;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Slot for processing data bits combobox
-    virtual void onSerialDataBitsChanged() = 0;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Signal for parity combobox
-    /// @return Signal for selected parity combobox
-    virtual SigSerialParity serialParityChanged() = 0;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Slot for processing parity combobox
-    virtual void onSerialParityChanged() = 0;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Signal for stop bits combobox
-    /// @return Signal for selected stop bits combobox
-    virtual SigSerialStopBits serialStopBitsChanged() = 0;
-
-    ////////////////////////////////////////////////////////////////////////
-    /// @brief Slot for processing stop bits combobox
-    virtual void onSerialStopBitsChanged() = 0;
-
     ////////////////////////////////////////////////////////////////////////
     /// @brief Signal for Cancel button
     /// @return Signal for clicked Cancel button

diff --git a/sw/microhildesk/view/settings/serial/microhil_view_serial_map.cc b/sw/microhildesk/view/settings/serial/microhil_view_serial_map.cc
@@ -22,26 +22,6 @@ void MHViewSerial::mapping()
 {
     ////////////////////////////////////////////////////////////////////////
     /// Maps all widgets (signals and slots)
-    m_device->signal_changed().connect(
-        sigc::mem_fun(*this, &MHViewSerial::onSerialFilePathChanged)
-    );
-
-    m_baudRate->signal_changed().connect(
-        sigc::mem_fun(*this, &MHViewSerial::onSerialBaudRateChanged)
-    );
-
-    m_dataBits->signal_changed().connect(
-        sigc::mem_fun(*this, &MHViewSerial::onSerialDataBitsChanged)
-    );
-
-    m_parity->signal_changed().connect(
-        sigc::mem_fun(*this, &MHViewSerial::onSerialParityChanged)
-    );
-
-    m_stopBits->signal_changed().connect(
-        sigc::mem_fun(*this, &MHViewSerial::onSerialStopBitsChanged)
-    );
-
     m_cancel->signal_clicked().connect(
         sigc::mem_fun(*this, &MHViewSerial::onCancelSerialTriggered)
     );

diff --git a/sw/microhildesk/view/settings/serial/microhil_view_serial_signals.cc b/sw/microhildesk/view/settings/serial/microhil_view_serial_signals.cc
@@ -23,31 +23,6 @@ SigSerialSetup MHViewSerial::serialSetupChanged()
     return m_serialSetup;
 }
 
-SigSerialDevicePath MHViewSerial::serialFilePathChanged()
-{
-    return m_serialDevicePath;
-}
-
-SigSerialBaudRate MHViewSerial::serialBaudRateChanged()
-{
-    return m_serialBaudeRate;
-}
-
-SigSerialDataBits MHViewSerial::serialDataBitsChanged()
-{
-    return m_serialDataBits;
-}
-
-SigSerialParity MHViewSerial::serialParityChanged()
-{
-    return m_serialParity;
-}
-
-SigSerialStopBits MHViewSerial::serialStopBitsChanged()
-{
-    return m_serialStopBits;
-}
-
 SigCancelSerial MHViewSerial::cancelSerialTriggered()
 {
     return m_cancelSerial;

diff --git a/sw/microhildesk/view/settings/serial/microhil_view_serial_slots.cc b/sw/microhildesk/view/settings/serial/microhil_view_serial_slots.cc
@@ -18,33 +18,12 @@
  */
 #include "microhil_view_serial.h"
 
-void MHViewSerial::onSerialFilePathChanged()
-{
-    // TODO
-}
-
-void MHViewSerial::onSerialBaudRateChanged()
-{
-    // TODO
-}
-
-void MHViewSerial::onSerialDataBitsChanged()
-{
-    // TODO
-}
-
-void MHViewSerial::onSerialParityChanged()
-{
-    // TODO
-}
-
-void MHViewSerial::onSerialStopBitsChanged()
-{
-    // TODO
-}
-
 void MHViewSerial::onCancelSerialTriggered()
 {
+    ////////////////////////////////////////////////////////////////////////
+    /// Emits signal for cancel serial port setings changes
+    m_cancelSerial.emit(true);
+
     this->hide();
 }
 
@@ -64,7 +43,7 @@ void MHViewSerial::onOkSerialTriggered()
 
     ////////////////////////////////////////////////////////////////////////
     /// Emits signal for disabling Connect menu-item in home view
-    // TODO
+    m_okSerial.emit(true);
 
     this->hide();
 }
diff --git a/sw/microhildesk_docs/html/annotated.html b/sw/microhildesk_docs/html/annotated.html
@@ -119,7 +119,7 @@
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated on Mon Oct 2 2023 23:24:13 for microhildesk by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.4 </li>
+    <li class="footer">Generated on Tue Oct 3 2023 20:01:04 for microhildesk by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.4 </li>
   </ul>
 </div>
 </body>

diff --git a/sw/microhildesk_docs/html/classes.html b/sw/microhildesk_docs/html/classes.html
@@ -104,7 +104,7 @@
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated on Mon Oct 2 2023 23:24:13 for microhildesk by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.4 </li>
+    <li class="footer">Generated on Tue Oct 3 2023 20:01:04 for microhildesk by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.4 </li>
   </ul>
 </div>
 </body>

diff --git a/sw/microhildesk_docs/html/d0/d1b/microhil__view__home_8cc.html b/sw/microhildesk_docs/html/d0/d1b/microhil__view__home_8cc.html
@@ -123,7 +123,7 @@
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
     <li class="navelem"><a class="el" href="../../dir_b2f003339c516cc00c8cadcafbe82f13.html">view</a></li><li class="navelem"><a class="el" href="../../dir_114fe11fb74ba151b2b0aa05d224511f.html">home</a></li><li class="navelem"><a class="el" href="../../d0/d1b/microhil__view__home_8cc.html">microhil_view_home.cc</a></li>
-    <li class="footer">Generated on Mon Oct 2 2023 23:24:13 for microhildesk by <a href="https://www.doxygen.org/index.html"><img class="footer" src="../../doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.4 </li>
+    <li class="footer">Generated on Tue Oct 3 2023 20:01:04 for microhildesk by <a href="https://www.doxygen.org/index.html"><img class="footer" src="../../doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.4 </li>
   </ul>
 </div>
 </body>