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

ParticleLayoutItem::m_interference now PolyPtr; rm 'using'

parent dda720e7
No related branches found
No related tags found
1 merge request!2696PolyItem -> PolyPtr, with BaseItem as separate template parameter
...@@ -22,8 +22,6 @@ class InterferenceItem; ...@@ -22,8 +22,6 @@ class InterferenceItem;
class InterferenceCatalog { class InterferenceCatalog {
public: public:
using BaseItem = InterferenceItem;
// Do not change the numbering! It is serialized! // Do not change the numbering! It is serialized!
enum class Type : uint8_t { enum class Type : uint8_t {
None = 0, None = 0,
......
...@@ -90,11 +90,6 @@ void ParticleLayoutItem::removeItemWithParticle(ItemWithParticles* particle) ...@@ -90,11 +90,6 @@ void ParticleLayoutItem::removeItemWithParticle(ItemWithParticles* particle)
m_particles.delete_element(particle); m_particles.delete_element(particle);
} }
const PolyItem<InterferenceCatalog>& ParticleLayoutItem::interferenceSelection() const
{
return m_interference;
}
bool ParticleLayoutItem::totalDensityIsDefinedByInterference() const bool ParticleLayoutItem::totalDensityIsDefinedByInterference() const
{ {
return dynamic_cast<const Interference2DAbstractLatticeItem*>(m_interference.certainItem()) return dynamic_cast<const Interference2DAbstractLatticeItem*>(m_interference.certainItem())
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "Base/Type/OwningVector.h" #include "Base/Type/OwningVector.h"
#include "GUI/Model/Descriptor/DoubleProperty.h" #include "GUI/Model/Descriptor/DoubleProperty.h"
#include "GUI/Model/Descriptor/PolyItem.h" #include "GUI/Model/Descriptor/PolyPtr.h"
#include "GUI/Model/Sample/InterferenceCatalog.h" #include "GUI/Model/Sample/InterferenceCatalog.h"
#include "GUI/Model/Sample/InterferenceItems.h" #include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/Item3D.h" #include "GUI/Model/Sample/Item3D.h"
...@@ -53,8 +53,14 @@ public: ...@@ -53,8 +53,14 @@ public:
void addItemWithParticleSelection(ItemWithParticles* particle); void addItemWithParticleSelection(ItemWithParticles* particle);
void removeItemWithParticle(ItemWithParticles* particle); void removeItemWithParticle(ItemWithParticles* particle);
PolyItem<InterferenceCatalog>& interferenceSelection() { return m_interference; } PolyPtr<InterferenceItem, InterferenceCatalog>& interferenceSelection()
const PolyItem<InterferenceCatalog>& interferenceSelection() const; {
return m_interference;
}
const PolyPtr<InterferenceItem, InterferenceCatalog>& interferenceSelection() const
{
return m_interference;
}
void setInterference(InterferenceItem* i) { m_interference.setCertainItem(i); } void setInterference(InterferenceItem* i) { m_interference.setCertainItem(i); }
void removeInterference() { m_interference.setCertainItem(nullptr); } void removeInterference() { m_interference.setCertainItem(nullptr); }
...@@ -72,7 +78,7 @@ public: ...@@ -72,7 +78,7 @@ public:
private: private:
DoubleProperty m_own_density; DoubleProperty m_own_density;
PolyItem<InterferenceCatalog> m_interference; PolyPtr<InterferenceItem, InterferenceCatalog> m_interference;
OwningVector<ItemWithParticles> m_particles; OwningVector<ItemWithParticles> m_particles;
const MaterialsSet* m_materials; const MaterialsSet* m_materials;
}; };
......
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