rm extra {}

GUI/View/Sample/LayerContainerForm.cpp

@@ -39,54 +39,48 @@ LayerContainerForm::LayerContainerForm(QWidget* parent, ItemWithLayers* item,
 
     //... top right corner actions
 
-    // choose color
-    {
-        auto* chooseColorAction = new QAction(this);
-        chooseColorAction->setText("Choose color");
-        chooseColorAction->setIcon(QIcon(":/images/palette.svg"));
-        chooseColorAction->setIconText("Choose color");
-        chooseColorAction->setToolTip("Choose a color for this layer");
-        auto* menu = new QMenu(this);
-        chooseColorAction->setMenu(menu);
-        addTitleAction(chooseColorAction);
-
-        for (const auto& col : GUI::Colors::layerDefaults()) {
-            QPixmap p(64, 64);
-            p.fill(col);
-            auto* ca = menu->addAction(QIcon(p), "");
-            connect(ca, &QAction::triggered, [this, col] {
-                m_item->setColor(col);
-                updateColor();
-            });
-        }
-    }
-    // move
-    {
-        m_move_button = new WidgetMoverButton(this, this, 0);
-        m_move_button->setToolTip("Move " + what + " up/down");
-        connect(m_move_button, &WidgetMoverButton::finishedMoving, ec,
-                &SampleEditorController::onStoppedToMoveComponent);
-        addTitleWidget(m_move_button);
-    }
-    // show in real space
-    {
-        auto* showInRealspaceAction = ActionFactory::createShowInRealspaceAction(
-            this, what, [ec, item] { ec->requestViewInRealspace(item); });
-        addTitleAction(showInRealspaceAction);
-    }
-    // duplicate
-    {
-        auto* duplicate_action = ActionFactory::createDuplicateAction(
-            this, what, [ec, item] { ec->duplicateItemWithLayers(item); });
-        addTitleAction(duplicate_action);
-    }
-    // remove
-    {
-        auto* remove_action = ActionFactory::createRemoveAction(
-            this, what, [ec, item] { ec->removeItemWithLayers(item); });
-        addTitleAction(remove_action);
+    // choose color action
+    auto* chooseColorAction = new QAction(this);
+    chooseColorAction->setText("Choose color");
+    chooseColorAction->setIcon(QIcon(":/images/palette.svg"));
+    chooseColorAction->setIconText("Choose color");
+    chooseColorAction->setToolTip("Choose a color for this layer");
+    auto* menu = new QMenu(this);
+    chooseColorAction->setMenu(menu);
+    addTitleAction(chooseColorAction);
+
+    for (const auto& color : GUI::Colors::layerDefaults()) {
+        QPixmap p(64, 64);
+        p.fill(color);
+        auto* ca = menu->addAction(QIcon(p), "");
+        connect(ca, &QAction::triggered, [this, color] {
+            m_item->setColor(color);
+            updateColor();
+        });
     }
 
+    // move component action
+    m_move_button = new WidgetMoverButton(this, this, 0);
+    m_move_button->setToolTip("Move " + what + " up/down");
+    connect(m_move_button, &WidgetMoverButton::finishedMoving, ec,
+            &SampleEditorController::onStoppedToMoveComponent);
+    addTitleWidget(m_move_button);
+
+    // show in real space action
+    auto* showInRealspaceAction = ActionFactory::createShowInRealspaceAction(
+        this, what, [ec, item] { ec->requestViewInRealspace(item); });
+    addTitleAction(showInRealspaceAction);
+
+    // duplicate action
+    auto* duplicate_action = ActionFactory::createDuplicateAction(
+        this, what, [ec, item] { ec->duplicateItemWithLayers(item); });
+    addTitleAction(duplicate_action);
+
+    // remove action
+    auto* remove_action = ActionFactory::createRemoveAction(
+        this, what, [ec, item] { ec->removeItemWithLayers(item); });
+    addTitleAction(remove_action);
+
     updateColor();
 }
 

auto/Examples/scatter2d/CorrelatedRoughness.py

@@ -25,7 +25,7 @@ def get_sample():
     roughness = ba.LayerRoughness(autocorr, interlayer, crosscorrelation)
 
     # defining layers
-    l_ambience = ba.Layer(vacuum, 1)
+    l_ambience = ba.Layer(vacuum)
     l_part_a = ba.Layer(material_part_a, 2.5*nm, roughness)
     l_part_b = ba.Layer(material_part_b, 5*nm, roughness)
     l_substrate = ba.Layer(material_substrate, roughness)