Fixed log crash issue #56

Author: serhmarch

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.13) # 2.2 - case insensitive syntax
                                      # 3.13 included policy CMP0077
 
-project(ModbusTools VERSION 0.4.4 LANGUAGES CXX)
+project(ModbusTools VERSION 0.4.5 LANGUAGES CXX)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")

src/core/gui/logview/core_logview.cpp

@@ -77,6 +77,9 @@ mbCoreLogView::mbCoreLogView(QWidget *parent)
     //header->setSectionResizeMode(QHeaderView::ResizeToContents);
     //header->hide();
 
+    m_maxSize = 1<<20;
+    m_offset = 0;
+
     m_view = new QPlainTextEdit(this);
     m_view->setReadOnly(true);
     setFontString(Defaults::instance().font);
@@ -141,6 +144,7 @@ void mbCoreLogView::clear()
 {
     //m_model->clear();
     m_view->clear();
+    m_offset = 0;
 }
 
 void mbCoreLogView::exportLog()
@@ -173,5 +177,20 @@ void mbCoreLogView::logMessage(mb::LogFlag flag, const QString &source, const QS
                                        mb::toString(flag),
                                        text);
     }
+    int sz = m_view->document()->characterCount();
+    int linesz = s.size()+1;
+    if ((sz + linesz) > m_maxSize)
+    {
+        QTextCursor cursor = m_view->textCursor();
+        cursor.setPosition(0); // start of document
+        cursor.setPosition(m_offset, QTextCursor::KeepAnchor); // select until offset
+        cursor.removeSelectedText(); // remove the selection
+        //m_view->clear();
+        m_offset = sz-m_offset;
+    }
+    else if ((sz >= m_maxSize/2) && (m_offset == 0))
+    {
+        m_offset = sz;
+    }
     m_view->appendPlainText(s);
 }

src/core/gui/logview/core_logview.h

@@ -75,6 +75,8 @@ public Q_SLOTS:
     mbCore *m_core;
     QToolBar *m_toolBar;
     QPlainTextEdit *m_view;
+    int m_maxSize;
+    int m_offset;
     //QTableView *m_view;
     //mbCoreLogViewModel *m_model;
 };

src/core/sdk/mbcore_config.h

@@ -1,19 +1,19 @@
-#ifndef MBCORE_CONFIG_H
-#define MBCORE_CONFIG_H
-
-/*
-   Major part of mbtools version
-*/
-#define MBTOOLS_VERSION_MAJOR 0
-
-/*
-   Minor part of mbtools version
-*/
-#define MBTOOLS_VERSION_MINOR 4
-
-/*
-   Patch part of mbtools version
-*/
-#define MBTOOLS_VERSION_PATCH 4
-
-#endif // MBCORE_CONFIG_H
+#ifndef MBCORE_CONFIG_H
+#define MBCORE_CONFIG_H
+
+/*
+   Major part of mbtools version
+*/
+#define MBTOOLS_VERSION_MAJOR 0
+
+/*
+   Minor part of mbtools version
+*/
+#define MBTOOLS_VERSION_MINOR 4
+
+/*
+   Patch part of mbtools version
+*/
+#define MBTOOLS_VERSION_PATCH 5
+
+#endif // MBCORE_CONFIG_H

src/server/python/mbconfig.py

@@ -1,24 +1,24 @@
-# -----------------------------------------------------------------------------
-# mbconfig.py
-#
-# DO NOT EDIT THIS FILE! It is autogenerated.
-#
-# This is Python module for ModbusTools server configuration.
-# It is intended to be converted into a usable Python module
-# containing configuration parameters and logic for the Modbus server.
-# -----------------------------------------------------------------------------
-
-# Major part of mbtools version
-MBTOOLS_VERSION_MAJOR = 0
-
-# Minor part of mbtools version
-MBTOOLS_VERSION_MINOR = 4
-
-# Patch part of mbtools version
-MBTOOLS_VERSION_PATCH = 4
-
-# Integer representation of mbtools version
-MBTOOLS_VERSION_INT = (0 << 16) | (4 << 8) | 4
-
-# String representation of mbtools version
-MBTOOLS_VERSION_STR = "0.4.4"
+# -----------------------------------------------------------------------------
+# mbconfig.py
+#
+# DO NOT EDIT THIS FILE! It is autogenerated.
+#
+# This is Python module for ModbusTools server configuration.
+# It is intended to be converted into a usable Python module
+# containing configuration parameters and logic for the Modbus server.
+# -----------------------------------------------------------------------------
+
+# Major part of mbtools version
+MBTOOLS_VERSION_MAJOR = 0
+
+# Minor part of mbtools version
+MBTOOLS_VERSION_MINOR = 4
+
+# Patch part of mbtools version
+MBTOOLS_VERSION_PATCH = 5
+
+# Integer representation of mbtools version
+MBTOOLS_VERSION_INT = (0 << 16) | (4 << 8) | 5
+
+# String representation of mbtools version
+MBTOOLS_VERSION_STR = "0.4.5"

src/version.pri

@@ -1,6 +1,6 @@
 CONFIG += skip_target_version_ext
 
-VERSION = "0.4.4.0"
+VERSION = "0.4.5.0"
 
 #__MBTOOLS_VERSION_LIST__ = $$split(VERSION, .)
 #