improve lastRoiFixed information

parent f46ce2cc
2017/09/27 14:36:42 ==========================================
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-27_143635]
to: [/t/rhoms1/install-2017-09-27_143635]
to: [/t/rhoms1/install-beta]
2017/09/27 14:34:47 ==========================================
#define PCO_SDK_VERSION "$Id: PCOSDK [1.20] $"
#define PCO_GIT_VERSION "$Id: PCO rev[2017-09-25 12:35:28 +0200] head[f46ce2c][f46ce2ccfb7cd82b4d648cc2fd69ac8d1f0769fd] ref[ (HEAD, master)] at [2017/09/27 14:34:46] $"
#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/27 14:34:46] $"
#define PROCLIB_GIT_VERSION "$Id: PROCLIB rev[2017-03-07 10:24:42 +0100] head[c80632d][c80632d5298bd81c4feb7cca52f7619884d9371e] ref[ (HEAD)] at [2017/09/27 14:34:46] $"
#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/27 14:34:46] $"
#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/27 14:34:46] $"
#define SPEC_GIT_VERSION "$Id: SPEC rev[2017-07-06 16:48:28 +0200] head[ea1013d][ea1013d3628c9cba1fd2491ebb4ed834e42eac24] ref[ (HEAD)] at [2017/09/27 14:34:46] $"
# 2017/09/25
- fix actual roi value
- fix actual roi value from pco
- improve lastRoiFixed information
#===================================================
#========= 2017/09/22 / lima patch for buff realloc
......
......@@ -428,7 +428,8 @@ Camera::Camera(const char *params) :
m_acq_frame_nb(1),
m_sync(NULL),
m_buffer(NULL),
m_handle(NULL)
m_handle(NULL),
m_Roi_lastFixed_time(0)
{
DEF_FNID;
DEB_CONSTRUCTOR();
......
......@@ -441,31 +441,39 @@ void Camera::getLastFixedRoi(std::string &o_sn)
ptr += sprintf_s(ptr, ptrMax - ptr, "* roi PCO ACTUAL X(%d,%d) Y(%d,%d) size(%d,%d)\n",
x0, x1, y0, y1, x1-x0+1, y1-y0+1);
limaRoi = limaRoiRequested;
x0 = limaRoi.getTopLeft().x - 1;
x1 = limaRoi.getBottomRight().x - 1;
y0 = limaRoi.getTopLeft().y - 1;
y1 = limaRoi.getBottomRight().y - 1;
ptr += sprintf_s(ptr, ptrMax - ptr, "* roi PCO REQUESTED X(%d,%d) Y(%d,%d) size(%d,%d) [%s]\n",
x0, x1, y0, y1, x1-x0+1, y1-y0+1, getTimestamp(Iso, dt));
limaRoi = limaRoiFixed;
x0 = limaRoi.getTopLeft().x - 1;
x1 = limaRoi.getBottomRight().x - 1;
y0 = limaRoi.getTopLeft().y - 1;
y1 = limaRoi.getBottomRight().y - 1;
ptr += sprintf_s(ptr, ptrMax - ptr, "* roi PCO FIXED X(%d,%d) Y(%d,%d) size(%d,%d)\n",
x0, x1, y0, y1, x1-x0+1, y1-y0+1);
if(dt)
{
limaRoi = limaRoiRequested;
x0 = limaRoi.getTopLeft().x - 1;
x1 = limaRoi.getBottomRight().x - 1;
y0 = limaRoi.getTopLeft().y - 1;
y1 = limaRoi.getBottomRight().y - 1;
ptr += sprintf_s(ptr, ptrMax - ptr, "* roi PCO REQUESTED X(%d,%d) Y(%d,%d) size(%d,%d) [%s]\n",
x0, x1, y0, y1, x1-x0+1, y1-y0+1, getTimestamp(Iso, dt));
limaRoi = limaRoiFixed;
x0 = limaRoi.getTopLeft().x - 1;
x1 = limaRoi.getBottomRight().x - 1;
y0 = limaRoi.getTopLeft().y - 1;
y1 = limaRoi.getBottomRight().y - 1;
ptr += sprintf_s(ptr, ptrMax - ptr, "* roi PCO FIXED X(%d,%d) Y(%d,%d) size(%d,%d)\n",
x0, x1, y0, y1, x1-x0+1, y1-y0+1);
}
else
{
ptr += sprintf_s(ptr, ptrMax - ptr, "* roi PCO FIXED - no roi fixed yet!\n");
}
bool bSymX, bSymY;
unsigned int xMax, yMax, xSteps, ySteps, xMinSize, yMinSize;
getXYdescription(xSteps, ySteps, xMax, yMax, xMinSize, yMinSize);
getRoiSymetrie(bSymX, bSymY );
ptr += sprintf_s(ptr, ptrMax - ptr, "* xSteps[%d] ySteps[%d] xMinSize[%d] yMinSize[%d] xSym[%d] ySym[%d]\n",
xSteps, ySteps, xMinSize, yMinSize, bSymX, bSymY);
ptr += sprintf_s(ptr, ptrMax - ptr, "* xySteps[%d,%d] xyMinSize[%d,%d] xyMaxSize[%d,%d] xySym[%d,%d]\n",
xSteps, ySteps, xMinSize, yMinSize, xMax, yMax, bSymX, bSymY);
//------
......
......@@ -996,32 +996,41 @@ const char *Camera::_talk(const char *_cmd, char *output, int lg){
ptr += sprintf_s(ptr, ptrMax - ptr, "* roi PCO ACTUAL X(%d,%d) Y(%d,%d) size(%d,%d)\n",
x0, x1, y0, y1, x1-x0+1, y1-y0+1);
limaRoi = limaRoiRequested;
x0 = limaRoi.getTopLeft().x - 1;
x1 = limaRoi.getBottomRight().x - 1;
y0 = limaRoi.getTopLeft().y - 1;
y1 = limaRoi.getBottomRight().y - 1;
ptr += sprintf_s(ptr, ptrMax - ptr, "* roi PCO REQUESTED X(%d,%d) Y(%d,%d) size(%d,%d) [%s]\n",
x0, x1, y0, y1, x1-x0+1, y1-y0+1, getTimestamp(Iso, dt));
if(dt)
{
limaRoi = limaRoiRequested;
x0 = limaRoi.getTopLeft().x - 1;
x1 = limaRoi.getBottomRight().x - 1;
y0 = limaRoi.getTopLeft().y - 1;
y1 = limaRoi.getBottomRight().y - 1;
limaRoi = limaRoiFixed;
x0 = limaRoi.getTopLeft().x - 1;
x1 = limaRoi.getBottomRight().x - 1;
y0 = limaRoi.getTopLeft().y - 1;
y1 = limaRoi.getBottomRight().y - 1;
ptr += sprintf_s(ptr, ptrMax - ptr, "* roi PCO REQUESTED X(%d,%d) Y(%d,%d) size(%d,%d) [%s]\n",
x0, x1, y0, y1, x1-x0+1, y1-y0+1, getTimestamp(Iso, dt));
ptr += sprintf_s(ptr, ptrMax - ptr, "* roi PCO FIXED X(%d,%d) Y(%d,%d) size(%d,%d)\n",
x0, x1, y0, y1, x1-x0+1, y1-y0+1);
limaRoi = limaRoiFixed;
x0 = limaRoi.getTopLeft().x - 1;
x1 = limaRoi.getBottomRight().x - 1;
y0 = limaRoi.getTopLeft().y - 1;
y1 = limaRoi.getBottomRight().y - 1;
ptr += sprintf_s(ptr, ptrMax - ptr, "* roi PCO FIXED X(%d,%d) Y(%d,%d) size(%d,%d)\n",
x0, x1, y0, y1, x1-x0+1, y1-y0+1);
}
else
{
ptr += sprintf_s(ptr, ptrMax - ptr, "* roi PCO FIXED - no roi fixed yet!\n");
}
bool bSymX, bSymY;
unsigned int xMax, yMax, xSteps, ySteps, xMinSize, yMinSize;
getXYdescription(xSteps, ySteps, xMax, yMax, xMinSize, yMinSize);
getRoiSymetrie(bSymX, bSymY );
ptr += sprintf_s(ptr, ptrMax - ptr, "* xSteps[%d] ySteps[%d] xMinSize[%d] yMinSize[%d] xSym[%d] ySym[%d]\n",
xSteps, ySteps, xMinSize, yMinSize, bSymX, bSymY);
ptr += sprintf_s(ptr, ptrMax - ptr, "* xySteps[%d,%d] xyMinSize[%d,%d] xyMaxSize[%d,%d] xySym[%d,%d]\n",
xSteps, ySteps, xMinSize, yMinSize, xMax, yMax, bSymX, bSymY);
return output;
......
......@@ -40,8 +40,8 @@ const char* _timestamp_pcoroictrlobj() {return ID_FILE_TIMESTAMP ;}
//=========================================================================================================
//=========================================================================================================
RoiCtrlObj::RoiCtrlObj(Camera *cam):
m_cam(cam),
m_handle(cam->getHandle())
m_cam(cam),
m_handle(cam->getHandle())
{
DEB_CONSTRUCTOR();
}
......
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