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
4b7455e1
Commit
4b7455e1
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
rm unused fct
parent
c4b455f4
No related branches found
No related tags found
1 merge request
!2008
move source that accesses core from GUI/View to Model; rm unused source pair
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/Model/Mask/MaskUnitsConverter.cpp
+1
-9
1 addition, 9 deletions
GUI/Model/Mask/MaskUnitsConverter.cpp
GUI/Model/Mask/MaskUnitsConverter.h
+1
-2
1 addition, 2 deletions
GUI/Model/Mask/MaskUnitsConverter.h
with
2 additions
and
11 deletions
GUI/Model/Mask/MaskUnitsConverter.cpp
+
1
−
9
View file @
4b7455e1
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
#include
"Device/Data/Datafield.h"
#include
"Device/Data/Datafield.h"
#include
"GUI/Model/Data/Data2DItem.h"
#include
"GUI/Model/Data/Data2DItem.h"
#include
"GUI/Model/Data/ProjectionItems.h"
#include
"GUI/Model/Data/ProjectionItems.h"
MaskUnitsConverter
::
MaskUnitsConverter
()
MaskUnitsConverter
::
MaskUnitsConverter
()
:
m_data
(
nullptr
)
:
m_data
(
nullptr
)
,
m_direction
(
UNDEFINED
)
,
m_direction
(
UNDEFINED
)
...
@@ -31,15 +32,6 @@ void MaskUnitsConverter::convertToNbins(Data2DItem* intensityData)
...
@@ -31,15 +32,6 @@ void MaskUnitsConverter::convertToNbins(Data2DItem* intensityData)
convertData2DItem
(
intensityData
);
convertData2DItem
(
intensityData
);
}
}
//! Converts all masks on board of Data2DItem from bin-fraction coordinates to coordinates
//! of axes currently defined in Datafield.
void
MaskUnitsConverter
::
convertFromNbins
(
Data2DItem
*
intensityData
)
{
m_direction
=
FROM_NBINS
;
convertData2DItem
(
intensityData
);
}
//! Converts all masks on board of Data2DItem from/to bin-fraction coordinates
//! Converts all masks on board of Data2DItem from/to bin-fraction coordinates
void
MaskUnitsConverter
::
convertData2DItem
(
Data2DItem
*
intensityData
)
void
MaskUnitsConverter
::
convertData2DItem
(
Data2DItem
*
intensityData
)
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/Mask/MaskUnitsConverter.h
+
1
−
2
View file @
4b7455e1
...
@@ -19,7 +19,7 @@ class Data2DItem;
...
@@ -19,7 +19,7 @@ class Data2DItem;
class
Datafield
;
class
Datafield
;
class
MaskItem
;
class
MaskItem
;
//! The MaskUnitsConverter converts coordinates of all masks from one units to anoter.
//! The MaskUnitsConverter converts coordinates of all masks from one units to anot
h
er.
//! I.e. masks in 'mm' into masks in 'deg'. This is done in two steps.
//! I.e. masks in 'mm' into masks in 'deg'. This is done in two steps.
//! On first step masks are converted from native coordinates (as given by axes of Datafield)
//! On first step masks are converted from native coordinates (as given by axes of Datafield)
//! into bin-fraction coordinates.
//! into bin-fraction coordinates.
...
@@ -33,7 +33,6 @@ public:
...
@@ -33,7 +33,6 @@ public:
MaskUnitsConverter
();
MaskUnitsConverter
();
void
convertToNbins
(
Data2DItem
*
intensityData
);
void
convertToNbins
(
Data2DItem
*
intensityData
);
void
convertFromNbins
(
Data2DItem
*
intensityData
);
private
:
private
:
enum
class
Axis
{
X
,
Y
};
enum
class
Axis
{
X
,
Y
};
...
...
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