diff --git a/GUI/Model/Sample/InterferenceItems.cpp b/GUI/Model/Sample/InterferenceItems.cpp
index a593c2476a9460951315572c7f990f1f12a85f64..7ca2ffbc25949036e91fe305a474cb350c02ef36 100644
--- a/GUI/Model/Sample/InterferenceItems.cpp
+++ b/GUI/Model/Sample/InterferenceItems.cpp
@@ -33,7 +33,7 @@ DoubleDescriptor InterferenceItem::positionVariance() const
return d;
}
-InterferenceItem::InterferenceItem(const QString& modelType) : SessionGraphicsItem(modelType)
+InterferenceItem::InterferenceItem(const QString& modelType) : SessionItem(modelType)
{
addProperty(P_POSITION_VARIANCE, 0.0)
->setToolTip("Variance of the position in each dimension (nm^2)");
diff --git a/GUI/Model/Sample/InterferenceItems.h b/GUI/Model/Sample/InterferenceItems.h
index 05235fa26ea1c572cb71872fd68f419e30735518..e5914d400923b716532f13b0727cd1026e74718d 100644
--- a/GUI/Model/Sample/InterferenceItems.h
+++ b/GUI/Model/Sample/InterferenceItems.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_MODEL_SAMPLE_INTERFERENCEITEMS_H
#include "GUI/Model/Group/SelectionDescriptor.h"
-#include "GUI/Model/Session/SessionGraphicsItem.h"
+#include "GUI/Model/Session/SessionItem.h"
class FTDecayFunction1DItem;
class FTDecayFunction2DItem;
@@ -27,7 +27,7 @@ class Lattice2DItem;
class DoubleDescriptor;
class UIntDescriptor;
-class InterferenceItem : public SessionGraphicsItem {
+class InterferenceItem : public SessionItem {
private:
static constexpr auto P_POSITION_VARIANCE{"PositionVariance"};
diff --git a/GUI/Model/Sample/ItemWithMaterial.cpp b/GUI/Model/Sample/ItemWithMaterial.cpp
index 8dbb8faa5cb310cf12b8f141f3e1f9268ad284b9..45522d5b9982708ac418eea0ec516fc8bc197c68 100644
--- a/GUI/Model/Sample/ItemWithMaterial.cpp
+++ b/GUI/Model/Sample/ItemWithMaterial.cpp
@@ -65,7 +65,7 @@ QString ItemWithMaterial::materialIdentifier() const
return getItemValue(P_MATERIAL).toString();
}
-ItemWithMaterial::ItemWithMaterial(const QString& model_type) : SessionGraphicsItem(model_type)
+ItemWithMaterial::ItemWithMaterial(const QString& model_type) : SessionItem(model_type)
{
addProperty(P_MATERIAL, GUI::MaterialUtil::defaultMaterialIdentifier())
->setToolTip("Material this item is made of")
diff --git a/GUI/Model/Sample/ItemWithMaterial.h b/GUI/Model/Sample/ItemWithMaterial.h
index 99b89c8be3ab11bb249c390a79e614790e3edcab..1dc94440131a5c6d90eeb71787520a1000c3fcf1 100644
--- a/GUI/Model/Sample/ItemWithMaterial.h
+++ b/GUI/Model/Sample/ItemWithMaterial.h
@@ -15,13 +15,13 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHMATERIAL_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHMATERIAL_H
-#include "GUI/Model/Session/SessionGraphicsItem.h"
+#include "GUI/Model/Session/SessionItem.h"
#include <memory>
class Material;
class MaterialItem;
-class ItemWithMaterial : public virtual SessionGraphicsItem {
+class ItemWithMaterial : public virtual SessionItem {
private:
static constexpr auto P_MATERIAL{"Material"};
diff --git a/GUI/Model/Sample/ItemWithParticles.cpp b/GUI/Model/Sample/ItemWithParticles.cpp
index 0be860e8de833987f0abe20cd855e470176765b7..3cdfa0fdc1376653d8328636d503b48d9d6366e2 100644
--- a/GUI/Model/Sample/ItemWithParticles.cpp
+++ b/GUI/Model/Sample/ItemWithParticles.cpp
@@ -127,7 +127,7 @@ SelectionDescriptor<RotationItem*> ItemWithParticles::rotationMethod()
ItemWithParticles::ItemWithParticles(const QString& model_type, const QString& abundance_tooltip,
const QString& position_tooltip)
- : SessionGraphicsItem(model_type)
+ : SessionItem(model_type)
{
addProperty(P_ABUNDANCE, 1.0)
->setLimits(RealLimits::limited(0.0, 1.0))
diff --git a/GUI/Model/Sample/ItemWithParticles.h b/GUI/Model/Sample/ItemWithParticles.h
index 5e91a54efe0c2ace4f80ec145f751151dff69059..91745cf064063a26ad6006f13f0c1eba7ea86053 100644
--- a/GUI/Model/Sample/ItemWithParticles.h
+++ b/GUI/Model/Sample/ItemWithParticles.h
@@ -17,7 +17,7 @@
#include "Base/Vector/Vectors3D.h"
#include "GUI/Model/Group/SelectionDescriptor.h"
-#include "GUI/Model/Session/SessionGraphicsItem.h"
+#include "GUI/Model/Session/SessionItem.h"
class DoubleDescriptor;
class IParticle;
@@ -28,7 +28,7 @@ class TransformationItem;
class VectorDescriptor;
class VectorItem;
-class ItemWithParticles : public virtual SessionGraphicsItem {
+class ItemWithParticles : public virtual SessionItem {
private:
static constexpr auto P_ABUNDANCE{"Abundance"};
static constexpr auto P_POSITION{"Position Offset"};
diff --git a/GUI/Model/Sample/LayerItem.cpp b/GUI/Model/Sample/LayerItem.cpp
index 4af5b030232e4353ea8660ba9156a0af2095a273..c3574dcb0dbb47fa6f278d967360a4e71deecd6c 100644
--- a/GUI/Model/Sample/LayerItem.cpp
+++ b/GUI/Model/Sample/LayerItem.cpp
@@ -66,7 +66,7 @@ QVector<ItemWithMaterial*> layoutItemsWithMaterial(ParticleLayoutItem* item)
} // namespace
-LayerItem::LayerItem() : SessionGraphicsItem(M_TYPE), ItemWithMaterial(M_TYPE)
+LayerItem::LayerItem() : SessionItem(M_TYPE), ItemWithMaterial(M_TYPE)
{
setToolTip("A layer with thickness and material");
addProperty(P_THICKNESS, 0.0)
diff --git a/GUI/Model/Sample/MesoCrystalItem.cpp b/GUI/Model/Sample/MesoCrystalItem.cpp
index 9b036b46db1b8326c6890d32db4e2c409a7b85c9..8bee38cdbfb929a7a3fc3195c57fb536191e3d3f 100644
--- a/GUI/Model/Sample/MesoCrystalItem.cpp
+++ b/GUI/Model/Sample/MesoCrystalItem.cpp
@@ -46,7 +46,7 @@ const QString density_tooltip =
} // namespace
MesoCrystalItem::MesoCrystalItem()
- : SessionGraphicsItem(M_TYPE), ItemWithParticles(M_TYPE, abundance_tooltip, position_tooltip)
+ : SessionItem(M_TYPE), ItemWithParticles(M_TYPE, abundance_tooltip, position_tooltip)
{
setToolTip("A 3D crystal structure of nanoparticles");
diff --git a/GUI/Model/Sample/MultiLayerItem.cpp b/GUI/Model/Sample/MultiLayerItem.cpp
index 4b7cd0d3f0b135d237f4a7f3a7a255e59f97364d..7aab8dc94535ca9bc999d9cc9b044477f30ec277 100644
--- a/GUI/Model/Sample/MultiLayerItem.cpp
+++ b/GUI/Model/Sample/MultiLayerItem.cpp
@@ -21,7 +21,7 @@ namespace {
const QString external_field_tooltip = "External field (A/m)";
}
-MultiLayerItem::MultiLayerItem() : SessionGraphicsItem(M_TYPE)
+MultiLayerItem::MultiLayerItem() : SessionItem(M_TYPE)
{
setToolTip("A multilayer to hold stack of layers");
setItemName(M_TYPE);
diff --git a/GUI/Model/Sample/MultiLayerItem.h b/GUI/Model/Sample/MultiLayerItem.h
index 29dec2597ec0ad841833e709f78291f66608273f..b92d94b36913f81597e36e013bda61069e512153 100644
--- a/GUI/Model/Sample/MultiLayerItem.h
+++ b/GUI/Model/Sample/MultiLayerItem.h
@@ -16,14 +16,14 @@
#define BORNAGAIN_GUI_MODEL_SAMPLE_MULTILAYERITEM_H
#include "Base/Vector/Vectors3D.h"
-#include "GUI/Model/Session/SessionGraphicsItem.h"
+#include "GUI/Model/Session/SessionItem.h"
class LayerItem;
class ItemWithMaterial;
class DoubleDescriptor;
class VectorDescriptor;
-class BA_CORE_API_ MultiLayerItem : public SessionGraphicsItem {
+class BA_CORE_API_ MultiLayerItem : public SessionItem {
private:
static constexpr auto P_CROSS_CORR_LENGTH{"CrossCorrelationLength"};
static constexpr auto P_EXTERNAL_FIELD{"ExternalField"};
diff --git a/GUI/Model/Sample/ParticleCompositionItem.cpp b/GUI/Model/Sample/ParticleCompositionItem.cpp
index bdc8b4461bb8004c506f0508dad81283779d2c34..f610cd544307bd09280ad825cb8469dcd6559884 100644
--- a/GUI/Model/Sample/ParticleCompositionItem.cpp
+++ b/GUI/Model/Sample/ParticleCompositionItem.cpp
@@ -35,7 +35,7 @@ const QString position_tooltip = "Relative position of the particle's reference
ParticleCompositionItem::ParticleCompositionItem()
- : SessionGraphicsItem(M_TYPE), ItemWithParticles(M_TYPE, abundance_tooltip, position_tooltip)
+ : SessionItem(M_TYPE), ItemWithParticles(M_TYPE, abundance_tooltip, position_tooltip)
{
setToolTip("Composition of particles with fixed positions");
diff --git a/GUI/Model/Sample/ParticleCoreShellItem.cpp b/GUI/Model/Sample/ParticleCoreShellItem.cpp
index 244dc1fc5465db0dbe15eea4288cb8affbfc06c6..ff0f96bd694097b6dbe7187cc83133667be057be 100644
--- a/GUI/Model/Sample/ParticleCoreShellItem.cpp
+++ b/GUI/Model/Sample/ParticleCoreShellItem.cpp
@@ -32,7 +32,7 @@ const QString position_tooltip = "Relative position of the particle's reference
} // namespace
ParticleCoreShellItem::ParticleCoreShellItem()
- : SessionGraphicsItem(M_TYPE), ItemWithParticles(M_TYPE, abundance_tooltip, position_tooltip)
+ : SessionItem(M_TYPE), ItemWithParticles(M_TYPE, abundance_tooltip, position_tooltip)
{
setToolTip("A particle with a core/shell geometry");
diff --git a/GUI/Model/Sample/ParticleItem.cpp b/GUI/Model/Sample/ParticleItem.cpp
index 6e20f7865e95bd334a8acf5e7789071bd5bb11f5..1da8af4c55b4c4b8c1f0ef0a02864145e27a851a 100644
--- a/GUI/Model/Sample/ParticleItem.cpp
+++ b/GUI/Model/Sample/ParticleItem.cpp
@@ -36,7 +36,7 @@ const QString position_tooltip = "Relative position of the particle's reference
} // namespace
ParticleItem::ParticleItem()
- : SessionGraphicsItem(M_TYPE)
+ : SessionItem(M_TYPE)
, ItemWithMaterial(M_TYPE)
, ItemWithParticles(M_TYPE, abundance_tooltip, position_tooltip)
{
diff --git a/GUI/Model/Sample/ParticleLayoutItem.cpp b/GUI/Model/Sample/ParticleLayoutItem.cpp
index 256e40ce5e143b4739c2ee15e91d2c32348a1d68..4ea90c9ce9071f7db5deb726e58f67ea825e97bd 100644
--- a/GUI/Model/Sample/ParticleLayoutItem.cpp
+++ b/GUI/Model/Sample/ParticleLayoutItem.cpp
@@ -46,7 +46,7 @@ const QString weight_tooltip =
"Should be used when multiple layouts define different domains in the sample.";
} // namespace
-ParticleLayoutItem::ParticleLayoutItem() : SessionGraphicsItem(M_TYPE)
+ParticleLayoutItem::ParticleLayoutItem() : SessionItem(M_TYPE)
{
setToolTip("A layout of particles");
diff --git a/GUI/Model/Sample/ParticleLayoutItem.h b/GUI/Model/Sample/ParticleLayoutItem.h
index 85a193db159e45ba559408d63e1c64d526c39bee..703c3b673d1d5a6406c9a6610fea68f0a3ccd0b3 100644
--- a/GUI/Model/Sample/ParticleLayoutItem.h
+++ b/GUI/Model/Sample/ParticleLayoutItem.h
@@ -16,14 +16,13 @@
#define BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLELAYOUTITEM_H
#include "GUI/Model/Group/SelectionDescriptor.h"
-#include "GUI/Model/Session/SessionGraphicsItem.h"
#include "GUI/Model/Session/SessionModel.h"
class InterferenceItem;
class ItemWithParticles;
class DoubleDescriptor;
-class BA_CORE_API_ ParticleLayoutItem : public SessionGraphicsItem {
+class BA_CORE_API_ ParticleLayoutItem : public SessionItem {
private:
static constexpr auto P_TOTAL_DENSITY{"TotalParticleDensity"};
static constexpr auto P_WEIGHT{"Weight"};
diff --git a/GUI/Model/Sample/SampleModel.cpp b/GUI/Model/Sample/SampleModel.cpp
index e550a9c6347b74ed9aceaaaf91b9d5feac837e7f..4f89486f06d0f44a8f148a863dbeb743d2d45589 100644
--- a/GUI/Model/Sample/SampleModel.cpp
+++ b/GUI/Model/Sample/SampleModel.cpp
@@ -86,16 +86,8 @@ void SampleModel::removeMultiLayer(MultiLayerItem* item)
void SampleModel::onDataChanged(const QModelIndex& index, const QModelIndex&)
{
- // check whether it's an item and not a position related item, then emit
- // the relevant signal
+ // check whether it's an item, then emit the relevant signal
auto* const item = itemForIndex(index);
- if (item) {
- const bool isPositionRelated =
- item->hasModelType<PropertyItem>()
- && (SessionGraphicsItem::isXPosPropertyName(item->displayName())
- || SessionGraphicsItem::isYPosPropertyName(item->displayName()));
-
- if (!isPositionRelated)
- emit nonPositionRelatedDataChanged(item);
- }
+ if (item)
+ emit itemDataChanged(item);
}
diff --git a/GUI/Model/Sample/SampleModel.h b/GUI/Model/Sample/SampleModel.h
index 430c0b72033b9cd9760e53258e632c89c3fba4ac..e923341fc2aa624f206031f96b271e96e6d87da9 100644
--- a/GUI/Model/Sample/SampleModel.h
+++ b/GUI/Model/Sample/SampleModel.h
@@ -41,10 +41,11 @@ public:
void removeMultiLayer(MultiLayerItem* item);
signals:
- //! This signal is emitted if any data changed (compare to dataChanged), but only if the
- //! change is not about position changes (i.e. moving an item in the sample editor).
+ //! This signal is emitted if any item data changed (compare to
+ //! QAbstractItemModel::dataChanged).
+ //!
//! item is the one given in the first index of dataChanged(idx1,idx2)
- void nonPositionRelatedDataChanged(const SessionItem* item);
+ void itemDataChanged(const SessionItem* item);
private:
void onDataChanged(const QModelIndex& index, const QModelIndex&);
diff --git a/GUI/Model/Session/SessionGraphicsItem.cpp b/GUI/Model/Session/SessionGraphicsItem.cpp
deleted file mode 100644
index 0432e63f3d8920e23ed0e10380d2667b529de108..0000000000000000000000000000000000000000
--- a/GUI/Model/Session/SessionGraphicsItem.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// ************************************************************************************************
-//
-// BornAgain: simulate and fit reflection and scattering
-//
-//! @file GUI/Model/Session/SessionGraphicsItem.cpp
-//! @brief Implements class SessionGraphicsItem
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************************************
-
-#include "GUI/Model/Session/SessionGraphicsItem.h"
-
-SessionGraphicsItem::SessionGraphicsItem(const QString& model_type) : SessionItem(model_type)
-{
- addProperty(P_XPOS, qreal(0.0))->setVisible(false);
- addProperty(P_YPOS, qreal(0.0))->setVisible(false);
-}
-
-double SessionGraphicsItem::xPos() const
-{
- return getItemValue(P_XPOS).toDouble();
-}
-
-void SessionGraphicsItem::setXPos(double x_pos)
-{
- setItemValue(P_XPOS, x_pos);
-}
-
-bool SessionGraphicsItem::isXPosPropertyName(const QString& name)
-{
- return name == P_XPOS;
-}
-
-double SessionGraphicsItem::yPos() const
-{
- return getItemValue(P_YPOS).toDouble();
-}
-
-void SessionGraphicsItem::setYPos(double y_pos)
-{
- setItemValue(P_YPOS, y_pos);
-}
-
-bool SessionGraphicsItem::isYPosPropertyName(const QString& name)
-{
- return name == P_YPOS;
-}
diff --git a/GUI/Model/Session/SessionGraphicsItem.h b/GUI/Model/Session/SessionGraphicsItem.h
deleted file mode 100644
index 28ce7cda63b655c494216799fdf21ff202974e00..0000000000000000000000000000000000000000
--- a/GUI/Model/Session/SessionGraphicsItem.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// ************************************************************************************************
-//
-// BornAgain: simulate and fit reflection and scattering
-//
-//! @file GUI/Model/Session/SessionGraphicsItem.h
-//! @brief Defines class SessionGraphicsItem
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************************************
-
-#ifndef BORNAGAIN_GUI_MODEL_SESSION_SESSIONGRAPHICSITEM_H
-#define BORNAGAIN_GUI_MODEL_SESSION_SESSIONGRAPHICSITEM_H
-
-#include "GUI/Model/Session/SessionItem.h"
-
-class BA_CORE_API_ SessionGraphicsItem : public SessionItem {
-
-private:
- static constexpr auto P_XPOS{"xpos"};
- static constexpr auto P_YPOS{"ypos"};
-
-public:
- double xPos() const;
- void setXPos(double x_pos);
- static bool isXPosPropertyName(const QString& name);
-
- double yPos() const;
- void setYPos(double y_pos);
- static bool isYPosPropertyName(const QString& name);
-
-protected:
- explicit SessionGraphicsItem(const QString& model_type);
-};
-
-#endif // BORNAGAIN_GUI_MODEL_SESSION_SESSIONGRAPHICSITEM_H
diff --git a/GUI/Model/Session/SessionItemUtils.cpp b/GUI/Model/Session/SessionItemUtils.cpp
index b90237a17fe41061990a98a88db663c0d92f55c4..399e83dff47a8ab023198bb19d38c673cfdca25b 100644
--- a/GUI/Model/Session/SessionItemUtils.cpp
+++ b/GUI/Model/Session/SessionItemUtils.cpp
@@ -17,7 +17,6 @@
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/ParticleCompositionItem.h"
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
-#include "GUI/Model/Session/SessionGraphicsItem.h"
#include <QColor>
#include <QIcon>
#include <QPixmap>
diff --git a/GUI/Model/Trafo/TransformationItem.cpp b/GUI/Model/Trafo/TransformationItem.cpp
index d2aa65bb00682121704fbac25556de2a6fcae950..3b26a3487dea591432f79c877bc12cb6dd0e1639 100644
--- a/GUI/Model/Trafo/TransformationItem.cpp
+++ b/GUI/Model/Trafo/TransformationItem.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/Group/GroupInfo.h"
#include "GUI/Model/Trafo/RotationItems.h"
-TransformationItem::TransformationItem() : SessionGraphicsItem(M_TYPE)
+TransformationItem::TransformationItem() : SessionItem(M_TYPE)
{
setToolTip("Rotation applied to particles");
diff --git a/GUI/Model/Trafo/TransformationItem.h b/GUI/Model/Trafo/TransformationItem.h
index bb35832943f004c6d07ca226a56a4aaa9d2ac02b..7df8ac011dfe4b9bde1dbf9e5329e4aee79f6c5e 100644
--- a/GUI/Model/Trafo/TransformationItem.h
+++ b/GUI/Model/Trafo/TransformationItem.h
@@ -15,11 +15,11 @@
#ifndef BORNAGAIN_GUI_MODEL_TRAFO_TRANSFORMATIONITEM_H
#define BORNAGAIN_GUI_MODEL_TRAFO_TRANSFORMATIONITEM_H
-#include "GUI/Model/Session/SessionGraphicsItem.h"
+#include "GUI/Model/Session/SessionItem.h"
class RotationItem;
-class BA_CORE_API_ TransformationItem : public SessionGraphicsItem {
+class BA_CORE_API_ TransformationItem : public SessionItem {
private:
static constexpr auto P_ROT{"Rotation type"};
diff --git a/GUI/View/Realspace/RealSpaceCanvas.cpp b/GUI/View/Realspace/RealSpaceCanvas.cpp
index f7009e090d58ba10d83cd13dc4ec77e2bb9cb796..5c5420750c7b6f354ecd2c3007732c8e5ee4949e 100644
--- a/GUI/View/Realspace/RealSpaceCanvas.cpp
+++ b/GUI/View/Realspace/RealSpaceCanvas.cpp
@@ -178,8 +178,8 @@ void RealSpaceCanvas::setConnected(SampleModel* model, bool makeConnected)
Qt::UniqueConnection);
connect(model, &SampleModel::rowsAboutToBeRemoved, this,
&RealSpaceCanvas::onRowsAboutToBeRemoved, Qt::UniqueConnection);
- connect(model, &SampleModel::nonPositionRelatedDataChanged, this,
- &RealSpaceCanvas::updateScene, Qt::UniqueConnection);
+ connect(model, &SampleModel::itemDataChanged, this, &RealSpaceCanvas::updateScene,
+ Qt::UniqueConnection);
connect(model, &SampleModel::modelReset, this, &RealSpaceCanvas::resetScene,
Qt::UniqueConnection);
connect(
diff --git a/GUI/View/SampleDesigner/ScriptPanel.cpp b/GUI/View/SampleDesigner/ScriptPanel.cpp
index d2c73e0c8c754c4231047d289d41bc20d7f31bfd..6bb6a78db5608b8f891e5f9a3825370e4769f85f 100644
--- a/GUI/View/SampleDesigner/ScriptPanel.cpp
+++ b/GUI/View/SampleDesigner/ScriptPanel.cpp
@@ -88,7 +88,7 @@ void ScriptPanel::setEditorConnected(bool isConnected)
&UpdateTimer::scheduleUpdate);
connect(m_sampleModel, &SampleModel::rowsRemoved, m_updateTimer,
&UpdateTimer::scheduleUpdate);
- connect(m_sampleModel, &SampleModel::nonPositionRelatedDataChanged, m_updateTimer,
+ connect(m_sampleModel, &SampleModel::itemDataChanged, m_updateTimer,
&UpdateTimer::scheduleUpdate);
connect(m_sampleModel, &SampleModel::modelReset, this, &ScriptPanel::updateEditor,
Qt::UniqueConnection);