Improved fields cloning.

commschamp · Oct 27, 2024 · 9d0abfb · 9d0abfb
1 parent e8d3de0
commit 9d0abfb
Show file tree

Hide file tree

Showing 61 changed files with 217 additions and 175 deletions.
diff --git a/app/cc_view/src/DefaultMessageDisplayHandler.cpp b/app/cc_view/src/DefaultMessageDisplayHandler.cpp
@@ -57,27 +57,27 @@ class WidgetCreator : public ToolsFieldHandler
 
     virtual void handle(field::ToolsIntField& field) override
     {
-        m_widget.reset(new IntValueFieldWidget(field.clone(), m_parent));
+        m_widget.reset(new IntValueFieldWidget(field.actClone(), m_parent));
     }
 
     virtual void handle(field::ToolsUnsignedLongField& field) override
     {
-        m_widget.reset(new UnsignedLongLongIntValueFieldWidget(field.clone(), m_parent));
+        m_widget.reset(new UnsignedLongLongIntValueFieldWidget(field.actClone(), m_parent));
     }
 
     virtual void handle(field::ToolsBitmaskField& field) override
     {
-        m_widget.reset(new BitmaskValueFieldWidget(field.clone(), m_parent));
+        m_widget.reset(new BitmaskValueFieldWidget(field.actClone(), m_parent));
     }
 
     virtual void handle(field::ToolsEnumField& field) override
     {
-        m_widget.reset(new EnumValueFieldWidget(field.clone(), m_parent));
+        m_widget.reset(new EnumValueFieldWidget(field.actClone(), m_parent));
     }
 
     virtual void handle(field::ToolsStringField& field) override
     {
-        m_widget.reset(new StringFieldWidget(field.clone(), m_parent));
+        m_widget.reset(new StringFieldWidget(field.actClone(), m_parent));
     }
 
     virtual void handle(field::ToolsBitfieldField& field) override
@@ -90,7 +90,7 @@ class WidgetCreator : public ToolsFieldHandler
             membersWidgets.push_back(getWidget());
         }
 
-        std::unique_ptr<BitfieldFieldWidget> widget(new BitfieldFieldWidget(field.clone(), m_parent));
+        std::unique_ptr<BitfieldFieldWidget> widget(new BitfieldFieldWidget(field.actClone(), m_parent));
         for (auto& memWidget : membersWidgets) {
             widget->addMemberField(memWidget.release());
         }
@@ -103,7 +103,7 @@ class WidgetCreator : public ToolsFieldHandler
         field.getFieldWrapper().dispatch(*this);
         auto wrappedWidget = getWidget();
 
-        std::unique_ptr<OptionalFieldWidget> widget(new OptionalFieldWidget(field.clone(), m_parent));
+        std::unique_ptr<OptionalFieldWidget> widget(new OptionalFieldWidget(field.actClone(), m_parent));
         widget->setField(wrappedWidget.release());
         m_widget = std::move(widget);
     }
@@ -118,7 +118,7 @@ class WidgetCreator : public ToolsFieldHandler
             membersWidgets.push_back(getWidget());
         }
 
-        std::unique_ptr<BundleFieldWidget> widget(new BundleFieldWidget(field.clone(), m_parent));
+        std::unique_ptr<BundleFieldWidget> widget(new BundleFieldWidget(field.actClone(), m_parent));
         for (auto& memWidget : membersWidgets) {
             widget->addMemberField(memWidget.release());
         }
@@ -128,7 +128,7 @@ class WidgetCreator : public ToolsFieldHandler
 
     virtual void handle(field::ToolsRawDataField& field) override
     {
-        m_widget.reset(new ArrayListRawDataFieldWidget(field.clone(), m_parent));
+        m_widget.reset(new ArrayListRawDataFieldWidget(field.actClone(), m_parent));
     }
 
     virtual void handle(field::ToolsArrayListField& field) override
@@ -152,12 +152,12 @@ class WidgetCreator : public ToolsFieldHandler
             };
 
         assert(field.size() == field.getMembers().size());
-        m_widget.reset(new ArrayListFieldWidget(field.clone(), std::move(createMembersWidgetsFunc), m_parent));
+        m_widget.reset(new ArrayListFieldWidget(field.actClone(), std::move(createMembersWidgetsFunc), m_parent));
     }
 
     virtual void handle(field::ToolsFloatField& field) override
     {
-        m_widget.reset(new FloatValueFieldWidget(field.clone(), m_parent));
+        m_widget.reset(new FloatValueFieldWidget(field.actClone(), m_parent));
     }
 
     virtual void handle(field::ToolsVariantField& field) override
@@ -171,15 +171,15 @@ class WidgetCreator : public ToolsFieldHandler
             };
 
         FieldWidgetPtr memberWidget;
-        auto& memberFieldPtr = field.getCurrent();
-        if (memberFieldPtr) {
+        auto* memberFieldPtr = field.getCurrent();
+        if (memberFieldPtr != nullptr) {
             memberFieldPtr->dispatch(*this);
             memberWidget = getWidget();
         }
 
         std::unique_ptr<VariantFieldWidget> widget(
                     new VariantFieldWidget(
-                        field.clone(),
+                        field.actClone(),
                         createMemberWidgetsFunc,
                         m_parent));
         if (memberWidget) {
@@ -191,7 +191,7 @@ class WidgetCreator : public ToolsFieldHandler
 
     virtual void handle(field::ToolsUnknownField& field) override
     {
-        m_widget.reset(new UnknownValueFieldWidget(field.clone(), m_parent));
+        m_widget.reset(new UnknownValueFieldWidget(field.actClone(), m_parent));
     }
 
     virtual void handle([[maybe_unused]] ToolsField& field) override

diff --git a/app/cc_view/src/widget/field/ArrayListFieldWidget.cpp b/app/cc_view/src/widget/field/ArrayListFieldWidget.cpp
@@ -35,6 +35,7 @@ ArrayListElementWidget::ArrayListElementWidget(
     m_ui.m_layout->addWidget(fieldWidget);
 
     updateUi();
+
     connect(
         m_fieldWidget, SIGNAL(sigFieldUpdated()),
         this, SIGNAL(sigFieldUpdated()));
@@ -96,6 +97,8 @@ ArrayListFieldWidget::ArrayListFieldWidget(
     setSeparatorWidget(m_ui.m_sepLine);
     setSerialisedValueWidget(m_ui.m_serValueWidget);
 
+    performNameLabelUpdate();
+
     assert(m_fieldPtr->canWrite());
     refreshInternal();
     addMissingFields();

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

diff --git a/app/cc_view/src/widget/field/BitfieldFieldWidget.cpp b/app/cc_view/src/widget/field/BitfieldFieldWidget.cpp
@@ -44,6 +44,8 @@ BitfieldFieldWidget::BitfieldFieldWidget(
     assert(m_ui.m_serValueLineEdit != nullptr);
     setSerialisedInputMask(*m_ui.m_serValueLineEdit, m_fieldPtr->width());
 
+    performNameLabelUpdate();
+
     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,6 +46,8 @@ BitmaskValueFieldWidget::BitmaskValueFieldWidget(
 
     prepareCheckboxes();
 
+    performNameLabelUpdate();
+
     refresh();
 
     connect(m_ui.m_serValueLineEdit, SIGNAL(textEdited(const QString&)),

diff --git a/app/cc_view/src/widget/field/BundleFieldWidget.cpp b/app/cc_view/src/widget/field/BundleFieldWidget.cpp
@@ -41,6 +41,8 @@ BundleFieldWidget::BundleFieldWidget(
     m_membersLayout->addWidget(m_label);
     setLayout(m_membersLayout);
     setNameLabelWidget(m_label);
+
+    performNameLabelUpdate();
 }
 
 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,6 +51,8 @@ EnumValueFieldWidget::EnumValueFieldWidget(
 
     populateComboBox();
 
+    performNameLabelUpdate();
+
     refresh();
 
     connect(m_ui.m_valueComboBox, SIGNAL(currentIndexChanged(int)),

diff --git a/app/cc_view/src/widget/field/FieldWidget.cpp b/app/cc_view/src/widget/field/FieldWidget.cpp
@@ -157,6 +157,28 @@ void FieldWidget::updateSerValue(
     text.setPlainText(serValueStr);
 }
 
+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::editEnabledUpdatedImpl()
 {
 }
@@ -203,27 +225,6 @@ 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();
-}
 
 }  // 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,6 +119,8 @@ public slots:
         m_serValueWidget = widget;
     }
 
+    void performNameLabelUpdate();
+
     virtual ToolsField& fieldImpl() = 0;
     virtual void refreshImpl() = 0;
     virtual void editEnabledUpdatedImpl();
@@ -127,8 +129,7 @@ public slots:
 private:
     void performUiElementsVisibilityCheck(const property::field::Common& props);
     void performUiReadOnlyCheck(const property::field::Common& props);
-    void performNameLabelUpdate();
-
+
     bool m_forcedReadOnly = false;
     bool m_editEnabled = true;
     bool m_hiddenWhenReadOnly = false;

diff --git a/app/cc_view/src/widget/field/FloatValueFieldWidget.cpp b/app/cc_view/src/widget/field/FloatValueFieldWidget.cpp
@@ -69,6 +69,8 @@ FloatValueFieldWidget::FloatValueFieldWidget(
 
     createSpecialsWidget(m_fieldPtr->specials());
 
+    performNameLabelUpdate();
+
     refresh();
 
     connect(m_ui.m_valueSpinBox, SIGNAL(valueChanged(double)),

diff --git a/app/cc_view/src/widget/field/LongIntValueFieldWidget.cpp b/app/cc_view/src/widget/field/LongIntValueFieldWidget.cpp
@@ -49,6 +49,8 @@ LongIntValueFieldWidget::LongIntValueFieldWidget(
         static_cast<double>(m_fieldPtr->maxValue()));
     m_ui.m_valueSpinBox->setDecimals(0);
 
+    performNameLabelUpdate();
+
     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,6 +45,8 @@ LongLongIntValueFieldWidget::LongLongIntValueFieldWidget(
     assert(m_ui.m_serValueLineEdit != nullptr);
     setSerialisedInputMask(*m_ui.m_serValueLineEdit, m_fieldPtr->minWidth(), m_fieldPtr->maxWidth());
 
+    performNameLabelUpdate();
+
     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,6 +37,8 @@ OptionalFieldWidget::OptionalFieldWidget(
     m_ui.setupUi(this);
     setNameLabelWidget(m_ui.m_nameLabel);
 
+    performNameLabelUpdate();
+
     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,6 +53,8 @@ ScaledIntValueFieldWidget::ScaledIntValueFieldWidget(
         m_ui.m_valueSpinBox->setDecimals(decimals);
     } 
 
+    performNameLabelUpdate();
+
     refresh();
 
     connect(m_ui.m_valueSpinBox, SIGNAL(valueChanged(double)),

diff --git a/app/cc_view/src/widget/field/ShortIntValueFieldWidget.cpp b/app/cc_view/src/widget/field/ShortIntValueFieldWidget.cpp
@@ -47,6 +47,8 @@ ShortIntValueFieldWidget::ShortIntValueFieldWidget(
         static_cast<int>(m_fieldPtr->minValue()), 
         static_cast<int>(m_fieldPtr->maxValue()));
 
+    performNameLabelUpdate();        
+
     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,6 +35,8 @@ StringFieldWidget::StringFieldWidget(
     setSeparatorWidget(m_ui.m_sepLine);
     setSerialisedValueWidget(m_ui.m_serValueWidget);
 
+    performNameLabelUpdate();
+
     connect(
         m_ui.m_valuePlainTextEdit, SIGNAL(textChanged()),
         this, SLOT(stringChanged()));

diff --git a/app/cc_view/src/widget/field/UnknownValueFieldWidget.cpp b/app/cc_view/src/widget/field/UnknownValueFieldWidget.cpp
@@ -32,6 +32,8 @@ UnknownValueFieldWidget::UnknownValueFieldWidget(
     m_ui.setupUi(this);
     setNameLabelWidget(m_ui.m_nameLabel);
 
+    performNameLabelUpdate();
+
     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,6 +45,8 @@ UnsignedLongLongIntValueFieldWidget::UnsignedLongLongIntValueFieldWidget(
     setSerialisedInputMask(*m_ui.m_serValueLineEdit, m_fieldPtr->minWidth(), m_fieldPtr->maxWidth());
     createSpecialsWidget(m_fieldPtr->specials());
 
+    performNameLabelUpdate();
+
     refresh();
 
     connect(m_ui.m_valueLineEdit, SIGNAL(textEdited(const QString&)),

diff --git a/app/cc_view/src/widget/field/VariantFieldWidget.cpp b/app/cc_view/src/widget/field/VariantFieldWidget.cpp
@@ -50,6 +50,8 @@ VariantFieldWidget::VariantFieldWidget(
     updateIndexValue();
     updateMemberCombo();
 
+    performNameLabelUpdate();
+
     connect(
         m_ui.m_idxSpinBox, SIGNAL(valueChanged(int)),
         this, SLOT(indexUpdated(int)));

diff --git a/lib/include/cc_tools_qt/ToolsField.h b/lib/include/cc_tools_qt/ToolsField.h
@@ -45,6 +45,7 @@ class CC_API ToolsField
     virtual ~ToolsField() noexcept;
 
     ToolsField(const ToolsField&) = delete;
+    ToolsField& operator=(const ToolsField&) = delete;
 
     const char* name() const;
 
@@ -64,7 +65,7 @@ class CC_API ToolsField
 
     void dispatch(ToolsFieldHandler& handler);
 
-    Ptr upClone();
+    Ptr clone();
 
     bool canWrite() const;
 
@@ -81,7 +82,7 @@ class CC_API ToolsField
     virtual SerialisedSeq getSerialisedValueImpl() const = 0;
     virtual bool setSerialisedValueImpl(const SerialisedSeq& value) = 0;
     virtual void dispatchImpl(ToolsFieldHandler& handler) = 0;
-    virtual Ptr upCloneImpl() = 0;
+    virtual Ptr cloneImpl() = 0;
     virtual bool canWriteImpl() const = 0;
     virtual void resetImpl() = 0;
 

diff --git a/lib/include/cc_tools_qt/details/ToolsArrayListFieldImpl.h b/lib/include/cc_tools_qt/details/ToolsArrayListFieldImpl.h
@@ -30,7 +30,6 @@
 #include <functional>
 #include <utility>
 
-
 namespace cc_tools_qt
 {
 
@@ -47,6 +46,7 @@ class ToolsArrayListFieldImpl : public ToolsFieldBase<cc_tools_qt::field::ToolsA
 
 public:
     using SerialisedSeq = typename Base::SerialisedSeq;
+    using Ptr = typename Base::Ptr;
     using ActPtr = typename Base::ActPtr;
     using PrefixFieldInfo = typename Base::PrefixFieldInfo;
 
@@ -149,7 +149,7 @@ class ToolsArrayListFieldImpl : public ToolsFieldBase<cc_tools_qt::field::ToolsA
         adjustFixedSizeInternal(Tag());
     }
 
-    virtual ActPtr cloneImpl() override
+    virtual Ptr cloneImpl() override
     {
         ActPtr ptr(new ToolsArrayListFieldImpl(Base::field()));
         static_cast<ToolsArrayListFieldImpl<TField>*>(ptr.get())->m_wrapFieldFunc = m_wrapFieldFunc;