Release v5.0.1

CMakeLists.txt

@@ -21,19 +21,24 @@ option (CC_TOOLS_QT_BUILD_PLUGIN_UDP_SOCKET "Build UDP socket plugin." ${CC_TOOL
 option (CC_TOOLS_QT_BUILD_PLUGIN_RAW_DATA_PROTOCOL "Build raw data protocol plugin." ${CC_TOOLS_QT_BUILD_PLUGINS})
 option (CC_TOOLS_QT_BUILD_PLUGIN_DEMO_PROTOCOL "Build demo protocol plugin." OFF)
 
-
 # Extra configuration variables
-set (CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to use")
-set (CC_TOOLS_QT_MAJOR_QT_VERSION 5 CACHE STRING "Major Qt version")
+# CC_TOOLS_QT_MAJOR_QT_VERSION - Major Qt version, defaults to 5.
 
-#######################################################################
+# Used standard CMake variables
+# CMAKE_CXX_STANDARD - Defaults to 17.
 
-if (CMAKE_TOOLCHAIN_FILE AND EXISTS ${CMAKE_TOOLCHAIN_FILE})
-    message(STATUS "Loading toolchain from ${CMAKE_TOOLCHAIN_FILE}")
-endif()
+#######################################################################
 
 set (CMAKE_SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/cmake")
 
+if ("${CMAKE_CXX_STANDARD}" STREQUAL "")
+    set (CMAKE_CXX_STANDARD 17)
+endif ()
+
+if ("${CC_TOOLS_QT_MAJOR_QT_VERSION}" STREQUAL "")
+    set (CC_TOOLS_QT_MAJOR_QT_VERSION 5)
+endif ()
+
 include(GNUInstallDirs)
 set (INSTALL_NAME "cc_tools_qt")
 set (LIB_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR})
@@ -136,6 +141,10 @@ include_directories (
 include (${PROJECT_SOURCE_DIR}/cmake/CC_FindQt.cmake)
 cc_find_qt_major ()
 
+set (CMAKE_AUTOMOC ON)
+set (CMAKE_AUTOUIC ON)
+set (CMAKE_AUTORCC ON)
+
 add_subdirectory (lib)
 add_subdirectory (plugin)
 add_subdirectory (app)

README.md

@@ -1,4 +1,4 @@
-# Overview
+# CommsChampion Tools
 This project contains a set of tool applications , which can be used to
 develop, monitor and debug custom binary communication protocols, that were
 developed using the [COMMS Library](https://github.com/commschamp/comms). 
@@ -76,6 +76,8 @@ cmake -DCC_TOOLS_QT_MAJOR_QT_VERSION=6 ...
 It is highly recommended to open main [CMakeLists.txt](CMakeLists.txt) file and review the available
 configuration options and variables.
 
+Since **v5.0** this project uses and requires minimum **C++17** support from the compiler.
+
 # Developing Custom Socket/Filter/Protocol Plugin
 The full tutorial as well as API documentation can be downloaded as
 **doc_cc_tools_qt_vX.zip** archive from

app/cc_dump/src/CMakeLists.txt

@@ -8,12 +8,7 @@ function (bin_cc_dump)
         RecordMessageHandler.cpp
     )
 
-    cc_qt_wrap_cpp(
-        moc
-        AppMgr.h
-    )
-
-    add_executable(${name} ${src} ${moc})
+    add_executable(${name} ${src})
     target_link_libraries(${name} PRIVATE cc::${PROJECT_NAME} Qt::Core)
 
     install (

app/cc_view/src/CMakeLists.txt

@@ -32,8 +32,9 @@ function (bin_cc_view)
         widget/PluginConfigWrapWidget.cpp
         widget/PluginConfigWrapsListWidget.cpp
         widget/MsgCommentDialog.cpp
-        widget/field/FieldWidget.cpp
         widget/MessagesFilterDialog.cpp
+        widget/MessageDisplayWidget.h
+        widget/field/FieldWidget.cpp
         widget/field/ShortIntValueFieldWidget.cpp
         widget/field/LongIntValueFieldWidget.cpp
         widget/field/LongLongIntValueFieldWidget.cpp
@@ -54,49 +55,7 @@ function (bin_cc_view)
         widget/field/SpecialValueWidget.cpp
     )
 
-    cc_qt_wrap_cpp(
-        moc
-        GuiAppMgr.h
-        ShortcutMgr.h
-        widget/MessageDisplayWidget.h
-        widget/MessageWidget.h
-        widget/DefaultMessageWidget.h
-        widget/RecvAreaToolBar.h
-        widget/SendAreaToolBar.h
-        widget/MsgListWidget.h
-        widget/MsgDetailsWidget.h
-        widget/ProtocolsStackWidget.h
-        widget/MessageUpdateDialog.h
-        widget/RawHexDataDialog.h
-        widget/PluginsListWidget.h
-        widget/PluginConfigDialog.h
-        widget/MainWindowWidget.h
-        widget/MainToolbar.h
-        widget/DefaultMessageDisplayWidget.h
-        widget/MsgCommentDialog.h
-        widget/MessagesFilterDialog.h
-        widget/RightPaneWidget.h
-        widget/field/FieldWidget.h 
-        widget/field/ShortIntValueFieldWidget.h
-        widget/field/LongIntValueFieldWidget.h
-        widget/field/LongLongIntValueFieldWidget.h
-        widget/field/UnsignedLongLongIntValueFieldWidget.h
-        widget/field/ScaledIntValueFieldWidget.h
-        widget/field/BitmaskValueFieldWidget.h
-        widget/field/EnumValueFieldWidget.h
-        widget/field/StringFieldWidget.h
-        widget/field/BitfieldFieldWidget.h
-        widget/field/OptionalFieldWidget.h
-        widget/field/BundleFieldWidget.h
-        widget/field/ArrayListRawDataFieldWidget.h
-        widget/field/ArrayListFieldWidget.h
-        widget/field/FloatValueFieldWidget.h
-        widget/field/VariantFieldWidget.h
-        widget/field/UnknownValueFieldWidget.h
-        widget/field/SpecialValueWidget.h
-    )
-
-    cc_qt_wrap_ui(
+    set (
         ui
         ui/MainWindowWidget.ui
         ui/MsgListWidget.ui
@@ -126,15 +85,19 @@ function (bin_cc_view)
         ui/MsgCommentDialog.ui
         ui/MessagesFilterDialog.ui
     )
-
-    cc_qt_add_resources(resources ${CMAKE_CURRENT_SOURCE_DIR}/ui.qrc)
 
+    set (resources
+        ui.qrc
+    )
+
     set (gui_exe)
     if (WIN32 AND ("${CMAKE_BUILD_TYPE}" STREQUAL "Release"))
         set (gui_exe WIN32)
     endif ()
 
-    add_executable(${name} ${gui_exe} ${src} ${moc} ${ui} ${resources})
+    set (CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/ui")
+
+    add_executable(${name} ${gui_exe} ${ui} ${resources} ${src})
     target_link_libraries(${name} PRIVATE cc::${PROJECT_NAME} Qt::Widgets Qt::Core)
 
     install (

app/cc_view/src/widget/DefaultMessageDisplayWidget.cpp

@@ -21,10 +21,14 @@
 
 #include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QSplitter>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 #include "MsgDetailsWidget.h"
 #include "ProtocolsStackWidget.h"
 
+#include "cc_tools_qt/property/message.h"
+
 namespace cc_tools_qt
 {
 
@@ -57,6 +61,7 @@ void DefaultMessageDisplayWidget::displayMessageImpl(
     bool force)
 {
     assert(msg);
+    m_displayedMsg = msg;
     m_msgDetailsWidget->updateTitle(msg);
     m_protocolsDetailsWidget->displayMessage(std::move(msg), force);
 }
@@ -93,7 +98,31 @@ void DefaultMessageDisplayWidget::msgUpdated()
 {
     if (!m_protocolsDetailsWidget->isExtraInfoSelected()) {
         emit sigMsgUpdated();
+        return;
+    }
+
+    assert(m_displayedMsg);
+    if (!m_displayedMsg) {
+        return;
+    }
+
+    auto extraInfoMsg = property::message::ExtraInfoMsg().getFrom(*m_displayedMsg);
+    if ((!extraInfoMsg) || (!extraInfoMsg->isValid())) {
+        return;
+    }
+
+    auto extraData = extraInfoMsg->encodeData();
+    if (extraData.empty()) {
+        property::message::ExtraInfo().setTo(QVariantMap(), *m_displayedMsg);
+        return;
     }
+
+    auto doc =
+        QJsonDocument::fromJson(
+            QByteArray(
+                reinterpret_cast<const char*>(&extraData[0]),
+                static_cast<int>(extraData.size())));
+    property::message::ExtraInfo().setTo(doc.object().toVariantMap(), *m_displayedMsg);    
 }
 
 }  // namespace cc_tools_qt

app/cc_view/src/widget/DefaultMessageDisplayWidget.h

@@ -44,6 +44,7 @@ private slots:
 private:
     MsgDetailsWidget* m_msgDetailsWidget = nullptr;
     ProtocolsStackWidget* m_protocolsDetailsWidget = nullptr;
+    MessagePtr m_displayedMsg;
     bool m_globalEditEnabled = true;
 };
 

cmake/CC_FindQt.cmake

@@ -27,28 +27,3 @@ macro (cc_find_qt_components)
         endif ()        
     endforeach ()
 endmacro ()
-
-macro (cc_qt_wrap_cpp _name)
-    if ("${CC_TOOLS_QT_MAJOR_QT_VERSION}" STREQUAL "5")
-        qt5_wrap_cpp(${_name} ${ARGN})
-    else ()
-        qt_wrap_cpp(${_name} ${ARGN})
-    endif ()
-endmacro ()
-
-macro (cc_qt_wrap_ui _name)
-    if ("${CC_TOOLS_QT_MAJOR_QT_VERSION}" STREQUAL "5")
-        qt5_wrap_ui(${_name} ${ARGN})
-    else ()
-        qt_wrap_ui(${_name} ${ARGN})
-    endif ()
-endmacro ()
-
-macro (cc_qt_add_resources _name)
-    if ("${CC_TOOLS_QT_MAJOR_QT_VERSION}" STREQUAL "5")
-        qt5_add_resources(${_name} ${ARGN})
-    else ()
-        qt_add_resources(${_name} ${ARGN})
-    endif ()
-endmacro ()
-

demo/cc_plugin/CMakeLists.txt

@@ -14,6 +14,7 @@ function (cc_plugin_demo)
 
 
     set (src
+        Plugin.h
         Plugin.cpp
         Protocol.cpp
         TransportMessage.cpp
@@ -29,16 +30,7 @@ function (cc_plugin_demo)
         message/Variants.cpp
     )
 
-    set (hdr
-        Plugin.h
-    )
-
-    cc_qt_wrap_cpp(
-        moc
-        ${hdr}
-    )
-
-    add_library (${name} MODULE ${src} ${moc})
+    add_library (${name} MODULE ${src})
     target_link_libraries(${name} PRIVATE cc::cc_tools_qt)
 
     target_compile_options(${name} PRIVATE

doxygen/page_filter_plugin.dox

@@ -57,6 +57,20 @@
 /// };
 /// @endcode
 ///
+/// @subsection page_filter_plugin_socket_connect Socket Connection Status
+/// The communication link is driven by the @ref page_socket_plugin "socket" plugin.
+/// Quite often it can be necessary for the filter plugin to be aware about socket
+/// connection status. To do so override the virtual @ref cc_tools_qt::Filter::socketConnectionReportImpl()
+/// function
+/// @code
+/// class MyFilter : public cc_tools_qt::Filter
+/// {
+///     ...
+/// protected:
+///     virtual void socketConnectionReportImpl(bool connected) override;
+/// };
+/// @endcode
+///
 /// @subsection page_filter_plugin_data_proc Processing Data
 /// The new incoming data will be reported to the @b filter using virtual
 /// cc_tools_qt::Filter::recvDataImpl(). The derived class must override and

doxygen/page_protocol_plugin.dox

@@ -2,8 +2,7 @@
 /// @tableofcontents
 /// Developing the @b protocol plugins is significantly more complex than
 /// developing the @b socket or @b filter ones. Please follow this tutorial, 
-/// while observing the implementation of the 
-/// <a href="https://github.com/commschamp/cc_tools_qt#demo-protocol">Demo Protocol</a>
+/// while observing the implementation of the <b>Demo Protocol</b>
 /// (the sources are 
 /// <a href="https://github.com/commschamp/cc_tools_qt/tree/master/demo">here</a>) 
 /// provided as part of the

doxygen/page_socket_plugin.dox

@@ -107,7 +107,7 @@
 /// the data has arrived from in case of network socket. Such extra information 
 /// can be reported by the driving application when reporting received message details.
 /// For example, take a look at 
-/// <a href="https://github.com/commschamp/cc_tools_qt/blob/master/plugin/tcp_socket/server/Socket.cpp">TCP/IP Server Socket</a> implementation.
+/// <a href="https://github.com/commschamp/cc_tools_qt/blob/master/plugin/tcp_socket/server/TcpServerSocket.cpp">TCP/IP Server Socket</a> implementation.
 /// 
 /// @subsection page_socket_plugin_data_send Sending Data
 /// The socket object receives requests to send outgoing data using call to

lib/include/cc_tools_qt/version.h

@@ -28,7 +28,7 @@
 #define CC_TOOLS_QT_MINOR_VERSION 0U
 
 /// @brief Patch level of the library
-#define CC_TOOLS_QT_PATCH_VERSION 0U
+#define CC_TOOLS_QT_PATCH_VERSION 1U
 
 /// @brief Macro to create numeric version as single unsigned number
 #define CC_TOOLS_QT_MAKE_VERSION(major_, minor_, patch_) \

lib/src/CMakeLists.txt

@@ -37,12 +37,7 @@ function (lib_tools)
         property/field.cpp
     )
 
-    cc_qt_wrap_cpp(
-        moc
-        MsgSendMgrImpl.h
-    )
-
-    add_library(${name} SHARED ${src} ${moc})
+    add_library(${name} SHARED ${src})
     add_library (cc::${PROJECT_NAME} ALIAS ${name})
 
     target_link_libraries(${name} PUBLIC cc::comms Qt::Widgets Qt::Core ${CC_PLATFORM_SPECIFIC})

lib/src/MsgMgrImpl.cpp

@@ -310,7 +310,7 @@ void MsgMgrImpl::addFilter(FilterPtr filter)
             data.append(std::move(dataPtr));
             for (auto iter = m_filters.rbegin() + static_cast<std::intmax_t>(revIdx); iter != m_filters.rend(); ++iter) {
 
-                if (!data.isEmpty()) {
+                if (data.isEmpty()) {
                     break;
                 }
 

plugin/echo_socket/CMakeLists.txt

@@ -19,19 +19,10 @@ function (plugin_echo_socket)
     set (src
         EchoSocket.cpp
         EchoSocketPlugin.cpp
-    )
-
-    set (hdr
-        EchoSocket.h
         EchoSocketPlugin.h
     )
 
-    cc_qt_wrap_cpp(
-        moc
-        ${hdr}
-    )
-
-    add_library (${name} MODULE ${src} ${moc})
+    add_library (${name} MODULE ${src})
     target_link_libraries(${name} PRIVATE cc::${PROJECT_NAME} Qt::Core)
 
     install (

plugin/null_socket/CMakeLists.txt

@@ -19,18 +19,10 @@ function (plugin_null_socket)
     set (src
         NullSocket.cpp
         NullSocketPlugin.cpp
-    )
-
-    set (hdr
         NullSocketPlugin.h
     )
 
-    cc_qt_wrap_cpp(
-        moc
-        ${hdr}
-    )
-
-    add_library (${name} MODULE ${src} ${moc})
+    add_library (${name} MODULE ${src})
     target_link_libraries(${name} PRIVATE cc::${PROJECT_NAME} Qt::Core)
 
     install (