From 8d2558b14b3f8cf1c079a563ca4a16fc63017ad4 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 26 Aug 2021 11:09:51 +0200
Subject: [PATCH] ConnectableView: rm m_name for good
---
GUI/Views/SampleDesigner/ConnectableView.cpp | 1 -
GUI/Views/SampleDesigner/ConnectableView.h | 11 -----------
GUI/Views/SampleDesigner/InterferenceViews.cpp | 6 ------
GUI/Views/SampleDesigner/LayerView.cpp | 1 -
GUI/Views/SampleDesigner/MesoCrystalView.cpp | 1 -
GUI/Views/SampleDesigner/ParticleCompositionView.cpp | 1 -
GUI/Views/SampleDesigner/ParticleCoreShellView.cpp | 1 -
GUI/Views/SampleDesigner/ParticleLayoutView.cpp | 1 -
GUI/Views/SampleDesigner/ParticleView.cpp | 1 -
GUI/Views/SampleDesigner/TransformationView.cpp | 1 -
10 files changed, 25 deletions(-)
diff --git a/GUI/Views/SampleDesigner/ConnectableView.cpp b/GUI/Views/SampleDesigner/ConnectableView.cpp
index 80a55de81dd..2c7e0835a9f 100644
--- a/GUI/Views/SampleDesigner/ConnectableView.cpp
+++ b/GUI/Views/SampleDesigner/ConnectableView.cpp
@@ -25,7 +25,6 @@
ConnectableView::ConnectableView(QGraphicsItem* parent, QRectF rect)
: IView(parent)
- , m_name("Unnamed")
, m_color(Qt::gray)
, m_rect(rect)
, m_roundpar(0)
diff --git a/GUI/Views/SampleDesigner/ConnectableView.h b/GUI/Views/SampleDesigner/ConnectableView.h
index 7ff4ae8697d..accb26ba26f 100644
--- a/GUI/Views/SampleDesigner/ConnectableView.h
+++ b/GUI/Views/SampleDesigner/ConnectableView.h
@@ -35,7 +35,6 @@ public:
virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option,
QWidget* widget) override;
- virtual QString getViewName() const { return m_name; }
virtual QColor getColor() const { return m_color; }
virtual QRectF getRectangle() const { return m_rect; }
virtual void setRectangle(QRectF rect) { m_rect = rect; }
@@ -54,7 +53,6 @@ public:
int getInputPortIndex(NodeEditorPort* port);
- virtual void setViewName(const QString& name) { m_name = name; }
virtual void setColor(const QColor& color) { m_color = color; }
protected:
@@ -64,7 +62,6 @@ protected:
virtual int getNumberOfInputPorts();
virtual void update_appearance() override;
- QString m_name;
QColor m_color;
QRectF m_rect;
int m_roundpar;
@@ -77,12 +74,4 @@ private:
QString hyphenate(const QString& name) const;
};
-//! default view of unimplemented ISampleNode's
-// class ISampleNodeDefaultView : public ConnectableView
-//{
-// public:
-// ISampleNodeDefaultView(QGraphicsItem *parent = 0) : ConnectableView(parent){}
-// //! Ñalls the ISampleNodeViewVisitor's visit method
-//};
-
#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_CONNECTABLEVIEW_H
diff --git a/GUI/Views/SampleDesigner/InterferenceViews.cpp b/GUI/Views/SampleDesigner/InterferenceViews.cpp
index 4d6ee54bcc2..2e8bcade65a 100644
--- a/GUI/Views/SampleDesigner/InterferenceViews.cpp
+++ b/GUI/Views/SampleDesigner/InterferenceViews.cpp
@@ -18,7 +18,6 @@
Interference1DLatticeView::Interference1DLatticeView(QGraphicsItem* parent)
: ConnectableView(parent)
{
- setViewName("Interference1DLattice");
setColor(QColor(255, 236, 139));
setRectangle(DesignerHelper::getInterferenceBoundingRect());
addPort("out", NodeEditorPort::OUTPUT, NodeEditorPort::INTERFERENCE);
@@ -28,7 +27,6 @@ Interference1DLatticeView::Interference1DLatticeView(QGraphicsItem* parent)
Interference2DLatticeView::Interference2DLatticeView(QGraphicsItem* parent)
: ConnectableView(parent)
{
- setViewName("Interference2DLattice");
setColor(QColor(255, 236, 139));
setRectangle(DesignerHelper::getInterferenceBoundingRect());
addPort("out", NodeEditorPort::OUTPUT, NodeEditorPort::INTERFERENCE);
@@ -38,7 +36,6 @@ Interference2DLatticeView::Interference2DLatticeView(QGraphicsItem* parent)
Interference2DParaCrystalView::Interference2DParaCrystalView(QGraphicsItem* parent)
: ConnectableView(parent)
{
- setViewName("Interference2DParaCrystal");
setColor(QColor(255, 236, 139));
setRectangle(DesignerHelper::getInterferenceBoundingRect());
addPort("out", NodeEditorPort::OUTPUT, NodeEditorPort::INTERFERENCE);
@@ -48,7 +45,6 @@ Interference2DParaCrystalView::Interference2DParaCrystalView(QGraphicsItem* pare
InterferenceFinite2DLatticeView::InterferenceFinite2DLatticeView(QGraphicsItem* parent)
: ConnectableView(parent)
{
- setViewName("InterferenceFinite2DLattice");
setColor(QColor(255, 236, 139));
setRectangle(DesignerHelper::getInterferenceBoundingRect());
addPort("out", NodeEditorPort::OUTPUT, NodeEditorPort::INTERFERENCE);
@@ -57,7 +53,6 @@ InterferenceFinite2DLatticeView::InterferenceFinite2DLatticeView(QGraphicsItem*
InterferenceHardDiskView::InterferenceHardDiskView(QGraphicsItem* parent) : ConnectableView(parent)
{
- setViewName("InterferenceHardDisk");
setColor(QColor(255, 236, 139));
setRectangle(DesignerHelper::getInterferenceBoundingRect());
addPort("out", NodeEditorPort::OUTPUT, NodeEditorPort::INTERFERENCE);
@@ -67,7 +62,6 @@ InterferenceHardDiskView::InterferenceHardDiskView(QGraphicsItem* parent) : Conn
InterferenceRadialParaCrystalView::InterferenceRadialParaCrystalView(QGraphicsItem* parent)
: ConnectableView(parent)
{
- setViewName("InterferenceRadialParaCrystal");
setColor(QColor(255, 236, 139));
setRectangle(DesignerHelper::getInterferenceBoundingRect());
addPort("out", NodeEditorPort::OUTPUT, NodeEditorPort::INTERFERENCE);
diff --git a/GUI/Views/SampleDesigner/LayerView.cpp b/GUI/Views/SampleDesigner/LayerView.cpp
index 9dd3b28aad5..4132263c9e8 100644
--- a/GUI/Views/SampleDesigner/LayerView.cpp
+++ b/GUI/Views/SampleDesigner/LayerView.cpp
@@ -23,7 +23,6 @@
LayerView::LayerView(QGraphicsItem* parent) : ILayerView(parent)
{
setColor(QColor(qrand() % 256, qrand() % 256, qrand() % 256));
- setViewName("Layer");
setRectangle(DesignerHelper::getDefaultBoundingRect("Layer"));
setAcceptDrops(false);
addPort(QString(), NodeEditorPort::INPUT, NodeEditorPort::PARTICLE_LAYOUT);
diff --git a/GUI/Views/SampleDesigner/MesoCrystalView.cpp b/GUI/Views/SampleDesigner/MesoCrystalView.cpp
index 6d61b7154ed..11e0d2dae63 100644
--- a/GUI/Views/SampleDesigner/MesoCrystalView.cpp
+++ b/GUI/Views/SampleDesigner/MesoCrystalView.cpp
@@ -20,7 +20,6 @@
MesoCrystalView::MesoCrystalView(QGraphicsItem* parent) : ConnectableView(parent)
{
- setViewName("MesoCrystal");
setColor(DesignerHelper::getDefaultParticleColor());
setRectangle(DesignerHelper::getDefaultBoundingRect("ParticleCoreShell"));
addPort("out", NodeEditorPort::OUTPUT, NodeEditorPort::FORM_FACTOR)
diff --git a/GUI/Views/SampleDesigner/ParticleCompositionView.cpp b/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
index 7f11fb4cd41..1ac5bb8bd45 100644
--- a/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
@@ -19,7 +19,6 @@
ParticleCompositionView::ParticleCompositionView(QGraphicsItem* parent) : ConnectableView(parent)
{
- setViewName("ParticleComposition");
setColor(DesignerHelper::getDefaultParticleColor());
setRectangle(DesignerHelper::getDefaultBoundingRect("ParticleCoreShell"));
addPort("out", NodeEditorPort::OUTPUT, NodeEditorPort::FORM_FACTOR)
diff --git a/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp b/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
index 9229c7a5409..8e6e4cfae16 100644
--- a/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
@@ -19,7 +19,6 @@
ParticleCoreShellView::ParticleCoreShellView(QGraphicsItem* parent) : ConnectableView(parent)
{
- setViewName("ParticleCoreShell");
setColor(DesignerHelper::getDefaultParticleColor());
setRectangle(DesignerHelper::getDefaultBoundingRect("ParticleCoreShell"));
addPort("out", NodeEditorPort::OUTPUT, NodeEditorPort::FORM_FACTOR)
diff --git a/GUI/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
index 438d059fe76..48a1429948e 100644
--- a/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
@@ -20,7 +20,6 @@
ParticleLayoutView::ParticleLayoutView(QGraphicsItem* parent) : ConnectableView(parent)
{
- setViewName("ParticleLayout");
setColor(QColor(135, 206, 50));
setRectangle(DesignerHelper::getParticleLayoutBoundingRect());
addPort("out", NodeEditorPort::OUTPUT, NodeEditorPort::PARTICLE_LAYOUT)
diff --git a/GUI/Views/SampleDesigner/ParticleView.cpp b/GUI/Views/SampleDesigner/ParticleView.cpp
index fc94d7a95d7..eaba862c6cf 100644
--- a/GUI/Views/SampleDesigner/ParticleView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleView.cpp
@@ -25,7 +25,6 @@
ParticleView::ParticleView(QGraphicsItem* parent) : ConnectableView(parent)
{
- setViewName("Particle");
setColor(DesignerHelper::getDefaultParticleColor());
setRectangle(DesignerHelper::getParticleBoundingRect());
addPort("out", NodeEditorPort::OUTPUT, NodeEditorPort::FORM_FACTOR)
diff --git a/GUI/Views/SampleDesigner/TransformationView.cpp b/GUI/Views/SampleDesigner/TransformationView.cpp
index a030bf0092a..ae78e585e1a 100644
--- a/GUI/Views/SampleDesigner/TransformationView.cpp
+++ b/GUI/Views/SampleDesigner/TransformationView.cpp
@@ -17,7 +17,6 @@
TransformationView::TransformationView(QGraphicsItem* parent) : ConnectableView(parent)
{
- setViewName("Rotation");
setColor(DesignerHelper::getDefaultTransformationColor());
setRectangle(DesignerHelper::getTransformationBoundingRect());
addPort("out", NodeEditorPort::OUTPUT, NodeEditorPort::TRANSFORMATION)
--
GitLab