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
Jens Krüger
Lima
Commits
4aaf5664
Commit
4aaf5664
authored
Sep 07, 2012
by
Sebastien Petitdemange
Browse files
Revert "remove the directly send of Roi,Flip,Binning to the Hardware."
This reverts commit
27f26312
.
parent
dd1d4df0
Changes
1
Hide whitespace changes
Inline
Side-by-side
control/src/CtImage.cpp
View file @
4aaf5664
...
...
@@ -253,6 +253,7 @@ void CtHwBinRoiFlip::setBin(Bin& bin, bool round)
if
(
!
m_set_roi
.
isEmpty
())
m_set_roi
=
m_set_roi
.
getUnbinned
(
m_bin
);
m_hw_bin
->
setBin
(
set_bin
);
m_bin
=
set_bin
;
if
(
!
m_bin
.
isOne
()
&&
!
m_set_roi
.
isEmpty
())
...
...
@@ -284,6 +285,7 @@ void CtHwBinRoiFlip::setRoi(Roi& roi, bool round)
if
((
!
round
)
&&
(
real_roi
!=
roi
))
throw
LIMA_CTL_EXC
(
InvalidValue
,
"Given hardware roi not possible"
);
if
(
roi
!=
m_set_roi
)
{
m_hw_roi
->
setRoi
(
roi
);
m_set_roi
=
roi
;
_updateSize
();
}
...
...
@@ -312,8 +314,10 @@ void CtHwBinRoiFlip::setFlip(Flip& flip, bool mandatory)
if
(
mandatory
&&
set_flip
!=
flip
)
throw
LIMA_CTL_EXC
(
InvalidValue
,
"Given hardware flip not possible"
);
if
(
set_flip
!=
m_flip
)
{
m_hw_flip
->
setFlip
(
set_flip
);
m_flip
=
set_flip
;
}
flip
=
set_flip
;
}
}
...
...
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