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

CompoundItem w/o materials

parent 09228db1
No related branches found
No related tags found
1 merge request!2676rm file/class Attributes (#1012)
......@@ -44,11 +44,9 @@ const QString position_tooltip = "Relative position of the particle's reference
} // namespace
CompoundItem::CompoundItem(const MaterialsSet* materials)
CompoundItem::CompoundItem(const MaterialsSet*)
: ItemWithParticles(abundance_tooltip, position_tooltip)
, m_materials(materials)
{
ASSERT(m_materials);
}
void CompoundItem::addItemWithParticleSelection(ItemWithParticles* particle)
......@@ -87,7 +85,8 @@ void CompoundItem::readFrom(QXmlStreamReader* r)
if (tag == Tag::BaseData)
XML::readBaseElement<ItemWithParticles>(r, tag, this);
else if (tag == Tag::Particle) {
m_particles.push_back(PolyItem<ParticlesCatalog>().readItemFrom(r, m_materials));
MaterialsSet* dummy = nullptr;
m_particles.push_back(PolyItem<ParticlesCatalog>().readItemFrom(r, dummy)); // TODO
XML::gotoEndElementOfTag(r, tag);
} else if (tag == Tag::ExpandCompoundGroupbox)
expandCompound = XML::readTaggedBool(r, tag);
......
......@@ -41,7 +41,6 @@ public:
private:
OwningVector<ItemWithParticles> m_particles;
const MaterialsSet* m_materials;
};
#endif // BORNAGAIN_GUI_MODEL_SAMPLE_COMPOUNDITEM_H
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