Fix bugs

Author: serhmarch

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5) # 2.2 - case insensitive syntax
 
-project(ModbusTools VERSION 0.3.0 LANGUAGES CXX)
+project(ModbusTools VERSION 0.3.1 LANGUAGES CXX)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")

bugfix.md

@@ -31,4 +31,9 @@ Fixed a crash bug for the 'readCoils' and 'readDiscreteInputs' functions when th
 
 # 0.2.2
 
-Fix Action value updates - Not Following Defined Register and Byte Order
+Fix Action value updates - Not Following Defined Register and Byte Order
+
+# 0.3.1
+
+* Fix bug of client/server crash when create/open project
+* Fix bug of client/server when change port settings it doesn't reflect in port name in status bar 

changelog.md

@@ -48,3 +48,8 @@
 * Add possibility to save DataViewItem values in values when saving project for Client
 * Upgrade status bar with Tx/Rx statistic
 * Add `Copy` action type
+
+# 0.3.1
+
+* Make project builder more tolerant for unexpected attribute or element
+* Fixed bugs

src/client/win_resource.rc

@@ -3,8 +3,8 @@
 IDI_ICON1	ICON	DISCARDABLE	"gui\\icons\\client.ico"
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 0,3,0,0
-	PRODUCTVERSION 0,3,0,0
+	FILEVERSION 0,3,1,0
+	PRODUCTVERSION 0,3,1,0
 	FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 	FILEFLAGS VS_FF_DEBUG
@@ -21,11 +21,11 @@ VS_VERSION_INFO VERSIONINFO
 			BEGIN
 				VALUE "CompanyName", "\0"
 				VALUE "FileDescription", "\0"
-				VALUE "FileVersion", "0.3.0.0\0"
+				VALUE "FileVersion", "0.3.1.0\0"
 				VALUE "LegalCopyright", "\0"
 				VALUE "OriginalFilename", "client.exe\0"
 				VALUE "ProductName", "client\0"
-				VALUE "ProductVersion", "0.3.0.0\0"
+				VALUE "ProductVersion", "0.3.1.0\0"
 			END
 		END
 		BLOCK "VarFileInfo"

src/core/gui/core_ui.cpp

@@ -765,20 +765,16 @@ void mbCoreUi::currentPortChanged(mbCorePort *port)
         old->disconnect(this);
     m_currentPort = port;
     refreshCurrentPortName();
-    mbCorePort::Statistic stat = port->statistic();
+    mbCorePort::Statistic stat;
     if (port)
     {
         connect(port, &mbCorePort::changed           , this, &mbCoreUi::refreshCurrentPortName);
         connect(port, &mbCorePort::statCountTxChanged, this, &mbCoreUi::setStatTx             );
         connect(port, &mbCorePort::statCountRxChanged, this, &mbCoreUi::setStatRx             );
-        setStatTx(stat.countTx);
-        setStatRx(stat.countRx);
-    }
-    else
-    {
-        setStatTx(stat.countTx);
-        setStatRx(stat.countRx);
+        stat = port->statistic();
     }
+    setStatTx(stat.countTx);
+    setStatRx(stat.countRx);
 }
 
 void mbCoreUi::refreshCurrentPortName()

src/core/project/core_dom.cpp

@@ -24,15 +24,21 @@
 
 #include "core_dataview.h"
 
-mbCoreDom::~mbCoreDom()
+void mbCoreXmlStreamReader::raiseWarning(const QString &text)
 {
+    m_warnings.append(QString("Warning (row=%1, column=%2): %3").arg(QString::number(this->lineNumber()),
+                                                                     QString::number(this->columnNumber()),
+                                                                     text));
 }
 
-void mbCoreXmlStreamReader::raiseWarning(const QString &text)
+void mbCoreXmlStreamReader::processUnexpectedElement(const QString &name)
+{
+    raiseWarning(QString("Unexpected element '%1'").arg(name));
+    skipCurrentElement();
+}
+
+mbCoreDom::~mbCoreDom()
 {
-    m_warnings.append(QString("Warning (row=%1, column=%2): '%3'").arg(QString::number(this->lineNumber()),
-                                                                       QString::number(this->columnNumber()),
-                                                                       text));
 }
 
 // -----------------------------------------------------------------------------------------------------------------------
@@ -66,7 +72,7 @@ void mbCoreDomDataViewItem::read(mbCoreXmlStreamReader &reader)
     Q_FOREACH (const QXmlStreamAttribute &attribute, reader.attributes())
     {
         QStringRef name = attribute.name();
-        reader.raiseError(QStringLiteral("Unexpected attribute ") + name.toString());
+        reader.raiseWarning(QString("Unexpected attribute '%1'").arg(name.toString()));
     }
 
     for (bool finished = false; !finished && !reader.hasError();)
@@ -163,7 +169,7 @@ void mbCoreDomDataView::read(mbCoreXmlStreamReader &reader)
             setPeriod(attribute.value().toInt());
             continue;
         }
-        reader.raiseError(QStringLiteral("Unexpected attribute ") + name.toString());
+        reader.raiseWarning(QString("Unexpected attribute '%1'").arg(name.toString()));
     }
 
     for (bool finished = false; !finished && !reader.hasError();)
@@ -180,7 +186,7 @@ void mbCoreDomDataView::read(mbCoreXmlStreamReader &reader)
                 m_items.append(item);
                 continue;
             }
-            reader.raiseError(QStringLiteral("Unexpected element ") + tag);
+            reader.processUnexpectedElement(tag);
         }
         break;
         case mbCoreXmlStreamReader::EndElement :
@@ -245,7 +251,7 @@ void mbCoreDomDevice::read(mbCoreXmlStreamReader &reader)
         QStringRef name = attribute.name();
         if (readAttribute(reader, attribute))
             continue;
-        reader.raiseError(QStringLiteral("Unexpected attribute ") + name.toString());
+        reader.raiseWarning(QString("Unexpected attribute '%1'").arg(name.toString()));
     }
 
     for (bool finished = false; !finished && !reader.hasError();)
@@ -341,7 +347,7 @@ void mbCoreDomPort::read(mbCoreXmlStreamReader &reader)
         QStringRef name = attribute.name();
         if (readAttribute(reader, attribute))
             continue;
-        reader.raiseError(QStringLiteral("Unexpected attribute ") + name.toString());
+        reader.raiseWarning(QString("Unexpected attribute '%1'").arg(name.toString()));
     }
 
     for (bool finished = false; !finished && !reader.hasError();)
@@ -447,7 +453,7 @@ void mbCoreDomTaskInfo::read(mbCoreXmlStreamReader &reader)
             setType(attribute.value().toString());
             continue;
         }
-        reader.raiseError(QStringLiteral("Unexpected attribute ") + name.toString());
+        reader.raiseWarning(QString("Unexpected attribute '%1'").arg(name.toString()));
     }
 
     for (bool finished = false; !finished && !reader.hasError();)
@@ -590,8 +596,7 @@ void mbCoreDomProject::read(mbCoreXmlStreamReader &reader)
             }
             if (readElement(reader, tag))
                 continue;
-            reader.skipCurrentElement();
-            reader.raiseWarning(QStringLiteral("Unexpected element ") + tag);
+            reader.processUnexpectedElement(tag);
         }
             break;
         case mbCoreXmlStreamReader::EndElement :

src/core/project/core_dom.h

@@ -39,6 +39,7 @@ class MB_EXPORT mbCoreXmlStreamReader : public QXmlStreamReader
     inline int warningCount() const { return m_warnings.count(); }
     inline QStringList warnings() const { return m_warnings; }
     void raiseWarning(const QString &text);
+    void processUnexpectedElement(const QString &name);
 
 protected:
     QStringList m_warnings;

src/core/project/core_port.cpp

@@ -244,7 +244,7 @@ bool mbCorePort::setSettings(const MBSETTINGS &settings)
         if (ok)
             setTimeoutInterByte(v);
     }
-
+    Q_EMIT changed();
     return true;
 }
 

src/core/project/core_port.h

@@ -54,6 +54,11 @@ class MB_EXPORT mbCorePort : public QObject
 
     struct Statistic
     {
+        Statistic()
+        {
+            countTx = 0;
+            countRx = 0;
+        }
         quint32 countTx;
         quint32 countRx;
     };

src/core/sdk/mbcore_config.h

@@ -14,6 +14,6 @@
 /*
    Patch part of mbtools version
 */
-#define MBTOOLS_VERSION_PATCH 0
+#define MBTOOLS_VERSION_PATCH 1
 
 #endif // MBCORE_CONFIG_H