Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LimaGroup
Lima-camera-frelon
Commits
fce4e486
Commit
fce4e486
authored
Jan 30, 2012
by
Sebastien Petitdemange
Browse files
change getPixelSize for non square pixel detector
parent
2f8a47a2
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/FrelonInterface.h
View file @
fce4e486
...
...
@@ -75,7 +75,7 @@ class DetInfoCtrlObj : public HwDetInfoCtrlObj
virtual
void
getCurrImageType
(
ImageType
&
curr_image_type
);
virtual
void
setCurrImageType
(
ImageType
curr_image_type
);
virtual
void
getPixelSize
(
double
&
pixel
_size
);
virtual
void
getPixelSize
(
double
&
x_size
,
double
&
y
_size
);
virtual
void
getDetectorType
(
std
::
string
&
det_type
);
virtual
void
getDetectorModel
(
std
::
string
&
det_model
);
...
...
src/FrelonInterface.cpp
View file @
fce4e486
...
...
@@ -106,12 +106,12 @@ void DetInfoCtrlObj::setCurrImageType(ImageType curr_image_type)
<<
"Only "
<<
DEB_VAR1
(
unique_image_type
)
<<
"allowed"
;
}
void
DetInfoCtrlObj
::
getPixelSize
(
double
&
pixel
_size
)
void
DetInfoCtrlObj
::
getPixelSize
(
double
&
x_size
,
double
&
y
_size
)
{
DEB_MEMBER_FUNCT
();
Model
&
model
=
m_cam
.
getModel
();
pixel
_size
=
model
.
getPixelSize
();
DEB_RETURN
()
<<
DEB_VAR1
(
pixel
_size
);
x_size
=
y
_size
=
model
.
getPixelSize
();
DEB_RETURN
()
<<
DEB_VAR1
(
x
_size
);
}
void
DetInfoCtrlObj
::
getDetectorType
(
std
::
string
&
det_type
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment