- fix actual pco roi value

parent 55c14b73
2017/09/22 15:51:18 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2017-09-22_155108]
to: [/t/rhoms1/install-2017-09-22_155108]
to: [/t/rhoms1/install-beta]
2017/09/22 15:48:39 ==========================================
#define PCO_SDK_VERSION "$Id: PCOSDK [1.20] $"
#define PCO_GIT_VERSION "$Id: PCO rev[2017-07-12 08:15:38 +0200] head[eae3c10][eae3c108127ae99d6f68747a3240179147fa42f8] ref[ (HEAD, gitrh/pco-dev02, pco-dev02)] at [2017/09/22 15:48:39] $"
#define LIMA_GIT_VERSION "$Id: LIMA rev[2017-09-22 15:27:46 +0200] head[fd4638e][fd4638e994b16d638591ac73c4755007030bc7c2] ref[ (HEAD, github/core-1.7, core-1.7)] at [2017/09/22 15:48:39] $"
#define PROCLIB_GIT_VERSION "$Id: PROCLIB rev[2017-03-07 10:24:42 +0100] head[c80632d][c80632d5298bd81c4feb7cca52f7619884d9371e] ref[ (HEAD)] at [2017/09/22 15:48:39] $"
#define LIBCONFIG_GIT_VERSION "$Id: LIBCONFIG rev[2013-02-07 18:08:29 +0100] head[89c411a][89c411a541d4ab4d66257ccb85749853fd685cbb] ref[ (HEAD, github/master, github/HEAD, master)] at [2017/09/22 15:48:39] $"
#define TANGO_GIT_VERSION "$Id: TANGO rev[2017-07-07 11:15:03 +0200] head[a0f38d2][a0f38d21199cc95f5e2a832478b534977b0249fb] ref[ (HEAD, github/master, github/HEAD, master)] at [2017/09/22 15:48:39] $"
#define SPEC_GIT_VERSION "$Id: SPEC rev[2017-07-06 16:48:28 +0200] head[ea1013d][ea1013d3628c9cba1fd2491ebb4ed834e42eac24] ref[ (HEAD)] at [2017/09/22 15:48:39] $"
# 2017/09/25
- fix actual roi value
#===================================================
#========= 2017/09/22 / lima patch for buff realloc
......
......@@ -709,8 +709,6 @@ namespace lima
int m_pcoError;
Roi m_RoiLima, m_RoiLimaRequested ;
Roi m_Roi_lastFixed_hw;
Roi m_Roi_lastFixed_requested;
time_t m_Roi_lastFixed_time;
......
......@@ -594,9 +594,7 @@ void Camera::_init(){
getXYsteps(maxwidth_step, maxheight_step);
_get_MaxRoi(m_RoiLima);
_get_MaxRoi(m_RoiLimaRequested);
WORD bitsPerPix;
getBitsPerPixel(bitsPerPix);
......
......@@ -1414,12 +1414,16 @@ unsigned long Camera::_pco_GetNumberOfImagesInSegment_MaxCalc(int segmentPco)
}
#else
int error;
int segmentArr = segmentPco-1;
unsigned long xroisize,yroisize;
unsigned long long pixPerFrame, pagesPerFrame;
xroisize = m_RoiLima.getSize().getWidth();
yroisize = m_RoiLima.getSize().getHeight();
Roi limaRoi;
_pco_GetROI(limaRoi, error);
xroisize = limaRoi.getSize().getWidth();
yroisize = limaRoi.getSize().getHeight();
//xroisize = m_roi.x[1] - m_roi.x[0] + 1;
//yroisize = m_roi.y[1] - m_roi.y[0] + 1;
......@@ -2640,6 +2644,7 @@ void Camera::_pco_SetROI(Roi roi, int &err)
}
_armRequired(true);
......
......@@ -282,10 +282,13 @@ void Camera::getTraceAcq(std::string &o_sn)
m_pcoData->traceAcq.iPcoBinHorz,
m_pcoData->traceAcq.iPcoBinVert);
Roi limaRoi;
int error;
_pco_GetROI(limaRoi, error);
Point top_left = m_RoiLima.getTopLeft();
Point bot_right = m_RoiLima.getBottomRight();
Size size = m_RoiLima.getSize();
Point top_left = limaRoi.getTopLeft();
Point bot_right = limaRoi.getBottomRight();
Size size = limaRoi.getSize();
unsigned int bytesPerPix; getBytesPerPixel(bytesPerPix);
ptr += sprintf_s(ptr, ptrMax - ptr, "* limaRoi xy0[%d,%d] xy1[%d,%d] size[%d,%d]\n",
......
......@@ -545,10 +545,13 @@ const char *Camera::_talk(const char *_cmd, char *output, int lg){
m_pcoData->traceAcq.iPcoBinHorz,
m_pcoData->traceAcq.iPcoBinVert);
Roi limaRoi;
int error;
_pco_GetROI(limaRoi, error);
Point top_left = m_RoiLima.getTopLeft();
Point bot_right = m_RoiLima.getBottomRight();
Size size = m_RoiLima.getSize();
Point top_left = limaRoi.getTopLeft();
Point bot_right = limaRoi.getBottomRight();
Size size = limaRoi.getSize();
unsigned int bytesPerPix; getBytesPerPixel(bytesPerPix);
ptr += sprintf_s(ptr, ptrMax - ptr, "* limaRoi xy0[%d,%d] xy1[%d,%d] size[%d,%d]\n",
......@@ -951,23 +954,16 @@ const char *Camera::_talk(const char *_cmd, char *output, int lg){
ptr += sprintf_s(ptr, ptrMax - ptr, "* roi PCO X(%d,%d) Y(%d,%d) size(%d,%d)\n",
x0, x1, y0, y1, x1-x0+1, y1-y0+1);
{
Point top_left = m_RoiLima.getTopLeft();
Point bot_right = m_RoiLima.getBottomRight();
Size size = m_RoiLima.getSize();
Point top_left = limaRoi.getTopLeft();
Point bot_right = limaRoi.getBottomRight();
Size size = limaRoi.getSize();
ptr += sprintf_s(ptr, ptrMax - ptr, "* roiLima PCO XY0(%d,%d) XY1(%d,%d) size(%d,%d)\n",
top_left.x, top_left.y,
bot_right.x, bot_right.y,
size.getWidth(), size.getHeight());
top_left = m_RoiLimaRequested.getTopLeft();
bot_right = m_RoiLimaRequested.getBottomRight();
size = m_RoiLimaRequested.getSize();
ptr += sprintf_s(ptr, ptrMax - ptr, "* roiLima REQUESTED XY0(%d,%d) XY1(%d,%d) size(%d,%d)\n",
top_left.x, top_left.y,
bot_right.x, bot_right.y,
size.getWidth(), size.getHeight());
}
......
......@@ -350,6 +350,10 @@ void Camera::_get_MaxRoi(Roi &roi){
//=========================================================================================================
void Camera::_get_RoiSize(Size& roi_size)
{
Roi limaRoi;
int error;
roi_size = m_RoiLima.getSize();
_pco_GetROI(limaRoi, error);
roi_size = limaRoi.getSize();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment