Make 'Status' field in client's DataView list looks normal

serhmarch · serhmarch · commit 019390d1c935 · 2024-10-20T20:35:34.000+03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5) # 2.2 - case insensitive syntax
 
-project(ModbusTools VERSION 0.3.4 LANGUAGES CXX)
+project(ModbusTools VERSION 0.3.5 LANGUAGES CXX)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
diff --git a/src/client/gui/dataview/client_dataviewmodel.cpp b/src/client/gui/dataview/client_dataviewmodel.cpp
@@ -74,8 +74,10 @@ QVariant mbClientDataViewModel::data(const QModelIndex &index, int role) const
     mbClientDataViewItem* d = dataView()->item(index.row());
     if (d)
     {
-        if ((role == Qt::DisplayRole) || (role == Qt::EditRole))
+        switch (role)
         {
+        case Qt::DisplayRole:
+        case Qt::EditRole:
             switch(index.column())
             {
             case Column_Device:
@@ -90,9 +92,8 @@ QVariant mbClientDataViewModel::data(const QModelIndex &index, int role) const
             case Column_Timestamp: return mb::toString(d->timestamp());
             case Column_Value    : return d->value();
             }
-        }
-        else if (role == Qt::BackgroundRole)
-        {
+            break;
+        case Qt::BackgroundRole:
             switch(index.column())
             {
             case Column_Status:
@@ -106,10 +107,17 @@ QVariant mbClientDataViewModel::data(const QModelIndex &index, int role) const
                     return QBrush(QColor(0xCC, 0xFF, 0xCC));
                 if (Modbus::StatusIsBad(static_cast<Modbus::StatusCode>(status)))
                     return QBrush(QColor(0xFF, 0xCC, 0xCC));
+            }
+                break;
             }
             break;
+        case Qt::ForegroundRole:
+            switch(index.column())
+            {
+            case Column_Status:
+                return QBrush(Qt::black);
             }
-
+            break;
         }
     }
     return QVariant();
diff --git a/src/client/win_resource.rc b/src/client/win_resource.rc
@@ -3,8 +3,8 @@
 IDI_ICON1	ICON	DISCARDABLE	"gui\\icons\\client.ico"
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 0,3,4,0
-	PRODUCTVERSION 0,3,4,0
+	FILEVERSION 0,3,5,0
+	PRODUCTVERSION 0,3,5,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.4.0\0"
+				VALUE "FileVersion", "0.3.5.0\0"
 				VALUE "LegalCopyright", "\0"
 				VALUE "OriginalFilename", "client.exe\0"
 				VALUE "ProductName", "client\0"
-				VALUE "ProductVersion", "0.3.4.0\0"
+				VALUE "ProductVersion", "0.3.5.0\0"
 			END
 		END
 		BLOCK "VarFileInfo"
diff --git a/src/core/sdk/mbcore_config.h b/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 3
-
-/*
-   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 3
+
+/*
+   Patch part of mbtools version
+*/
+#define MBTOOLS_VERSION_PATCH 5
+
+#endif // MBCORE_CONFIG_H
diff --git a/src/core/win_resource.rc b/src/core/win_resource.rc
@@ -3,8 +3,8 @@
 
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 0,3,4,0
-	PRODUCTVERSION 0,3,4,0
+	FILEVERSION 0,3,5,0
+	PRODUCTVERSION 0,3,5,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.4.0\0"
+				VALUE "FileVersion", "0.3.5.0\0"
 				VALUE "LegalCopyright", "\0"
 				VALUE "OriginalFilename", "core.dll\0"
 				VALUE "ProductName", "core\0"
-				VALUE "ProductVersion", "0.3.4.0\0"
+				VALUE "ProductVersion", "0.3.5.0\0"
 			END
 		END
 		BLOCK "VarFileInfo"
diff --git a/src/server/win_resource.rc b/src/server/win_resource.rc
@@ -3,8 +3,8 @@
 IDI_ICON1	ICON	DISCARDABLE	"gui\\icons\\server.ico"
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 0,3,4,0
-	PRODUCTVERSION 0,3,4,0
+	FILEVERSION 0,3,5,0
+	PRODUCTVERSION 0,3,5,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.4.0\0"
+				VALUE "FileVersion", "0.3.5.0\0"
 				VALUE "LegalCopyright", "\0"
 				VALUE "OriginalFilename", "server.exe\0"
 				VALUE "ProductName", "server\0"
-				VALUE "ProductVersion", "0.3.4.0\0"
+				VALUE "ProductVersion", "0.3.5.0\0"
 			END
 		END
 		BLOCK "VarFileInfo"
diff --git a/src/version.pri b/src/version.pri
@@ -1,6 +1,6 @@
 CONFIG += skip_target_version_ext
 
-VERSION = "0.3.4.0"
+VERSION = "0.3.5.0"
 
 #__MBTOOLS_VERSION_LIST__ = $$split(VERSION, .)
 #

Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,10 @@ QVariant mbClientDataViewModel::data(const QModelIndex &index, int role) const`
`74`	`74`	`mbClientDataViewItem* d = dataView()->item(index.row());`
`75`	`75`	`if (d)`
`76`	`76`	`{`
`77`		`- if ((role == Qt::DisplayRole) \|\| (role == Qt::EditRole))`
	`77`	`+ switch (role)`
`78`	`78`	`{`
	`79`	`+ case Qt::DisplayRole:`
	`80`	`+ case Qt::EditRole:`
`79`	`81`	`switch(index.column())`
`80`	`82`	`{`
`81`	`83`	`case Column_Device:`
`@@ -90,9 +92,8 @@ QVariant mbClientDataViewModel::data(const QModelIndex &index, int role) const`
`90`	`92`	`case Column_Timestamp: return mb::toString(d->timestamp());`
`91`	`93`	`case Column_Value : return d->value();`
`92`	`94`	`}`
`93`		`- }`
`94`		`- else if (role == Qt::BackgroundRole)`
`95`		`- {`
	`95`	`+ break;`
	`96`	`+ case Qt::BackgroundRole:`
`96`	`97`	`switch(index.column())`
`97`	`98`	`{`
`98`	`99`	`case Column_Status:`
`@@ -106,10 +107,17 @@ QVariant mbClientDataViewModel::data(const QModelIndex &index, int role) const`
`106`	`107`	`return QBrush(QColor(0xCC, 0xFF, 0xCC));`
`107`	`108`	`if (Modbus::StatusIsBad(static_cast<Modbus::StatusCode>(status)))`
`108`	`109`	`return QBrush(QColor(0xFF, 0xCC, 0xCC));`
	`110`	`+ }`
	`111`	`+ break;`
`109`	`112`	`}`
`110`	`113`	`break;`
	`114`	`+ case Qt::ForegroundRole:`
	`115`	`+ switch(index.column())`
	`116`	`+ {`
	`117`	`+ case Column_Status:`
	`118`	`+ return QBrush(Qt::black);`
`111`	`119`	`}`
`112`		`-`
	`120`	`+ break;`
`113`	`121`	`}`
`114`	`122`	`}`
`115`	`123`	`return QVariant();`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`CONFIG += skip_target_version_ext`
`2`	`2`
`3`		`-VERSION = "0.3.4.0"`
	`3`	`+VERSION = "0.3.5.0"`
`4`	`4`
`5`	`5`	`#__MBTOOLS_VERSION_LIST__ = $$split(VERSION, .)`
`6`	`6`	`#`