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

SampleViewFactory: avoid array of constants to prevent static initialization order fiasco

parent 38f86937
No related branches found
No related tags found
1 merge request!355SampleViewFactory: avoid array of constants to prevent static initialization order fiasco
Pipeline #45491 passed
......@@ -32,28 +32,23 @@
#include "GUI/Views/SampleDesigner/ParticleView.h"
#include "GUI/Views/SampleDesigner/TransformationView.h"
namespace {
const QStringList valid_item_types = {MultiLayerItem::M_TYPE,
LayerItem::M_TYPE,
ParticleLayoutItem::M_TYPE,
ParticleItem::M_TYPE,
TransformationItem::M_TYPE,
ParticleCoreShellItem::M_TYPE,
ParticleCompositionItem::M_TYPE,
MesoCrystalItem::M_TYPE,
Interference1DLatticeItem::M_TYPE,
Interference2DLatticeItem::M_TYPE,
Interference2DParaCrystalItem::M_TYPE,
InterferenceFinite2DLatticeItem::M_TYPE,
InterferenceHardDiskItem::M_TYPE,
InterferenceRadialParaCrystalItem::M_TYPE};
} // namespace
bool SampleViewFactory::isValidType(const QString& model_type)
{
return model_type.startsWith("FormFactor") || valid_item_types.contains(model_type);
return model_type.startsWith("FormFactor")
|| model_type == MultiLayerItem::M_TYPE
|| model_type == LayerItem::M_TYPE
|| model_type == ParticleLayoutItem::M_TYPE
|| model_type == ParticleItem::M_TYPE
|| model_type == TransformationItem::M_TYPE
|| model_type == ParticleCoreShellItem::M_TYPE
|| model_type == ParticleCompositionItem::M_TYPE
|| model_type == MesoCrystalItem::M_TYPE
|| model_type == Interference1DLatticeItem::M_TYPE
|| model_type == Interference2DLatticeItem::M_TYPE
|| model_type == Interference2DParaCrystalItem::M_TYPE
|| model_type == InterferenceFinite2DLatticeItem::M_TYPE
|| model_type == InterferenceHardDiskItem::M_TYPE
|| model_type == InterferenceRadialParaCrystalItem::M_TYPE;
}
IView* SampleViewFactory::createSampleView(const QString& model_type)
......
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