Moving "serializedHidden" info from properties to the field object it…

…self.
commschamp · Oct 29, 2024 · 3c60d06 · 3c60d06
1 parent 3d57557
commit 3c60d06
Show file tree

Hide file tree

Showing 33 changed files with 148 additions and 120 deletions.
diff --git a/app/cc_view/src/widget/field/ArrayListFieldWidget.cpp b/app/cc_view/src/widget/field/ArrayListFieldWidget.cpp
@@ -97,7 +97,7 @@ ArrayListFieldWidget::ArrayListFieldWidget(
     setSeparatorWidget(m_ui.m_sepLine);
     setSerialisedValueWidget(m_ui.m_serValueWidget);
 
-    performNameLabelUpdate();
+    commonConstruct();
 
     assert(m_fieldPtr->canWrite());
     refreshInternal();

diff --git a/app/cc_view/src/widget/field/ArrayListRawDataFieldWidget.cpp b/app/cc_view/src/widget/field/ArrayListRawDataFieldWidget.cpp
@@ -36,7 +36,7 @@ ArrayListRawDataFieldWidget::ArrayListRawDataFieldWidget(
     setSeparatorWidget(m_ui.m_sepLine);
     setSerialisedValueWidget(m_ui.m_serValueWidget);
 
-    performNameLabelUpdate();
+    commonConstruct();
 
     refresh();
 

diff --git a/app/cc_view/src/widget/field/BitfieldFieldWidget.cpp b/app/cc_view/src/widget/field/BitfieldFieldWidget.cpp
@@ -44,7 +44,7 @@ BitfieldFieldWidget::BitfieldFieldWidget(
     assert(m_ui.m_serValueLineEdit != nullptr);
     setSerialisedInputMask(*m_ui.m_serValueLineEdit, m_fieldPtr->width());
 
-    performNameLabelUpdate();
+    commonConstruct();
 
     connect(m_ui.m_serValueLineEdit, SIGNAL(textEdited(const QString&)),
             this, SLOT(serialisedValueUpdated(const QString&)));

diff --git a/app/cc_view/src/widget/field/BitmaskValueFieldWidget.cpp b/app/cc_view/src/widget/field/BitmaskValueFieldWidget.cpp
@@ -46,7 +46,7 @@ BitmaskValueFieldWidget::BitmaskValueFieldWidget(
 
     prepareCheckboxes();
 
-    performNameLabelUpdate();
+    commonConstruct();
 
     refresh();
 

diff --git a/app/cc_view/src/widget/field/BundleFieldWidget.cpp b/app/cc_view/src/widget/field/BundleFieldWidget.cpp
@@ -42,7 +42,7 @@ BundleFieldWidget::BundleFieldWidget(
     setLayout(m_membersLayout);
     setNameLabelWidget(m_label);
 
-    performNameLabelUpdate();
+    commonConstruct();
 }
 
 BundleFieldWidget::~BundleFieldWidget() noexcept = default;

diff --git a/app/cc_view/src/widget/field/EnumValueFieldWidget.cpp b/app/cc_view/src/widget/field/EnumValueFieldWidget.cpp
@@ -51,7 +51,7 @@ EnumValueFieldWidget::EnumValueFieldWidget(
 
     populateComboBox();
 
-    performNameLabelUpdate();
+    commonConstruct();
 
     refresh();
 

diff --git a/app/cc_view/src/widget/field/FieldWidget.cpp b/app/cc_view/src/widget/field/FieldWidget.cpp
@@ -73,7 +73,6 @@ void FieldWidget::updateProperties(const QVariantMap& props)
 {
     property::field::Common commonProps(props);
     m_hiddenWhenReadOnly = commonProps.isHiddenWhenReadOnly();
-    performNameLabelUpdate();
     updatePropertiesImpl(props);
     performUiElementsVisibilityCheck(commonProps);
     performUiReadOnlyCheck(commonProps);
@@ -157,26 +156,10 @@ void FieldWidget::updateSerValue(
     text.setPlainText(serValueStr);
 }
 
-void FieldWidget::performNameLabelUpdate()
+void FieldWidget::commonConstruct()
 {
-    if (m_nameLabel == nullptr) {
-        return;
-    }
-
-    auto& f = fieldImpl();
-    QString str = f.name();
-    if (str.isEmpty()) {
-        m_nameLabel->hide();
-        return;
-    }
-
-    if (!m_nameSuffix.isEmpty()) {
-        str.append(m_nameSuffix);
-    }
-
-    str.append(':');
-    m_nameLabel->setText(str);
-    m_nameLabel->show();
+    performNameLabelUpdate();
+    performSerVisibilityUpdate();
 }
 
 void FieldWidget::editEnabledUpdatedImpl()
@@ -202,18 +185,6 @@ void FieldWidget::performUiElementsVisibilityCheck(const property::field::Common
         (m_serValueWidget == nullptr)) {
         return;
     }
-
-    auto setWidgetHiddenFunc =
-        [](QWidget* widget, bool hidden)
-        {
-            if (widget != nullptr) {
-                widget->setHidden(hidden);
-            }
-        };
-
-    auto serHidden = props.isSerialisedHidden();
-    setWidgetHiddenFunc(m_sepWidget, serHidden);
-    setWidgetHiddenFunc(m_serValueWidget, serHidden);
 }
 
 void FieldWidget::performUiReadOnlyCheck(const property::field::Common& props)
@@ -225,6 +196,43 @@ void FieldWidget::performUiReadOnlyCheck(const property::field::Common& props)
     }
 }
 
+void FieldWidget::performNameLabelUpdate()
+{
+    if (m_nameLabel == nullptr) {
+        return;
+    }
+
+    auto& f = fieldImpl();
+    QString str = f.name();
+    if (str.isEmpty()) {
+        m_nameLabel->hide();
+        return;
+    }
+
+    if (!m_nameSuffix.isEmpty()) {
+        str.append(m_nameSuffix);
+    }
+
+    str.append(':');
+    m_nameLabel->setText(str);
+    m_nameLabel->show();
+}
+
+void FieldWidget::performSerVisibilityUpdate()
+{
+    auto setWidgetHiddenFunc =
+        [](QWidget* widget, bool hidden)
+        {
+            if (widget != nullptr) {
+                widget->setHidden(hidden);
+            }
+        };
+
+    auto& f = fieldImpl();
+    bool serHidden = f.isHiddenSerialization();
+    setWidgetHiddenFunc(m_sepWidget, serHidden);
+    setWidgetHiddenFunc(m_serValueWidget, serHidden);    
+}
 
 }  // namespace cc_tools_qt
 
diff --git a/app/cc_view/src/widget/field/FieldWidget.h b/app/cc_view/src/widget/field/FieldWidget.h
@@ -119,7 +119,7 @@ public slots:
         m_serValueWidget = widget;
     }
 
-    void performNameLabelUpdate();
+    void commonConstruct();
 
     virtual ToolsField& fieldImpl() = 0;
     virtual void refreshImpl() = 0;
@@ -129,6 +129,8 @@ public slots:
 private:
     void performUiElementsVisibilityCheck(const property::field::Common& props);
     void performUiReadOnlyCheck(const property::field::Common& props);
+    void performNameLabelUpdate();
+    void performSerVisibilityUpdate();
 
     bool m_forcedReadOnly = false;
     bool m_editEnabled = true;

diff --git a/app/cc_view/src/widget/field/FloatValueFieldWidget.cpp b/app/cc_view/src/widget/field/FloatValueFieldWidget.cpp
@@ -69,7 +69,7 @@ FloatValueFieldWidget::FloatValueFieldWidget(
 
     createSpecialsWidget(m_fieldPtr->specials());
 
-    performNameLabelUpdate();
+    commonConstruct();
 
     refresh();
 

diff --git a/app/cc_view/src/widget/field/LongIntValueFieldWidget.cpp b/app/cc_view/src/widget/field/LongIntValueFieldWidget.cpp
@@ -49,7 +49,7 @@ LongIntValueFieldWidget::LongIntValueFieldWidget(
         static_cast<double>(m_fieldPtr->maxValue()));
     m_ui.m_valueSpinBox->setDecimals(0);
 
-    performNameLabelUpdate();
+    commonConstruct();
 
     connect(m_ui.m_valueSpinBox, SIGNAL(valueChanged(double)),
             this, SLOT(valueUpdated(double)));

diff --git a/app/cc_view/src/widget/field/LongLongIntValueFieldWidget.cpp b/app/cc_view/src/widget/field/LongLongIntValueFieldWidget.cpp
@@ -45,7 +45,7 @@ LongLongIntValueFieldWidget::LongLongIntValueFieldWidget(
     assert(m_ui.m_serValueLineEdit != nullptr);
     setSerialisedInputMask(*m_ui.m_serValueLineEdit, m_fieldPtr->minWidth(), m_fieldPtr->maxWidth());
 
-    performNameLabelUpdate();
+    commonConstruct();
 
     connect(m_ui.m_valueLineEdit, SIGNAL(textEdited(const QString&)),
             this, SLOT(valueUpdated(const QString&)));

diff --git a/app/cc_view/src/widget/field/OptionalFieldWidget.cpp b/app/cc_view/src/widget/field/OptionalFieldWidget.cpp
@@ -37,7 +37,7 @@ OptionalFieldWidget::OptionalFieldWidget(
     m_ui.setupUi(this);
     setNameLabelWidget(m_ui.m_nameLabel);
 
-    performNameLabelUpdate();
+    commonConstruct();
 
     if (m_fieldPtr->getMode() == Mode::Tentative) {
         m_fieldPtr->setMode(Mode::Missing);

diff --git a/app/cc_view/src/widget/field/ScaledIntValueFieldWidget.cpp b/app/cc_view/src/widget/field/ScaledIntValueFieldWidget.cpp
@@ -53,7 +53,7 @@ ScaledIntValueFieldWidget::ScaledIntValueFieldWidget(
         m_ui.m_valueSpinBox->setDecimals(decimals);
     } 
 
-    performNameLabelUpdate();
+    commonConstruct();
 
     refresh();
 

diff --git a/app/cc_view/src/widget/field/ShortIntValueFieldWidget.cpp b/app/cc_view/src/widget/field/ShortIntValueFieldWidget.cpp
@@ -47,7 +47,7 @@ ShortIntValueFieldWidget::ShortIntValueFieldWidget(
         static_cast<int>(m_fieldPtr->minValue()), 
         static_cast<int>(m_fieldPtr->maxValue()));
 
-    performNameLabelUpdate();        
+    commonConstruct();        
 
     connect(m_ui.m_valueSpinBox, SIGNAL(valueChanged(int)),
             this, SLOT(valueUpdated(int)));

diff --git a/app/cc_view/src/widget/field/StringFieldWidget.cpp b/app/cc_view/src/widget/field/StringFieldWidget.cpp
@@ -35,7 +35,7 @@ StringFieldWidget::StringFieldWidget(
     setSeparatorWidget(m_ui.m_sepLine);
     setSerialisedValueWidget(m_ui.m_serValueWidget);
 
-    performNameLabelUpdate();
+    commonConstruct();
 
     connect(
         m_ui.m_valuePlainTextEdit, SIGNAL(textChanged()),

diff --git a/app/cc_view/src/widget/field/UnknownValueFieldWidget.cpp b/app/cc_view/src/widget/field/UnknownValueFieldWidget.cpp
@@ -32,7 +32,7 @@ UnknownValueFieldWidget::UnknownValueFieldWidget(
     m_ui.setupUi(this);
     setNameLabelWidget(m_ui.m_nameLabel);
 
-    performNameLabelUpdate();
+    commonConstruct();
 
     connect(m_ui.m_serValueLineEdit, SIGNAL(textChanged(const QString&)),
             this, SLOT(serialisedValueUpdated(const QString&)));

diff --git a/app/cc_view/src/widget/field/UnsignedLongLongIntValueFieldWidget.cpp b/app/cc_view/src/widget/field/UnsignedLongLongIntValueFieldWidget.cpp
@@ -45,7 +45,7 @@ UnsignedLongLongIntValueFieldWidget::UnsignedLongLongIntValueFieldWidget(
     setSerialisedInputMask(*m_ui.m_serValueLineEdit, m_fieldPtr->minWidth(), m_fieldPtr->maxWidth());
     createSpecialsWidget(m_fieldPtr->specials());
 
-    performNameLabelUpdate();
+    commonConstruct();
 
     refresh();
 

diff --git a/app/cc_view/src/widget/field/VariantFieldWidget.cpp b/app/cc_view/src/widget/field/VariantFieldWidget.cpp
@@ -44,13 +44,13 @@ VariantFieldWidget::VariantFieldWidget(
     setNameLabelWidget(m_ui.m_nameLabel);
     setValueWidget(m_ui.m_valueWidget);
     setSeparatorWidget(m_ui.m_sepLine);
-    setSerialisedValueWidget(m_ui.m_serValueWidget);\
+    setSerialisedValueWidget(m_ui.m_serValueWidget);
 
     m_ui.m_idxSpinBox->setMaximum(m_fieldPtr->getMembersCount() - 1);
     updateIndexValue();
     updateMemberCombo();
 
-    performNameLabelUpdate();
+    commonConstruct();
 
     connect(
         m_ui.m_idxSpinBox, SIGNAL(valueChanged(int)),

diff --git a/demo/cc_plugin/DemoMessage.cpp b/demo/cc_plugin/DemoMessage.cpp
@@ -37,7 +37,7 @@ namespace
 static QVariantList createFieldsProperties()
 {
     QVariantList props;
-    props.append(cc::property::field::IntValue().serialisedHidden().hiddenWhenReadOnly().asMap());
+    props.append(cc::property::field::IntValue().hiddenWhenReadOnly().asMap());
 
     assert(props.size() == demo::DemoMessage<>::TransportFieldIdx_numOfValues);
     return props;

diff --git a/demo/cc_plugin/message/Bitfields.cpp b/demo/cc_plugin/message/Bitfields.cpp
@@ -40,39 +40,28 @@ using ProtMsg = demo::cc_plugin::message::Bitfields::ProtMsg;
 QVariantMap createField1BitmaskProperties()
 {
     using Field = ProtMsg::Field_field1::Field_member1;
-    auto props = 
-        cc::property::field::ForField<Field>()
-        .serialisedHidden();
+    auto props = cc::property::field::ForField<Field>();
     return props.asMap();
 }
 
 QVariantMap createField1EnumProperties()
 {
     using Field = ProtMsg::Field_field1::Field_member2;
-    auto props = 
-        cc::property::field::ForField<Field>()
-            .serialisedHidden();
-
+    auto props = cc::property::field::ForField<Field>();
     return props.asMap();
 }
 
 QVariantMap createField1Int1Properties()
 {
     using Field = ProtMsg::Field_field1::Field_member3;
-    auto props = 
-        cc::property::field::ForField<Field>()
-            .serialisedHidden();
-
+    auto props = cc::property::field::ForField<Field>();
     return props.asMap();
 }
 
 QVariantMap createField1Int2Properties()
 {
     using Field = ProtMsg::Field_field1::Field_member4;
-    auto props = 
-        cc::property::field::ForField<Field>()
-            .serialisedHidden();
-
+    auto props = cc::property::field::ForField<Field>();
     return props.asMap();
 }
 

diff --git a/demo/cc_plugin/message/Bundles.cpp b/demo/cc_plugin/message/Bundles.cpp
@@ -58,7 +58,6 @@ QVariantMap createProps_field1()
     using Field = ProtMsg::Field_field1;
     auto props =
         cc::property::field::ForField<Field>()
-            .serialisedHidden()
             .add(createProps_field1_mem1())
             .add(createProps_field1_mem2());
     assert(props.members().size() == Field::FieldIdx_numOfValues);
@@ -68,8 +67,7 @@ QVariantMap createProps_field1()
 QVariantMap createProps_field2_mem1()
 {
     using Field = ProtMsg::Field_field2::Field_length;
-    auto props =
-        cc::property::field::ForField<Field>();
+    auto props = cc::property::field::ForField<Field>();
     return props.asMap();
 }
 
@@ -86,7 +84,6 @@ QVariantMap createProps_field2()
     using Field = ProtMsg::Field_field2;
     auto props =
         cc::property::field::ForField<Field>()
-            .serialisedHidden()
             .add(createProps_field2_mem1())
             .add(createProps_field2_mem2());
     assert(props.members().size() == Field::FieldIdx_numOfValues);

diff --git a/demo/cc_plugin/message/Lists.cpp b/demo/cc_plugin/message/Lists.cpp
@@ -42,10 +42,7 @@ QVariantMap createField3Properties()
     using Field3 = ProtMsg::Field_field3;
     cc::property::field::ForField<Field3> props;
     props.appendIndexToElementName();
-    props.add(
-        cc::property::field::IntValue()
-            .serialisedHidden()
-            .asMap());
+    props.add(cc::property::field::IntValue().asMap());
     return props.asMap();
 }
 
@@ -54,7 +51,7 @@ QVariantMap createField4Properties()
     return
         cc::property::field::ForField<ProtMsg::Field_field4>()
             .appendIndexToElementName()
-            .add(cc::property::field::IntValue().serialisedHidden().asMap())
+            .add(cc::property::field::IntValue().asMap())
             .asMap();
 }
 
@@ -65,12 +62,11 @@ QVariantMap createField5Properties()
             .appendIndexToElementName()
             .add(
                 cc::property::field::ForField<ProtMsg::Field_field5::ValueType::value_type>()
-                    .add(cc::property::field::IntValue().serialisedHidden().asMap())
-                    .add(cc::property::field::IntValue().serialisedHidden().asMap())
-                    .add(cc::property::field::IntValue().serialisedHidden().asMap())
-                    .serialisedHidden()
+                    .add(cc::property::field::IntValue().asMap())
+                    .add(cc::property::field::IntValue().asMap())
+                    .add(cc::property::field::IntValue().asMap())
                     .asMap())
-//            .serialisedHidden()
+//            
 //            .showPrefix()
 //            .prefixName("length")
             .asMap();