Moving display decimals for scaled int values to be provided by the p…

…rotocol defintion.
commschamp · Oct 22, 2024 · bc665b9 · bc665b9
1 parent dad0fe3
commit bc665b9
Show file tree

Hide file tree

Showing 13 changed files with 107 additions and 78 deletions.
diff --git a/app/cc_view/src/widget/field/IntValueFieldWidget.cpp b/app/cc_view/src/widget/field/IntValueFieldWidget.cpp
@@ -69,7 +69,7 @@ void IntValueFieldWidget::updatePropertiesImpl(const QVariantMap& props)
     assert(m_fieldPtr);
     assert(!m_childWidget);
     do {
-        if (property::field::IntValue(props).hasScaledDecimals()) {
+        if (m_fieldPtr->hasScaledDecimals()) {
             m_childWidget.reset(new ScaledIntValueFieldWidget(std::move(m_fieldPtr)));
             break;
         }

diff --git a/app/cc_view/src/widget/field/ScaledIntValueFieldWidget.cpp b/app/cc_view/src/widget/field/ScaledIntValueFieldWidget.cpp
@@ -28,13 +28,6 @@
 namespace cc_tools_qt
 {
 
-namespace
-{
-
-const int DefaultInitialDecimals = 6;
-
-} // namespace
-
 ScaledIntValueFieldWidget::ScaledIntValueFieldWidget(
     FieldPtr fieldPtr,
     QWidget* parentObj)
@@ -54,7 +47,11 @@ ScaledIntValueFieldWidget::ScaledIntValueFieldWidget(
     m_ui.m_valueSpinBox->setRange(
         m_fieldPtr->scaleValue(m_fieldPtr->minValue()),
         m_fieldPtr->scaleValue(m_fieldPtr->maxValue()));
-    m_ui.m_valueSpinBox->setDecimals(DefaultInitialDecimals);
+
+    auto decimals = m_fieldPtr->scaledDecimals();
+    if (0 < decimals) {
+        m_ui.m_valueSpinBox->setDecimals(decimals);
+    } 
 
     refresh();
 
@@ -106,18 +103,6 @@ void ScaledIntValueFieldWidget::editEnabledUpdatedImpl()
 void ScaledIntValueFieldWidget::updatePropertiesImpl(const QVariantMap& props)
 {
     property::field::IntValue actProps(props);
-
-    auto decimals = property::field::IntValue(props).scaledDecimals();
-
-    if (0 < decimals) {
-        m_ui.m_valueSpinBox->setDecimals(decimals);
-    }
-    else {
-        [[maybe_unused]] static constexpr bool Should_not_happen = false;
-        assert(Should_not_happen);  
-        m_ui.m_valueSpinBox->setDecimals(0);
-    }
-
     refresh();
 }
 

diff --git a/app/cc_view/src/widget/field/UnsignedLongLongIntValueFieldWidget.cpp b/app/cc_view/src/widget/field/UnsignedLongLongIntValueFieldWidget.cpp
@@ -32,7 +32,8 @@ UnsignedLongLongIntValueFieldWidget::UnsignedLongLongIntValueFieldWidget(
     FieldPtr fieldPtr,
     QWidget* parentObj)
   : Base(parentObj),
-    m_fieldPtr(std::move(fieldPtr))
+    m_fieldPtr(std::move(fieldPtr)),
+    m_decimals(m_fieldPtr->scaledDecimals())
 {
     m_ui.setupUi(this);
     setNameLabelWidget(m_ui.m_nameLabel);
@@ -97,7 +98,6 @@ void UnsignedLongLongIntValueFieldWidget::updatePropertiesImpl(const QVariantMap
 {
     property::field::IntValue parsedProps(props);
     m_offset = parsedProps.displayOffset();
-    m_decimals = parsedProps.scaledDecimals();
     refresh();
 }
 

diff --git a/demo/cc_plugin/message/FloatValues.cpp b/demo/cc_plugin/message/FloatValues.cpp
@@ -42,14 +42,8 @@ QVariantList createFieldsProperties()
     QVariantList props;
     props.append(cc::property::field::ForField<ProtMsg::Field_field1>().asMap());
     props.append(cc::property::field::ForField<ProtMsg::Field_field2>().asMap());
-    props.append(
-        cc::property::field::ForField<ProtMsg::Field_field3>()
-            .scaledDecimals(2)
-            .asMap());
-    props.append(
-        cc::property::field::ForField<ProtMsg::Field_field4>()
-            .scaledDecimals(11)
-            .asMap());
+    props.append(cc::property::field::ForField<ProtMsg::Field_field3>().asMap());
+    props.append(cc::property::field::ForField<ProtMsg::Field_field4>().asMap());
 
     assert(props.size() == ProtMsg::FieldIdx_numOfValues);
     return props;

diff --git a/demo/protocol/include/demo/message/FloatValues.h b/demo/protocol/include/demo/message/FloatValues.h
@@ -164,7 +164,12 @@ struct FloatValuesFields
             static const std::size_t MapSize = std::extent<decltype(Map)>::value;
 
             return std::make_pair(&Map[0], MapSize);
-        }                         
+        }    
+
+        static constexpr unsigned displayDecimals()
+        {
+            return 2U;
+        }                             
     };
 
     /// @brief Floating point value serialised as 5 byte integer with (1e-11) scaling ratio.
@@ -185,8 +190,13 @@ struct FloatValuesFields
 
         static const char* name()
         {
-            return "field1";
-        }                 
+            return "field4";
+        } 
+
+        static constexpr unsigned displayDecimals()
+        {
+            return 11U;
+        }                          
     };
 
     /// @brief All the fields bundled in std::tuple.

diff --git a/lib/include/cc_tools_qt/details/ToolsIntFieldImpl.h b/lib/include/cc_tools_qt/details/ToolsIntFieldImpl.h
@@ -106,29 +106,51 @@ class ToolsIntFieldImpl : public ToolsNumericFieldImpl<cc_tools_qt::field::Tools
         using Tag = 
             std::conditional_t<
                 Field::hasSpecials(),
-                HasSpecialsTag,
-                NoSpecialstag
+                HasFeatureTag,
+                NoFeatureTag
             >;
 
         return specialsInternal(Tag());
     }
 
+    virtual int scaledDecimalsImpl() const override
+    {
+        using Tag = 
+            std::conditional_t<
+                Field::hasScaling(),
+                HasFeatureTag,
+                NoFeatureTag
+            >;
+
+        return scaledDecimalsInternal(Tag());        
+    }
+
 private:
-    struct HasSpecialsTag{};    
-    struct NoSpecialstag{};
+    struct HasFeatureTag{};    
+    struct NoFeatureTag{};
 
-    static const SpecialsList& specialsInternal(HasSpecialsTag)
+    static const SpecialsList& specialsInternal(HasFeatureTag)
     {
         static const SpecialsList List = createSpecialsList();
         return List;
     }
 
-    static const SpecialsList& specialsInternal(NoSpecialstag)
+    static const SpecialsList& specialsInternal(NoFeatureTag)
     {
         static const SpecialsList List;
         return List;
     }  
 
+    static int scaledDecimalsInternal(HasFeatureTag)
+    {
+        return Field::displayDecimals();
+    }
+
+    static int scaledDecimalsInternal(NoFeatureTag)
+    {
+        return 0;
+    }  
+
     static SpecialsList createSpecialsList()
     {
         SpecialsList result;

diff --git a/lib/include/cc_tools_qt/details/ToolsUnsignedLongFieldImpl.h b/lib/include/cc_tools_qt/details/ToolsUnsignedLongFieldImpl.h
@@ -105,29 +105,51 @@ class ToolsUnsignedLongFieldImpl : public ToolsNumericFieldImpl<cc_tools_qt::fie
         using Tag = 
             std::conditional_t<
                 Field::hasSpecials(),
-                HasSpecialsTag,
-                NoSpecialstag
+                HasFeatureTag,
+                NoFeatureTag
             >;
 
         return specialsInternal(Tag());
     }
 
+    virtual int scaledDecimalsImpl() const override
+    {
+        using Tag = 
+            std::conditional_t<
+                Field::hasScaling(),
+                HasFeatureTag,
+                NoFeatureTag
+            >;
+
+        return scaledDecimalsInternal(Tag());        
+    }    
+
 private:
-    struct HasSpecialsTag{};    
-    struct NoSpecialstag{};
+    struct HasFeatureTag{};    
+    struct NoFeatureTag{};
 
-    static const SpecialsList& specialsInternal(HasSpecialsTag)
+    static const SpecialsList& specialsInternal(HasFeatureTag)
     {
         static const SpecialsList List = createSpecialsList();
         return List;
     }
 
-    static const SpecialsList& specialsInternal(NoSpecialstag)
+    static const SpecialsList& specialsInternal(NoFeatureTag)
     {
         static const SpecialsList List;
         return List;
     }  
 
+    static int scaledDecimalsInternal(HasFeatureTag)
+    {
+        return Field::displayDecimals();
+    }
+
+    static int scaledDecimalsInternal(NoFeatureTag)
+    {
+        return 0;
+    }     
+
     static SpecialsList createSpecialsList()
     {
         SpecialsList result;

diff --git a/lib/include/cc_tools_qt/field/ToolsIntField.h b/lib/include/cc_tools_qt/field/ToolsIntField.h
@@ -64,6 +64,9 @@ class CC_API ToolsIntField : public details::ToolsNumericFieldBase<long long int
 
     const SpecialsList& specials() const;
 
+    bool hasScaledDecimals() const;
+    int scaledDecimals() const;
+
 protected:
     virtual UnderlyingType minValueImpl() const = 0;
     virtual UnderlyingType maxValueImpl() const = 0;
@@ -74,6 +77,7 @@ class CC_API ToolsIntField : public details::ToolsNumericFieldBase<long long int
     virtual std::size_t valueTypeSizeImpl() const = 0;
     virtual ActPtr cloneImpl() = 0;
     virtual const SpecialsList& specialsImpl() const = 0;
+    virtual int scaledDecimalsImpl() const = 0;
 
     virtual void dispatchImpl(ToolsFieldHandler& handler) override;
 };

diff --git a/lib/include/cc_tools_qt/field/ToolsUnsignedLongField.h b/lib/include/cc_tools_qt/field/ToolsUnsignedLongField.h
@@ -66,6 +66,9 @@ class CC_API ToolsUnsignedLongField : public cc_tools_qt::details::ToolsNumericF
 
     const SpecialsList& specials() const;
 
+    bool hasScaledDecimals() const;
+    int scaledDecimals() const;    
+
 protected:
     virtual UnderlyingType minValueImpl() const = 0;
     virtual UnderlyingType maxValueImpl() const = 0;
@@ -76,6 +79,7 @@ class CC_API ToolsUnsignedLongField : public cc_tools_qt::details::ToolsNumericF
     virtual std::size_t valueTypeSizeImpl() const = 0;
     virtual ActPtr cloneImpl() = 0;
     virtual const SpecialsList& specialsImpl() const = 0;
+    virtual int scaledDecimalsImpl() const = 0;
 
     virtual void dispatchImpl(ToolsFieldHandler& handler) override;
 };

diff --git a/lib/include/cc_tools_qt/property/field.h b/lib/include/cc_tools_qt/property/field.h
@@ -240,25 +240,13 @@ class CC_API IntValue : public CommonBase<IntValue>
     /// @brief Set numeric offset for displayed field
     IntValue& displayOffset(long long value);
 
-    /// @brief Check whether property of having scaled decimals being set
-    bool hasScaledDecimals() const;
-
-    /// @brief Get number of digits after decimal point when displaying
-    ///     scaled value.
-    int scaledDecimals() const;
-
-    /// @brief Set number of digits after decimal point when displaying scaled
-    ///     value.
-    IntValue& scaledDecimals(int value);
-
     /// @brief Retrieve all properties as map.
     QVariantMap asMap() const;
 
 private:
     void getFrom(const QVariantMap& props);
 
     long long m_displayOffset = 0;
-    int m_scaledDecimals = 0;
 };
 
 /// @brief Class to contain all the properties relevant to

diff --git a/lib/src/field/ToolsIntField.cpp b/lib/src/field/ToolsIntField.cpp
@@ -74,6 +74,16 @@ const ToolsIntField::SpecialsList& ToolsIntField::specials() const
     return specialsImpl();
 }
 
+bool ToolsIntField::hasScaledDecimals() const
+{
+    return 0 < scaledDecimals();
+}
+
+int ToolsIntField::scaledDecimals() const
+{
+    return scaledDecimalsImpl();
+}
+
 void ToolsIntField::dispatchImpl(ToolsFieldHandler& handler)
 {
     handler.handle(*this);

diff --git a/lib/src/field/ToolsUnsignedLongField.cpp b/lib/src/field/ToolsUnsignedLongField.cpp
@@ -74,6 +74,16 @@ const ToolsUnsignedLongField::SpecialsList& ToolsUnsignedLongField::specials() c
     return specialsImpl();
 }
 
+bool ToolsUnsignedLongField::hasScaledDecimals() const
+{
+    return 0 < scaledDecimals();
+}
+
+int ToolsUnsignedLongField::scaledDecimals() const
+{
+    return scaledDecimalsImpl();
+}
+
 void ToolsUnsignedLongField::dispatchImpl(ToolsFieldHandler& handler)
 {
     handler.handle(*this);

diff --git a/lib/src/property/field.cpp b/lib/src/property/field.cpp
@@ -215,38 +215,18 @@ IntValue& IntValue::displayOffset(long long value)
     return *this;
 }
 
-bool IntValue::hasScaledDecimals() const
-{
-    return 0 < scaledDecimals();
-}
-
-int IntValue::scaledDecimals() const
-{
-    return m_scaledDecimals;
-}
-
-IntValue& IntValue::scaledDecimals(int value)
-{
-    m_scaledDecimals = value;
-    return *this;
-}
-
 QVariantMap IntValue::asMap() const
 {
     QVariantMap props;
     Base::setTo(props);
     Base::setElemTo(m_displayOffset, numValueDisplayOffsetKey(), props);
-    Base::setElemTo(m_scaledDecimals, floatDecimalsKey(), props);
     return props;
 }
 
 void IntValue::getFrom(const QVariantMap& props)
 {
     m_displayOffset =
         getElemFrom<decltype(m_displayOffset)>(props, numValueDisplayOffsetKey());
-
-    m_scaledDecimals =
-        getElemFrom<decltype(m_scaledDecimals)>(props, floatDecimalsKey());
 }
 
 EnumValue::EnumValue() = default;