implement duplicateLayoutItem()

GUI/View/SampleDesigner/ParticleLayoutForm.cpp

@@ -28,10 +28,10 @@
 #include <QAction>
 #include <QPushButton>
 
-ParticleLayoutForm::ParticleLayoutForm(LayerForm* parent, ParticleLayoutItem* layoutItem,
+ParticleLayoutForm::ParticleLayoutForm(LayerForm* form, ParticleLayoutItem* layout,
                                        SampleEditorController* ec)
-    : QGroupBox(parent)
-    , m_layoutItem(layoutItem)
+    : QGroupBox(form)
+    , m_layoutItem(layout)
     , m_ec(ec)
 {
     FormLayouter layouter(this, ec);
@@ -40,50 +40,47 @@ ParticleLayoutForm::ParticleLayoutForm(LayerForm* parent, ParticleLayoutItem* la
     m_totalDensitySpinBox =
         layouter.widgetAt<DoubleSpinBox*>(rowOfTotalDensity, QFormLayout::FieldRole);
     ASSERT(m_totalDensitySpinBox);
-    layouter.addRow(new InterferenceForm(this, layoutItem, ec));
+    layouter.addRow(new InterferenceForm(this, layout, ec));
 
     for (auto* particle : m_layoutItem->itemsWithParticles())
         layouter.addRow(
             LayerEditorUtil::createWidgetForItemWithParticles(this, particle, true, ec));
 
     auto* btn = LayerEditorUtil::createAddParticleButton(
-        this,
-        [=](FormFactorItemCatalog::Type type) { ec->addParticleLayoutItem(layoutItem, type); },
-        [=](ItemWithParticlesCatalog::Type type) { ec->addParticleLayoutItem(layoutItem, type); });
+        this, [=](FormFactorItemCatalog::Type type) { ec->addParticleLayoutItem(layout, type); },
+        [=](ItemWithParticlesCatalog::Type type) { ec->addParticleLayoutItem(layout, type); });
     m_structureEditingWidgets << btn;
     layouter.addStructureEditingRow(btn);
 
     m_collapser = GroupBoxCollapser::installIntoGroupBox(this);
-    m_collapser->setExpanded(layoutItem->isExpandLayout());
+    m_collapser->setExpanded(layout->isExpandLayout());
     connect(m_collapser, &GroupBoxCollapser::toggled, this,
-            [layoutItem](bool b) { layoutItem->setExpandLayout(b); });
+            [layout](bool b) { layout->setExpandLayout(b); });
 
     // top right corner actions
     // show in real space
     {
         auto* showInRealspaceAction = ActionFactory::createShowInRealspaceAction(
-            this, "particle layout", [ec, layoutItem] { ec->requestViewInRealspace(layoutItem); });
+            this, "particle layout", [ec, layout] { ec->requestViewInRealspace(layout); });
         m_collapser->addAction(showInRealspaceAction);
     }
     // duplicate
     {
         m_duplicateAction = ActionFactory::createDuplicateAction(
-            this, "particle layout", [ec, parent] { ec->duplicateLayoutItem(parent); });
+            this, "particle layout", [ec, layout, form] { ec->duplicateLayoutItem(form, layout); });
         m_collapser->addAction(m_duplicateAction);
     }
     // remove
     {
-        m_removeAction =
-            ActionFactory::createRemoveAction(this, "particle layout", [ec, layoutItem, parent] {
-                ec->removeLayoutItem(parent, layoutItem);
-            });
+        m_removeAction = ActionFactory::createRemoveAction(
+            this, "particle layout", [ec, layout, form] { ec->removeLayoutItem(form, layout); });
         m_collapser->addAction(m_removeAction);
     }
 
     m_layout = layouter.layout();
 
     updateDensityEnabling();
-    updateTitle(parent->layerItem());
+    updateTitle(form->layerItem());
 }
 
 void ParticleLayoutForm::enableStructureEditing(bool b)

GUI/View/SampleDesigner/ParticleLayoutForm.h

@@ -31,8 +31,7 @@ class SampleEditorController;
 class ParticleLayoutForm : public QGroupBox {
     Q_OBJECT
 public:
-    ParticleLayoutForm(LayerForm* parent, ParticleLayoutItem* layoutItem,
-                       SampleEditorController* ec);
+    ParticleLayoutForm(LayerForm* form, ParticleLayoutItem* layoutItem, SampleEditorController* ec);
 
     void enableStructureEditing(bool b);
     ParticleLayoutItem* layoutItem() const;

GUI/View/SampleDesigner/SampleEditorController.cpp

@@ -156,10 +156,9 @@ void SampleEditorController::removeLayerItemFromUndo(int atIndex)
     emit modified();
 }
 
-void SampleEditorController::addLayoutItem(LayerForm* layerForm)
+void SampleEditorController::onLayoutAdded(LayerForm* layerForm, ParticleLayoutItem* layout)
 {
-    auto* newLayoutItem = layerForm->layerItem()->addLayoutItem();
-    layerForm->onLayoutAdded(newLayoutItem);
+    layerForm->onLayoutAdded(layout);
     m_sampleForm->updateUnits();
 
     for (auto* layoutForms : layerForm->findChildren<ParticleLayoutForm*>())
@@ -168,9 +167,17 @@ void SampleEditorController::addLayoutItem(LayerForm* layerForm)
     emit modified();
 }
 
-void SampleEditorController::duplicateLayoutItem(LayerForm* layerForm)
+void SampleEditorController::addLayoutItem(LayerForm* layerForm)
+{
+    auto* newLayoutItem = layerForm->layerItem()->addLayoutItem();
+    onLayoutAdded(layerForm, newLayoutItem);
+}
+
+void SampleEditorController::duplicateLayoutItem(LayerForm* layerForm, ParticleLayoutItem* layout)
 {
-    std::cout << "duplicateLayoutItem\n";
+    auto* newLayoutItem = layerForm->layerItem()->addLayoutItem();
+    GUI::Util::copyContents(layout, newLayoutItem);
+    onLayoutAdded(layerForm, newLayoutItem);
 }
 
 void SampleEditorController::removeLayoutItem(LayerForm* layerItemWidget,

GUI/View/SampleDesigner/SampleEditorController.h

@@ -79,8 +79,9 @@ public:
     void removeLayerItem(LayerItem* layerItem);
     void removeLayerItemFromUndo(int atIndex);
 
+    void onLayoutAdded(LayerForm* layerForm, ParticleLayoutItem* layout);
     void addLayoutItem(LayerForm* layerForm);
-    void duplicateLayoutItem(LayerForm* layerForm);
+    void duplicateLayoutItem(LayerForm* layerForm, ParticleLayoutItem* layout);
     void removeLayoutItem(LayerForm* layerItem, ParticleLayoutItem* layout);
 
     void addParticleLayoutItem(ParticleLayoutItem* layout, ItemWithParticlesCatalog::Type type);