add attribute dtype for rigister

fosghen · Feb 17, 2025 · dac54cb · dac54cb
1 parent 511e7b8
commit dac54cb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/tablemanager.cpp b/tablemanager.cpp
@@ -183,6 +183,7 @@ void TableManager::pasteJsonData()
             float multy = regInfo.value("multy").toDouble();
             int digits = regInfo.value("digits").toInt();
             int access = regInfo.value("access").toInt();
+            int dtype = regInfo.value("dtype").toInt();
 
             register_.Address = address;
             register_.Value = 0;
@@ -191,6 +192,7 @@ void TableManager::pasteJsonData()
             register_.Multy = multy;
             register_.isWrite = false;
             register_.isRead = false;
+            register_.dtype = dtype;
 
             registers[address] = register_;
             regAddress.append(address);
@@ -253,7 +255,14 @@ void TableManager::chooseAllRegInTab(int index)
 void TableManager::updateTable()
 {
     for (int i = 0; i < regAddress.size(); i++){
-        float value = registers[regAddress[i]].Value;
+        float value;
+        if (registers[regAddress[i]].dtype == ToUint16){
+            value = static_cast<uint16_t>(registers[regAddress[i]].Value);
+        }
+
+        if (registers[regAddress[i]].dtype == ToInt16){
+            value = static_cast<int16_t>(registers[regAddress[i]].Value);
+        }
         value *= registers[regAddress[i]].Multy;
 
         registersTalbeItem[regAddress[i]].setText(QString::number(value, 'f', registers[regAddress[i]].Digits));

diff --git a/tablemanager.h b/tablemanager.h
@@ -28,8 +28,15 @@ class TableManager : public QObject {
         float Multy;
         bool isWrite;
         bool isRead;
+        int dtype;
     };
 
+    enum ConversionType {
+        ToUint16 = 0,
+        ToInt16  = 1
+    };
+    Q_ENUM(ConversionType)
+
     QMap<int, Register> registers;
     int numRegisterRead;
     int startRegAddress;