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
DetectorSoftware
pcosdk
Commits
49e6e4b9
Commit
49e6e4b9
authored
Nov 09, 2020
by
Yuelong Yu
Browse files
implemented binning for pco edge clhs
parent
fbfec4a8
Changes
3
Hide whitespace changes
Inline
Side-by-side
api/Version.h
View file @
49e6e4b9
...
...
@@ -24,5 +24,5 @@
namespace
PcoNS
{
const
std
::
string
PCOSDK_VERSION
=
"0.
5
"
;
const
std
::
string
PCOSDK_VERSION
=
"0.
6
"
;
}
pcoclhs/PcoEdgeCLHS.cpp
View file @
49e6e4b9
...
...
@@ -79,6 +79,41 @@ namespace PcoNS
return
SET_ERROR
;
return
ArmCamera
();
}
int
PcoEdgeCLHS
::
GetBinning
(
short
&
shBinHorz
,
short
&
shBinVert
)
{
unsigned
short
ushBinX
,
ushBinY
;
if
(
m_sptrCamera
->
PCO_GetBinning
(
&
ushBinX
,
&
ushBinY
)
!=
OK
)
return
GET_ERROR
;
shBinHorz
=
static_cast
<
short
>
(
ushBinX
);
shBinVert
=
static_cast
<
short
>
(
ushBinY
);
return
OK
;
}
int
PcoEdgeCLHS
::
SetBinning
(
short
shBinHorz
,
short
shBinVert
)
{
// if(m_sptrCamera->PCO_SetBinning(static_cast<unsigned short>(shBinHorz),
// static_cast<unsigned short>(shBinVert)) != OK)
// return SET_ERROR;
unsigned
short
binh
=
static_cast
<
unsigned
short
>
(
shBinHorz
);
unsigned
short
binv
=
static_cast
<
unsigned
short
>
(
shBinVert
);
if
(
m_sptrCamera
->
PCO_SetBinning
(
binh
,
binv
)
!=
OK
)
return
GET_ERROR
;
int
max_x
,
max_y
;
if
(
GetCameraMaxSize
(
max_x
,
max_y
)
!=
OK
)
return
GET_ERROR
;
short
x1
=
max_x
/
binh
;
short
y1
=
max_y
/
binv
;
if
(
SetROI
(
1
,
1
,
x1
,
y1
)
!=
OK
)
return
SET_ERROR
;
return
ArmCamera
();
//return OK;
}
int
PcoEdgeCLHS
::
PreAcq
()
{
...
...
pcoclhs/PcoEdgeCLHS.h
View file @
49e6e4b9
...
...
@@ -31,6 +31,9 @@ namespace PcoNS
bool
SetCamera
(
shared_ptr
<
CPco_com
>&
sptrCamera
);
int
GetLUT
(
short
&
shIdentifier
,
short
&
shParam
);
int
SetLUT
(
short
shIdentifier
,
short
shParam
);
int
GetBinning
(
short
&
shBinHorz
,
short
&
shBinVert
);
int
SetBinning
(
short
shBinHorz
,
short
shBinVert
);
int
StartAcq
(
int
nFrameNumbers
);
int
StopAcq
();
...
...
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