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

rm unused InstrumentItem::defaultName()

parent 882ba02b
No related branches found
No related tags found
1 merge request!1373Offspecular instrument always has spherical detector
...@@ -372,11 +372,6 @@ QString SpecularInstrumentItem::instrumentType() const ...@@ -372,11 +372,6 @@ QString SpecularInstrumentItem::instrumentType() const
return "Specular"; return "Specular";
} }
QString SpecularInstrumentItem::defaultName() const
{
return "Specular";
}
ISimulation* SpecularInstrumentItem::createSimulation(const MultiLayer& sample) const ISimulation* SpecularInstrumentItem::createSimulation(const MultiLayer& sample) const
{ {
BasicAxisItem* const axis_item = beamItem()->inclinationAxisItem(); BasicAxisItem* const axis_item = beamItem()->inclinationAxisItem();
...@@ -490,11 +485,6 @@ void DepthprobeInstrumentItem::updateToRealData(const RealItem*) ...@@ -490,11 +485,6 @@ void DepthprobeInstrumentItem::updateToRealData(const RealItem*)
throw std::runtime_error("DepthprobeInstrumentItem::updateToRealData()"); throw std::runtime_error("DepthprobeInstrumentItem::updateToRealData()");
} }
QString DepthprobeInstrumentItem::defaultName() const
{
return "Depthprobe";
}
QString DepthprobeInstrumentItem::instrumentType() const QString DepthprobeInstrumentItem::instrumentType() const
{ {
return "Depth probe"; return "Depth probe";
...@@ -615,11 +605,6 @@ void GISASInstrumentItem::updateToRealData(const RealItem* item) ...@@ -615,11 +605,6 @@ void GISASInstrumentItem::updateToRealData(const RealItem* item)
detectorItem()->setYSize(data_shape[1]); detectorItem()->setYSize(data_shape[1]);
} }
QString GISASInstrumentItem::defaultName() const
{
return "GISAS";
}
QString GISASInstrumentItem::instrumentType() const QString GISASInstrumentItem::instrumentType() const
{ {
return "GISAS"; return "GISAS";
...@@ -740,11 +725,6 @@ void OffspecInstrumentItem::updateToRealData(const RealItem* dataItem) ...@@ -740,11 +725,6 @@ void OffspecInstrumentItem::updateToRealData(const RealItem* dataItem)
detectorItem()->setYSize(data_shape[1]); detectorItem()->setYSize(data_shape[1]);
} }
QString OffspecInstrumentItem::defaultName() const
{
return "Offspec";
}
QString OffspecInstrumentItem::instrumentType() const QString OffspecInstrumentItem::instrumentType() const
{ {
return "Off specular"; return "Off specular";
......
...@@ -82,9 +82,6 @@ public: ...@@ -82,9 +82,6 @@ public:
virtual void updateToRealData(const RealItem* item) = 0; virtual void updateToRealData(const RealItem* item) = 0;
virtual bool alignedWith(const RealItem* item) const; virtual bool alignedWith(const RealItem* item) const;
//! The default user visible name when creating an instrument
virtual QString defaultName() const = 0;
virtual const ICoordSystem* createCoordSystem() const = 0; virtual const ICoordSystem* createCoordSystem() const = 0;
bool withPolarizerAnalyzer() const; bool withPolarizerAnalyzer() const;
...@@ -147,7 +144,6 @@ public: ...@@ -147,7 +144,6 @@ public:
std::vector<int> shape() const override; std::vector<int> shape() const override;
void updateToRealData(const RealItem* item) override; void updateToRealData(const RealItem* item) override;
bool alignedWith(const RealItem* item) const override; bool alignedWith(const RealItem* item) const override;
QString defaultName() const override;
QString instrumentType() const override; QString instrumentType() const override;
const ICoordSystem* createCoordSystem() const override; const ICoordSystem* createCoordSystem() const override;
...@@ -167,7 +163,6 @@ public: ...@@ -167,7 +163,6 @@ public:
std::vector<int> shape() const override; std::vector<int> shape() const override;
void updateToRealData(const RealItem* item) override; void updateToRealData(const RealItem* item) override;
QString defaultName() const override;
QString instrumentType() const override; QString instrumentType() const override;
...@@ -217,7 +212,6 @@ class GISASInstrumentItem : public Instrument2DItem { ...@@ -217,7 +212,6 @@ class GISASInstrumentItem : public Instrument2DItem {
public: public:
std::vector<int> shape() const override; std::vector<int> shape() const override;
void updateToRealData(const RealItem* item) override; void updateToRealData(const RealItem* item) override;
QString defaultName() const override;
QString instrumentType() const override; QString instrumentType() const override;
const ICoordSystem* createCoordSystem() const override; const ICoordSystem* createCoordSystem() const override;
...@@ -236,7 +230,6 @@ public: ...@@ -236,7 +230,6 @@ public:
std::vector<int> shape() const override; std::vector<int> shape() const override;
void updateToRealData(const RealItem* item) override; void updateToRealData(const RealItem* item) override;
QString defaultName() const override;
QString instrumentType() const override; QString instrumentType() const override;
const ICoordSystem* createCoordSystem() const override; const ICoordSystem* createCoordSystem() const override;
......
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