Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
1552119e
Commit
1552119e
authored
2 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
rm unused InstrumentItem::defaultName()
parent
882ba02b
No related branches found
No related tags found
1 merge request
!1373
Offspecular instrument always has spherical detector
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/Model/Device/InstrumentItems.cpp
+0
-20
0 additions, 20 deletions
GUI/Model/Device/InstrumentItems.cpp
GUI/Model/Device/InstrumentItems.h
+0
-7
0 additions, 7 deletions
GUI/Model/Device/InstrumentItems.h
with
0 additions
and
27 deletions
GUI/Model/Device/InstrumentItems.cpp
+
0
−
20
View file @
1552119e
...
@@ -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"
;
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/Device/InstrumentItems.h
+
0
−
7
View file @
1552119e
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment