Bug fix: fields that ask for scaling, even with a scaler of 1.0, shou…

…ld get it.
billvaglienti · Oct 26, 2017 · 2d08eea · 2d08eea
1 parent ef0dcbd
commit 2d08eea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/protocolfield.cpp b/protocolfield.cpp
@@ -3490,8 +3490,9 @@ bool ProtocolField::isFloatScaling(void) const
 {
     if(inMemoryType.isFloat)
     {
-        if(scaler != 1.0)
-            return true;
+        // If the user input a scaler string, then they want float scaling
+        if(!scalerString.isEmpty() || (scaler != 1.0))
+           return true;
 
         // The min value only matters if we are signed
         if(!encodedType.isSigned && (encodedMin != 0.0))

diff --git a/protocolparser.cpp b/protocolparser.cpp
@@ -17,7 +17,7 @@
 #include <iostream>
 
 // The version of the protocol generator is set here
-const QString ProtocolParser::genVersion = "2.8.b";
+const QString ProtocolParser::genVersion = "2.8.c";
 
 /*!
  * \brief ProtocolParser::ProtocolParser