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
19b81a2a
Commit
19b81a2a
authored
6 years ago
by
Yurov, Dmitry
Browse files
Options
Downloads
Patches
Plain Diff
Made InstrumentItem::setShape a protected method
Redmine: #2217
parent
142152dd
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
GUI/coregui/Models/InstrumentItems.h
+9
-2
9 additions, 2 deletions
GUI/coregui/Models/InstrumentItems.h
with
9 additions
and
2 deletions
GUI/coregui/Models/InstrumentItems.h
+
9
−
2
View file @
19b81a2a
...
@@ -41,7 +41,6 @@ public:
...
@@ -41,7 +41,6 @@ public:
virtual
std
::
unique_ptr
<
Instrument
>
createInstrument
()
const
=
0
;
virtual
std
::
unique_ptr
<
Instrument
>
createInstrument
()
const
=
0
;
virtual
std
::
vector
<
int
>
shape
()
const
=
0
;
virtual
std
::
vector
<
int
>
shape
()
const
=
0
;
virtual
void
setShape
(
const
std
::
vector
<
int
>&
shape
)
=
0
;
virtual
void
clearMasks
()
{}
virtual
void
clearMasks
()
{}
virtual
void
importMasks
(
const
MaskContainerItem
*
)
{}
virtual
void
importMasks
(
const
MaskContainerItem
*
)
{}
virtual
void
updateToRealData
(
const
RealDataItem
*
item
);
virtual
void
updateToRealData
(
const
RealDataItem
*
item
);
...
@@ -52,6 +51,8 @@ protected:
...
@@ -52,6 +51,8 @@ protected:
void
initBeamGroup
(
const
QString
&
beam_model
);
void
initBeamGroup
(
const
QString
&
beam_model
);
void
initBackgroundGroup
();
void
initBackgroundGroup
();
virtual
void
setShape
(
const
std
::
vector
<
int
>&
shape
)
=
0
;
};
};
class
BA_CORE_API_
SpecularInstrumentItem
:
public
InstrumentItem
class
BA_CORE_API_
SpecularInstrumentItem
:
public
InstrumentItem
...
@@ -64,11 +65,13 @@ public:
...
@@ -64,11 +65,13 @@ public:
std
::
unique_ptr
<
Instrument
>
createInstrument
()
const
override
;
std
::
unique_ptr
<
Instrument
>
createInstrument
()
const
override
;
std
::
vector
<
int
>
shape
()
const
override
;
std
::
vector
<
int
>
shape
()
const
override
;
void
setShape
(
const
std
::
vector
<
int
>&
shape
)
override
;
void
updateToRealData
(
const
RealDataItem
*
item
)
override
;
void
updateToRealData
(
const
RealDataItem
*
item
)
override
;
bool
alignedWith
(
const
RealDataItem
*
item
)
const
override
;
bool
alignedWith
(
const
RealDataItem
*
item
)
const
override
;
std
::
unique_ptr
<
IUnitConverter
>
createUnitConverter
()
const
;
std
::
unique_ptr
<
IUnitConverter
>
createUnitConverter
()
const
;
protected:
void
setShape
(
const
std
::
vector
<
int
>&
shape
)
override
;
};
};
class
BA_CORE_API_
Instrument2DItem
:
public
InstrumentItem
class
BA_CORE_API_
Instrument2DItem
:
public
InstrumentItem
...
@@ -97,6 +100,8 @@ class BA_CORE_API_ GISASInstrumentItem : public Instrument2DItem
...
@@ -97,6 +100,8 @@ class BA_CORE_API_ GISASInstrumentItem : public Instrument2DItem
public:
public:
GISASInstrumentItem
();
GISASInstrumentItem
();
std
::
vector
<
int
>
shape
()
const
override
;
std
::
vector
<
int
>
shape
()
const
override
;
protected:
void
setShape
(
const
std
::
vector
<
int
>&
data_shape
)
override
;
void
setShape
(
const
std
::
vector
<
int
>&
data_shape
)
override
;
};
};
...
@@ -107,6 +112,8 @@ public:
...
@@ -107,6 +112,8 @@ public:
OffSpecInstrumentItem
();
OffSpecInstrumentItem
();
std
::
vector
<
int
>
shape
()
const
override
;
std
::
vector
<
int
>
shape
()
const
override
;
protected:
void
setShape
(
const
std
::
vector
<
int
>&
data_shape
)
override
;
void
setShape
(
const
std
::
vector
<
int
>&
data_shape
)
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