From eb87b5635e8441374234f971a9d074a1cc424ffb Mon Sep 17 00:00:00 2001
From: Matthias Puchner <github@mpuchner.de>
Date: Sat, 18 Dec 2021 10:29:55 +0100
Subject: [PATCH] free ParticleForm from SessionItem
---
GUI/View/SampleDesigner/ParticleForm.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/GUI/View/SampleDesigner/ParticleForm.cpp b/GUI/View/SampleDesigner/ParticleForm.cpp
index 367c724d3c3..8ef2ccce0e3 100644
--- a/GUI/View/SampleDesigner/ParticleForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleForm.cpp
@@ -13,6 +13,7 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/ParticleForm.h"
+#include "GUI/Model/Sample/FormFactorItemCatalog.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Types/VectorDescriptor.h"
@@ -20,15 +21,13 @@
#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
-
#include <QAction>
ParticleForm::ParticleForm(QWidget* parent, ParticleItem* particleItem, bool allowAbundance,
SampleEditorController* ec, bool allowRemove)
: QGroupBox(parent)
{
- const QString formfactor =
- particleItem->formfactorItem()->value().value<ComboProperty>().getValue();
+ const QString formfactor = FormFactorItemCatalog::menuEntry(particleItem->formfactor());
setTitle("Particle (" + formfactor + ")");
FormLayouter layouter(this, ec);
--
GitLab