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
27f26312
Commit
27f26312
authored
Jan 12, 2012
by
Sebastien Petitdemange
Browse files
remove the directly send of Roi,Flip,Binning to the Hardware.
Thoses parameters are now send only after prepareAcq
parent
e263a252
Changes
1
Hide whitespace changes
Inline
Side-by-side
control/src/CtImage.cpp
View file @
27f26312
...
...
@@ -253,7 +253,6 @@ 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
())
...
...
@@ -285,7 +284,6 @@ 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
();
}
...
...
@@ -314,10 +312,8 @@ 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