ComponentFlatView now regenerates all widgets on group property change

GUI/coregui/Views/PropertyEditor/ComponentFlatView.cpp

@@ -30,6 +30,8 @@ ComponentFlatView::ComponentFlatView(QWidget* parent)
     : QWidget(parent)
     , m_mainLayout(new QVBoxLayout)
     , m_gridLayout(nullptr)
+    , m_currentItem(nullptr)
+    , m_model(nullptr)
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
@@ -45,6 +47,40 @@ void ComponentFlatView::addItemProperties(SessionItem* item)
 {
     Q_ASSERT(item);
 
+    m_currentItem = item;
+    setModel(m_currentItem->model());
+
+    updateItemProperties(m_currentItem);
+}
+
+void ComponentFlatView::setModel(SessionModel* model)
+{
+    if (m_model) {
+        disconnect(m_model, &SessionModel::dataChanged, this, &ComponentFlatView::onDataChanged);
+
+    }
+
+    m_model = model;
+
+    if (m_model) {
+        connect(m_model, &SessionModel::dataChanged, this, &ComponentFlatView::onDataChanged);
+    }
+
+}
+
+void ComponentFlatView::onDataChanged(const QModelIndex& topLeft, const QModelIndex&,
+                                      const QVector<int>& )
+{
+    SessionItem *item = m_model->itemForIndex(topLeft);
+    Q_ASSERT(item);
+    if (item->modelType() == Constants::GroupItemType)
+        updateItemProperties(m_currentItem);
+}
+
+void ComponentFlatView::updateItemProperties(SessionItem* item)
+{
+    Q_ASSERT(item);
+
     clearLayout();
 
     int nrow(0);
@@ -57,6 +93,7 @@ void ComponentFlatView::addItemProperties(SessionItem* item)
         widget->addToGrid(m_gridLayout, ++nrow);
         m_widgetItems.push_back(widget);
     }
+
 }
 
 void ComponentFlatView::clearLayout()

GUI/coregui/Views/PropertyEditor/ComponentFlatView.h

@@ -21,6 +21,7 @@
 #include <QWidget>
 
 class SessionItem;
+class SessionModel;
 class QGridLayout;
 class QBoxLayout;
 class PropertyWidgetItem;
@@ -37,7 +38,13 @@ public:
 
     void addItemProperties(SessionItem* item);
 
+    void setModel(SessionModel* model);
+
+public slots:
+    void onDataChanged(const QModelIndex &topLeft, const QModelIndex &, const QVector<int> &);
+
 private:
+    void updateItemProperties(SessionItem* item);
     void clearLayout();
     void initGridLayout();
     PropertyWidgetItem* createWidget(SessionItem* item);
@@ -45,6 +52,8 @@ private:
     QBoxLayout* m_mainLayout;
     QGridLayout* m_gridLayout;
     QVector<PropertyWidgetItem*> m_widgetItems;
+    SessionItem* m_currentItem;
+    SessionModel* m_model;
 };
 
 #endif

GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.cpp

@@ -37,12 +37,14 @@ PropertyWidgetItem::PropertyWidgetItem(QWidget* parent)
 PropertyWidgetItem::~PropertyWidgetItem()
 {
     delete m_label;
-    delete m_editor;
+    // if editor's action leads to deletion of the editor itself, we have to give him chance to
+    // send all signals
+    m_editor->deleteLater();
 }
 
 void PropertyWidgetItem::setItemEditor(SessionItem* item, QWidget* editor)
 {
-    delete m_editor;
+    Q_ASSERT(m_editor == nullptr);
     m_editor = editor;
 
     m_label->setText(item->displayName());

GUI/coregui/Views/PropertyEditor/TestComponentView.cpp

@@ -147,8 +147,8 @@ void TestComponentView::onSelectionChanged(const QItemSelection& selected, const
 
         auto item = m_sourceModel->itemForIndex(indices.front());
         m_obsoleteEditor->setItem(item, item->modelType());
-//        m_obsoleteBoxEditor->clearEditor();
-//        m_obsoleteBoxEditor->addPropertyItems(item);
+        m_obsoleteBoxEditor->clearEditor();
+        m_obsoleteBoxEditor->addPropertyItems(item);
 
         m_componentFlat->addItemProperties(item);
     }

Tests/UnitTests/GUI/TestComponentUtils.h

@@ -14,6 +14,7 @@ public:
 
 private slots:
     void test_componentItems();
+    void test_componentItemsFFChange();
 };
 
 //! Testing component items of particle item.
@@ -38,3 +39,25 @@ inline void TestComponentUtils::test_componentItems()
     QCOMPARE(itemList.size(), 6);
     QCOMPARE(itemList, expectedList);
 }
+
+inline void TestComponentUtils::test_componentItemsFFChange()
+{
+    SessionModel model("TestModel");
+
+    SessionItem* particle = model.insertNewItem(Constants::ParticleType);
+    SessionItem* group = particle->getItem(ParticleItem::P_FORM_FACTOR);
+
+    particle->setGroupProperty(ParticleItem::P_FORM_FACTOR, Constants::FullSphereType);
+    SessionItem* sphereItem = particle->getGroupItem(ParticleItem::P_FORM_FACTOR);
+
+    QList<SessionItem*> expectedList = QList<SessionItem*> ()
+            << group
+            << sphereItem->getItem(FullSphereItem::P_RADIUS)
+            << particle->getItem(ParticleItem::P_MATERIAL)
+            << particle->getItem(ParticleItem::P_ABUNDANCE)
+            << particle->getItem(ParticleItem::P_POSITION);
+
+    auto itemList = ComponentUtils::componentItems(*particle);
+    QCOMPARE(itemList.size(), 5);
+    QCOMPARE(itemList, expectedList);
+}