Skip to content
Snippets Groups Projects
Commit 08af3714 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

clang-format

parent 5f282ec1
No related branches found
No related tags found
1 merge request!2065+ class CollapsibleGroupBox; use it where possible
Pipeline #117681 canceled
...@@ -88,7 +88,8 @@ LayerForm::LayerForm(QWidget* parent, LayerItem* layerItem, SampleEditorControll ...@@ -88,7 +88,8 @@ LayerForm::LayerForm(QWidget* parent, LayerItem* layerItem, SampleEditorControll
} }
QColor bckgroundCol = m_layer->color(); QColor bckgroundCol = m_layer->color();
setStyleSheet("CollapsibleGroupBox {background-color: " + bckgroundCol.name(QColor::HexRgb) + "}"); setStyleSheet("CollapsibleGroupBox {background-color: " + bckgroundCol.name(QColor::HexRgb)
+ "}");
m_layouter->addRow("Material:", new MaterialInplaceForm(this, layerItem, ec)); m_layouter->addRow("Material:", new MaterialInplaceForm(this, layerItem, ec));
m_thicknessRow = m_layouter->addValue(m_layer->thickness()); m_thicknessRow = m_layouter->addValue(m_layer->thickness());
...@@ -146,8 +147,7 @@ void LayerForm::updateTitle() ...@@ -146,8 +147,7 @@ void LayerForm::updateTitle()
const SampleItem* sampleItem = m_ec->sampleItem(); const SampleItem* sampleItem = m_ec->sampleItem();
ASSERT(sampleItem); ASSERT(sampleItem);
int i = sampleItem->layerItems().indexOf(m_layer); int i = sampleItem->layerItems().indexOf(m_layer);
setTitle("Layer " + QString::number(i) setTitle("Layer " + QString::number(i) + " Material: " + m_layer->materialName());
+ " Material: " + m_layer->materialName());
} }
void LayerForm::expand() void LayerForm::expand()
......
...@@ -50,23 +50,23 @@ MesocrystalForm::MesocrystalForm(QWidget* parent, MesocrystalItem* mesocrystalIt ...@@ -50,23 +50,23 @@ MesocrystalForm::MesocrystalForm(QWidget* parent, MesocrystalItem* mesocrystalIt
// show in real space // show in real space
auto* showInRealspaceAction = auto* showInRealspaceAction =
ActionFactory::createShowInRealspaceAction(this, "meso crystal", [ec, mesocrystalItem] { ActionFactory::createShowInRealspaceAction(this, "meso crystal", [ec, mesocrystalItem] {
ec->requestViewInRealspace(mesocrystalItem); ec->requestViewInRealspace(mesocrystalItem);
}); });
addTitleAction(showInRealspaceAction); addTitleAction(showInRealspaceAction);
// duplicate // duplicate
m_duplicateAction = m_duplicateAction =
ActionFactory::createDuplicateAction(this, "meso crystal", [ec, mesocrystalItem] { ActionFactory::createDuplicateAction(this, "meso crystal", [ec, mesocrystalItem] {
ec->duplicateItemWithParticles(mesocrystalItem); ec->duplicateItemWithParticles(mesocrystalItem);
}); });
addTitleAction(m_duplicateAction); addTitleAction(m_duplicateAction);
// remove // remove
m_removeAction = ActionFactory::createRemoveAction( m_removeAction = ActionFactory::createRemoveAction(
this, "meso crystal", [ec, mesocrystalItem] { ec->removeParticle(mesocrystalItem); }); this, "meso crystal", [ec, mesocrystalItem] { ec->removeParticle(mesocrystalItem); });
if (allowRemove) if (allowRemove)
addTitleAction(m_removeAction); addTitleAction(m_removeAction);
} }
QComboBox* MesocrystalForm::createBasisCombo(QWidget* parent, ItemWithParticles* current) QComboBox* MesocrystalForm::createBasisCombo(QWidget* parent, ItemWithParticles* current)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment