Commit a6696dc3 authored by Roberto Arturo Homs-Regojo's avatar Roberto Arturo Homs-Regojo
Browse files

Merge branch 'prepare-1.9' into 'master'

parents c77013bd d91713e6
Pipeline #14707 passed with stages
in 14 minutes and 38 seconds
......@@ -114,7 +114,7 @@ Standard: Cpp11
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
TabWidth: 8
TabWidth: 4
UseTab: Never
...
......@@ -14,3 +14,5 @@ PcoGitVersion.*
*.h.*
*.sip.*
*Makefile.*
build/
tango/build/
......@@ -22,7 +22,7 @@ build-noarch:
<<: *build-conda
stage: build-noarch
script:
- conda build ./conda/tango --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
- conda build ./conda/tango --prefix-length=80 --output-folder=dist/ -c tango-controls --channel=http://bcu-ci.esrf.fr/stable
dependencies:
- build-win
tags:
......@@ -45,7 +45,7 @@ deploy-devel:
only:
- branches
except:
- stable
- master
when: manual
deploy-stable:
......@@ -64,4 +64,3 @@ deploy-stable:
- linux
only:
- tags
- stable
###########################################################################
# This file is part of LImA, a Library for Image Acquisition
#
# Copyright (C) : 2009-2017
# Copyright (C) : 2009-2019
# European Synchrotron Radiation Facility
# BP 220, Grenoble 38043
# CS40220 38043 Grenoble Cedex 9
# FRANCE
#
# Contact: lima@esrf.fr
......@@ -26,8 +26,6 @@ cmake_minimum_required(VERSION 3.1)
project(pco)
set(NAME "pco") # This is used by LimaTools
# Include additional modules that are used inconditionnaly
include(GNUInstallDirs)
include(GenerateExportHeader)
......@@ -52,44 +50,28 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
endif()
if (CAMERA_MASTER_PROJECT)
find_package(Lima REQUIRED)
find_package(Lima REQUIRED COMPONENTS devel tools)
endif()
# CMake additional macros
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${LIMA_CMAKE_INCLUDE_DIRS} ${CMAKE_MODULE_PATH})
include(LimaTools)
# Set version
include(project_version)
# Enable git hash in the version
option(WITH_GIT_VERSION "compile python binding code?" OFF)
option(WITH_GIT_VERSION "include the git commit hash" OFF)
# Enable python binding code compilation using sip generator
option(CAMERA_ENABLE_PYTHON "compile python binding code?" LIMA_ENABLE_PYTHON)
if (CAMERA_ENABLE_PYTHON)
# Find python interpreter and libs
find_package(PythonInterp)
find_package(PythonLibs)
if(${PYTHONINTERP_FOUND})
# python site-packages folder
execute_process(
COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())"
OUTPUT_VARIABLE _PYTHON_SITE_PACKAGES_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
set(PYTHON_SITE_PACKAGES_DIR ${_PYTHON_SITE_PACKAGES_DIR} CACHE PATH "where should python modules be installed?")
find_package(SIP REQUIRED)
include(SIPMacros)
if(WIN32)
set(SIP_TAGS WIN32_PLATFORM)
elseif(UNIX)
set(SIP_TAGS POSIX_PLATFORM)
endif(WIN32)
set(SIP_EXTRA_OPTIONS -e -g)
if (CAMERA_MASTER_PROJECT)
option(LIMA_ENABLE_PYTHON "compile python binding code?" OFF)
option(LIMA_ENABLE_PYTANGO_SERVER "install python tango server?" OFF)
find_package(NumPy REQUIRED)
if (LIMA_ENABLE_PYTHON)
limatools_find_python_and_sip()
endif()
endif()
find_package(Pco REQUIRED)
......@@ -161,7 +143,7 @@ target_link_libraries(pco PUBLIC limacore)
target_compile_definitions(pco PUBLIC ${PCO_DEFINITIONS})
message("PCO_INCLUDE_DIRS: ${PCO_INCLUDE_DIRS}")
message("... PCO_INCLUDE_DIRS: ${PCO_INCLUDE_DIRS}")
target_include_directories(pco
PUBLIC "$<BUILD_INTERFACE:${PCO_INCLUDE_DIRS}>"
......@@ -177,8 +159,7 @@ if(WIN32)
endif()
# Binding code for python
if(CAMERA_ENABLE_PYTHON)
include(LimaTools)
if(LIMA_ENABLE_PYTHON)
limatools_run_sip_for_camera(pco)
endif()
......@@ -216,11 +197,16 @@ install(
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
if(CAMERA_ENABLE_PYTHON)
message("... LIMA_ENABLE_PYTHON: [${LIMA_ENABLE_PYTHON}]")
message("... PYTHON_SITE_PACKAGES_DIR: [${PYTHON_SITE_PACKAGES_DIR}]")
if(LIMA_ENABLE_PYTHON)
install(
FILES python/__init__.py
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/python/
DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/Lima/Pco"
)
)
if (LIMA_ENABLE_PYTANGO_SERVER)
add_subdirectory(tango)
endif()
endif()
## Tests
......
......@@ -146,7 +146,7 @@ conda install -c esrf-bcu lima-camera-pco
### Camera tango device server
conda install -c esrf-bcu lima-camera-pco-tango
conda install -c tango-controls -c esrf-bcu lima-camera-pco-tango
# LImA
......@@ -156,5 +156,6 @@ Lima is a C++ library which can be used with many different cameras. The library
## Documentation
The documentation is available [here](https://lima1.readthedocs.io/)
The documentation is available [here](https://lima.blissgarden.org)
......@@ -31,6 +31,9 @@ set(PCO_SDKLIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sdkPcoLin" CACHE PATH "location
if(WIN32)
find_path(PCO_INCLUDE_DIRS "PcoSdkVersion.h" ${PCO_SDKWIN_DIR})
list(APPEND PCO_INCLUDE_DIRS
${PCO_INCLUDE_DIRS}/include
)
find_library(PCO_LIBRARIES NAMES SC2_Cam.lib HINTS ${PCO_SDKWIN_DIR}/lib64)
else()
set(PCO_SDK_LIB_DIR "${PCO_SDKLIN_DIR}/pco_common/pco_lib" CACHE PATH "location of pco sdklib-lin")
......@@ -74,10 +77,10 @@ list(APPEND PCO_INCLUDE_DIRS
endif()
message("PCO_LIBRARIES ============================================")
message("PCO_INCLUDE_DIRS: ${PCO_INCLUDE_DIRS}")
message("PCO_LIBRARIES: ${PCO_LIBRARIES}")
message("==========================================================")
message("PCO_INCLUDE_DIRS: [${PCO_INCLUDE_DIRS}]")
message("PCO_LIBRARIES: [${PCO_LIBRARIES}]")
message("PCO_DEFINITIONS: [${PCO_DEFINITIONS}]")
message("==========================================================")
include(FindPackageHandleStandardArgs)
......
python get_git_log.py
echo "... [camera/bld.bat] enter"
rem cmake -Bbuild -H. -G "%CMAKE_GENERATOR%" -DCAMERA_ENABLE_PYTHON=1 -DCAMERA_ENABLE_TESTS=1 -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -DPYTHON_SITE_PACKAGES_DIR=%SP_DIR% -DCMAKE_FIND_ROOT_PATH=%LIBRARY_PREFIX%
python get_git_log.py
rem cmake -Bbuild -H. -G "%CMAKE_GENERATOR%" -DCAMERA_ENABLE_PYTHON=1 -DWITH_GIT_VERSION=1 -DLIMA_ENABLE_DEBUG=0 -DCAMERA_ENABLE_TESTS=1 -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -DPYTHON_SITE_PACKAGES_DIR=%SP_DIR% -DCMAKE_FIND_ROOT_PATH=%LIBRARY_PREFIX%
cmake -Bbuild -H. -G "%CMAKE_GENERATOR%" -DCAMERA_ENABLE_PYTHON=1 -DWITH_GIT_VERSION=1 -DLIMA_ENABLE_DEBUG=1 -DCAMERA_ENABLE_TESTS=1 -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -DPYTHON_SITE_PACKAGES_DIR=%SP_DIR% -DCMAKE_FIND_ROOT_PATH=%LIBRARY_PREFIX%
echo "... [camera/bld.bat] cmake compile"
cmake -Bbuild -H. -G "%CMAKE_GENERATOR%" -DLIMA_ENABLE_PYTHON=1 -DWITH_GIT_VERSION=1 -DLIMA_ENABLE_DEBUG=1 -DCAMERA_ENABLE_TESTS=1 -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -DPYTHON_SITE_PACKAGES_DIR=%SP_DIR% -DCMAKE_FIND_ROOT_PATH=%LIBRARY_PREFIX%
IF %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
rem cmake --build build --config Release --target install -- /verbosity:detailed
echo "... [camera/bld.bat] cmake build"
cmake --build build --config Release --target install -- /verbosity:minimal
IF %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
echo "... [camera/bld.bat] exit"
{% set version = GIT_DESCRIBE_TAG[1:] %}
# Strip the 'v' from the version tag
{% if GIT_DESCRIBE_TAG is defined %}
{% set version = GIT_DESCRIBE_TAG[1:] %}
{% else %}
{% set version = "0.0.0" %}
{% endif %}
package:
name: lima-camera-pco
......@@ -15,7 +20,7 @@ requirements:
- python {{ python }}
- numpy
- sip 4.19.8 # For compatibility with pyqt 5.9.2
- lima-core 1.8
- lima-core
- pco-sdk
build:
- git
......
xcopy tango\*.* %SP_DIR%\Lima\Server\camera\
echo "... [tango/bld.bat] enter"
cd tango
echo "... [tango/bld.bat] cmake compile"
cmake -Bbuild -H. -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -DPYTHON_SITE_PACKAGES_DIR=%SP_DIR% -DCMAKE_FIND_ROOT_PATH=%LIBRARY_PREFIX%
IF %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
echo "... [tango/bld.bat] cmake build"
cmake --build build --config Release --target install
IF %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
echo "... [tango/bld.bat] exit"
mkdir -p $SP_DIR/Lima/Server/camera && cp tango/*.* $SP_DIR/Lima/Server/camera
#!/bin/bash
cd tango/
cmake -Bbuild -H. -DCMAKE_INSTALL_PREFIX=$PREFIX -DPYTHON_SITE_PACKAGES_DIR=$SP_DIR -DCMAKE_FIND_ROOT_PATH=$PREFIX
cmake --build build --target install
{% set version = GIT_DESCRIBE_TAG[1:] %}
# Strip the 'v' from the version tag
{% if GIT_DESCRIBE_TAG is defined %}
{% set version = GIT_DESCRIBE_TAG[1:] %}
{% else %}
{% set version = "0.0.0" %}
{% endif %}
package:
name: lima-camera-pco-tango
......@@ -12,6 +17,10 @@ build:
noarch: python
requirements:
build:
- cmake
- git
- lima-core
run:
- lima-tango-server
- lima-camera-pco
......
2019/09/20 - dummy commit to test sync gitlab/github
2019/06/27 19:32:22 ==========================================
#define PCO_SDK_WIN_VERSION "$Id: PCOSDK_WIN [1.23] $"
......
......@@ -96,12 +96,13 @@ clXferPar ro DevString General CameraLink param
cocRunTime ro DevDouble cocRunTime (s) - only valid after the camera is armed
coolingTemperature ro DevDouble Cooling Temperature
debugInt rw DevString PCO plugin internal debug level (hex format: 0x....)
debugIntTypes r0 DevString PCO plugin internal debug types
debugIntTypes ro DevString PCO plugin internal debug types
doubleImageMode rw DevLong Double Image Mode
- enabled/disabled = 1/0 (rw)
- not allowed = -1 (ro)
firmwareInfo ro DevString Firmware info
frameRate ro DevDouble Framerate, calculated as: 1/cocRunTime (1/s)
generalCAPS1 ro DevString General PCO CAPS1 value (hex and bin)
info ro DevString General camera parameters information
lastError ro DevString The last PCO error message
lastImgAcquired ro DevLong Last image acquired (during recording)
......@@ -109,18 +110,21 @@ lastImgRecorded ro DevLong Last image recorded (dur
logMsg ro DevString Last Log msgs
logPcoEnabled ro DevLong PCO logs are enabled
maxNbImages ro DevLong The maximum number of images which can be acquired by the camera (recording mode)
paramsInfo ro DevString Values of the PCO properties **params**
pixelRate ro DevLong Actual Pixel Rate (Hz)
pixelRateInfo ro DevString Pixel Rate information
pixelRateValidValues ro DevString Allowed Pixel Rates
recorderForcedFifo rw DevLong Forced Fifo Mode (**only for recording cams**)
roiInfo ro DevString PCO ROI info
roiLastFixed ro DevString Last fixed ROI info
rollingShutter rw DevLong Rolling Shutter Mode (**only for some types of EDGE**)
rollingShutter rw DevLong Rolling Shutter Mode as int (**only for some types of EDGE**)
- 1 = ROLLING
- 2 = GLOBAL
- 4 = GLOBAL RESET
rollingShutterInfo ro DevString Rolling Shutter info
rollingShutterStr rw DevLong Rolling Shutter Mode as str (**only for some types of EDGE**)
temperatureInfo ro DevString Temperature info
test rw DevString Debug test function (**do not use it**)
timestampMode rw DevLong Timestamp mode
- 0 = none
- 1 = BCD coded stamp in the first 14 pixel
......
......@@ -572,6 +572,9 @@ namespace lima
DWORD dwMaxImageCnt[4];
WORD wRoiX0Now, wRoiY0Now, wRoiX1Now, wRoiY1Now;
WORD m_wArmWidth, m_wArmHeight, m_wMaxWidth, m_wMaxHeight;
WORD m_wBitPerPixel;
WORD wCamType;
DWORD dwSerialNumber;
......
#from Lima import Core
#from limapco import *
#from Lima import Core
from limapco import Pco as _P
globals().update(_P.__dict__)
......@@ -373,15 +373,18 @@ int BufferCtrlObj::_assignImage2Buffer(DWORD &dwFrameFirst, DWORD &dwFrameLast,
#endif
unsigned int uiMaxWidth, uiMaxHeight;
WORD wArmWidth, wArmHeight, wBitPerPixel;
WORD wArmWidth = m_pcoData->m_wArmWidth;
WORD wArmHeight = m_pcoData->m_wArmHeight;
WORD _wMaxWidth = m_pcoData->m_wMaxWidth;
WORD _wMaxHeight = m_pcoData->m_wMaxHeight;
WORD wBitPerPixel;
unsigned int bytesPerPixel;
WORD _wMaxWidth, _wMaxHeight;
//WORD _wMaxWidth, _wMaxHeight;
m_cam->_pco_GetSizes(&wArmWidth, &wArmHeight, &_wMaxWidth, &_wMaxHeight,
error);
m_cam->getMaxWidthHeight(uiMaxWidth, uiMaxHeight);
m_cam->getBytesPerPixel(bytesPerPixel);
m_cam->getBitsPerPixel(wBitPerPixel);
......@@ -448,12 +451,12 @@ int BufferCtrlObj::_assignImage2Buffer(DWORD &dwFrameFirst, DWORD &dwFrameLast,
void *myPcoBufferPtr = m_allocBuff.pcoAllocBufferPtr[bufIdx];
#if 0
if(myPcoBufferLen != myPcoBufferLenReal)
{
DEB_ALWAYS() << "ERROR myPcoBufferLen != myPcoBufferLenReal "
<< DEB_VAR2(myPcoBufferLen, myPcoBufferLenReal);
return -1;
}
if (myPcoBufferLen != myPcoBufferLenReal)
{
DEB_ALWAYS() << "ERROR myPcoBufferLen != myPcoBufferLenReal "
<< DEB_VAR2(myPcoBufferLen, myPcoBufferLenReal);
return -1;
}
#endif
......@@ -627,7 +630,7 @@ int BufferCtrlObj::_xferImag_buff2lima(DWORD &dwFrameIdx, int &bufIdx)
memcpy(ptrDest, ptrSrc, size);
}
//----- the image dwFrameIdx is already in the buffer -> callback
//----- the image dwFrameIdx is already in the buffer -> callback
// newFrameReady
//----- lima frame (0 ... N-1) PCO frame (1 ... N)
HwFrameInfoType frame_info;
......@@ -667,6 +670,20 @@ int BufferCtrlObj::_xferImag()
int maxWaitTimeout;
m_cam->getAcqTimeoutRetry(maxWaitTimeout);
WORD wArmWidth, wArmHeight;
WORD _wMaxWidth, _wMaxHeight;
unsigned int bytesPerPixel;
WORD wBitPerPixel;
m_cam->_pco_GetSizes(&wArmWidth, &wArmHeight, &_wMaxWidth, &_wMaxHeight,
error);
m_cam->getBytesPerPixel(bytesPerPixel);
m_cam->getBitsPerPixel(wBitPerPixel);
// DWORD dwLen = wArmWidth * wArmHeight * bytesPerPixel;
unsigned long long dbgWaitobj = m_cam->_getDebug(DBG_WAITOBJ);
unsigned long long dbgTraceFifo = m_cam->_getDebug(DBG_TRACE_FIFO);
......@@ -709,8 +726,8 @@ int BufferCtrlObj::_xferImag()
// --------------- ENTRY MSG
// -----------------------------------------------------------------------------------------
DEB_ALWAYS() << "\n... "
<< DEB_VAR4(requested_nb_frames, dwRequestedFrames, live_mode,
forcedFifo)
<< DEB_VAR6(requested_nb_frames, dwRequestedFrames, live_mode,
forcedFifo, dbgTraceFifo, dbgWaitobj)
<< m_cam->_sprintComment(
false, fnId, "[WaitForMultipleObjects]", "[ENTRY]");
......@@ -724,11 +741,11 @@ int BufferCtrlObj::_xferImag()
m_pcoData->traceAcq.nrImgRequested = dwRequestedFrames;
# if 0
if(!m_cam->_isRunAfterAssign())
{
DEB_TRACE() << "========================= recordingState 1 - BEFORE ASSIGN";
m_cam->_pco_SetRecordingState(1, error);
}
if (!m_cam->_isRunAfterAssign())
{
DEB_TRACE() << "========================= recordingState 1 - BEFORE ASSIGN";
m_cam->_pco_SetRecordingState(1, error);
}
# endif
// cleaning the buffers
......@@ -810,14 +827,6 @@ int BufferCtrlObj::_xferImag()
} // if((!runAfterAssign)
} // for(int i = 0; i <m_cam->m_pco_buffer_nrevents;
WORD wArmWidth, wArmHeight;
unsigned int bytesPerPixel;
WORD _wMaxWidth, _wMaxHeight;
m_cam->_pco_GetSizes(&wArmWidth, &wArmHeight, &_wMaxWidth, &_wMaxHeight,
error);
m_cam->getBytesPerPixel(bytesPerPixel);
// DWORD dwLen = wArmWidth * wArmHeight * bytesPerPixel;
// Edge cam must be started just after assign buff to avoid lost of img
if (m_cam->_isRunAfterAssign())
......@@ -836,14 +845,15 @@ int BufferCtrlObj::_xferImag()
}
// -----------------------------------------------------------------------------------------
// --------------- loop - process the N frames (dwFrameIdx <=
// dwRequestedFrames)
// loop - process the N frames
// (dwFrameIdx <= dwRequestedFrames)
// -----------------------------------------------------------------------------------------
bool bReadRAM = false;
bool bCamRAM = m_cam->_isCameraType(camRAM);
for (dwFrameIdx = 1; dwFrameIdx <= dwRequestedFrames;)
{
DEB_TRACE() << "[LOOP] --- " <<DEB_VAR4(fnId, dwFrameIdx, dwRequestedFrames, forcedFifo);
if (dbgWaitobj)
{
char msg[256];
......@@ -878,7 +888,7 @@ int BufferCtrlObj::_xferImag()
// -----------------------------------------------------------------------------------------
// ---------------------------------- find buffIdx associated with the
// next image dwFrameIdx
// next image dwFrameIdx PCO frame 1 ...
// -----------------------------------------------------------------------------------------
SHORT sBufNr;
DWORD dwBuffFrame;
......@@ -982,6 +992,14 @@ int BufferCtrlObj::_xferImag()
iLoopsPolled++;
} while (!(dwStatusDll & 0x00008000));
// 0x00008000 = Buffer event is set
// dwStatusDll DWORD *Pointer to a DWORD variable to get the status
// inside the SDK DLL :
// 0x80000000 = Buffer is allocated
// 0x40000000 = Buffer event created inside the SDK DLL
// 0x20000000 = Buffer is allocated externally
// 0x00008000 = Buffer event is set
if (dbgTraceFifo)
{
......@@ -1005,16 +1023,26 @@ int BufferCtrlObj::_xferImag()
dwStatusDrv, errPco, iLoopsPolled);
DEB_ALWAYS() << msg;
}
if (dwFrameIdx >= dwRequestedFrames)
{
int error;
// ------------- stop the recording and clear buffers
m_cam->_pco_SetRecordingState(0, error);
}
int xferRet = _xferImag_buff2lima(dwFrameIdx, bufIdx);
# if 0
// test code to stop the pco recording when the
// last image was acquired
// dwFrameIdx -> pco frame -> 1 ...
DWORD dwFrameIdx1 = dwFrameIdx + 1;
if ((dwFrameIdx) >= dwRequestedFrames)
{
int error;
// ------------- stop the recording and clear buffers
DEB_ALWAYS() << "\n ... _pco_SetRecordingState(0) when: "
<< DEB_VAR3(dwFrameIdx, dwFrameIdx1,
dwRequestedFrames);
m_cam->_pco_SetRecordingState(0, error);
}
# endif
int xferRet = _xferImag_buff2lima(dwFrameIdx, bufIdx);
if (dbgTraceFifo)
{
printf("---TRACE _xferImag_buff2lima sBufNr[%d] dwFrameIdx[%d]\n",
......@@ -1132,11 +1160,6 @@ int BufferCtrlObj::_xferImag()
WORD wSegment;
DWORD dwImgToRead, dwFirstImg, dwImgIdx;
WORD _wArmWidth, _wArmHeight, _wBitPerPixel;
WORD _wMaxWidth, _wMaxHeight;
m_cam->_pco_GetSizes(&_wArmWidth, &_wArmHeight, &_wMaxWidth,
&_wMaxHeight, error);
m_cam->getBitsPerPixel(_wBitPerPixel);
// ------------- stop the recording and clear buffers
m_cam->_pco_SetRecordingState(0, error);
......@@ -1171,7 +1194,8 @@ int BufferCtrlObj::_xferImag()
// ------------- _pco_GetImageEx only allows read 1 img, so
// dwFirstImg = dwLastImg
m_cam->_pco_GetImageEx(wSegment, dwImgIdx, dwImgIdx, sBufNr,
_wArmWidth, _wArmHeight, _wBitPerPixel,
m_pcoData->m_wArmWidth, m_pcoData->m_wArmHeight,
wBitPerPixel,
error);
int xferRet = _xferImag_buff2lima(dwFrameIdx, bufIdx);
......@@ -1516,7 +1540,7 @@ int BufferCtrlObj::_xferImag_getImage()
switch (_stopReq)
{
// case stopProcessing:
// case stopProcessing:
case stopRequest:
_retStatus = pcoAcqTransferStop;
break;
......@@ -1753,7 +1777,7 @@ int BufferCtrlObj::_xferImag_getImage_edge()
switch (_stopReq)
{
// case stopProcessing:
// case stopProcessing:
case stopRequest:
_retStatus = pcoAcqTransferStop;
break;
......@@ -2013,10 +2037,10 @@ int BufferCtrlObj::_xferImagMult()
}
#if 0
DEB_TRACE()
<< "\n PCO_GetImageEx() ===>"
<< "\n " << DEB_VAR5( dwFrameIdx, dwFrameIdxFirst, dwFrameIdxLast, dwFramesPerBuffer, dwRequestedFrames)
<< "\n " << DEB_VAR5(wSegment, sBufNr, _wArmWidth, _wArmHeight, _wBitPerPixel);
DEB_TRACE()
<< "\n PCO_GetImageEx() ===>"
<< "\n " << DEB_VAR5(dwFrameIdx, dwFrameIdxFirst, dwFrameIdxLast, dwFramesPerBuffer, dwRequestedFrames)
<< "\n " << DEB_VAR5(wSegment, sBufNr, _wArmWidth, _wArmHeight, _wBitPerPixel);
#endif
usElapsedTimeSet(usStartPco);
......@@ -2098,7 +2122,7 @@ int BufferCtrlObj::_xferImagMult()
switch (_stopReq)
{
// case stopProcessing:
// case stopProcessing:
case stopRequest:
_retStatus = pcoAcqTransferStop;
break;
......@@ -2127,23 +2151,23 @@ void BufferCtrlObj::_pcoAllocBuffers(bool max)
# if 0
if(!m_allocBuff.createEventsDone){
for(bufIdx=0; bufIdx <m_cam->m_pco_buffer_nrevents; bufIdx++) {
// Create two event objects
m_allocBuff.bufferAllocEvent[bufIdx] = CreateEvent(
NULL, // default security attributes
true, // auto-reset event object = false / manual reset = true
false, // initial state is nonsignaled
NULL); // unnamed object
if (!m_allocBuff.bufferAllocEvent[bufIdx])
{
THROW_HW_ERROR(NotSupported) << "CreateEvent error";
}
}
m_allocBuff.createEventsDone = true;
}
if (!m_allocBuff.createEventsDone) {
for (bufIdx = 0; bufIdx < m_cam->m_pco_buffer_nrevents; bufIdx++) {
// Create two event objects
m_allocBuff.bufferAllocEvent[bufIdx] = CreateEvent(
NULL, // default security attributes
true, // auto-reset event object = false / manual reset = true
false, // initial state is nonsignaled
NULL); // unnamed object
if (!m_allocBuff.bufferAllocEvent[bufIdx])
{
THROW_HW_ERROR(NotSupported) << "CreateEvent error";
}
}
m_allocBuff.createEventsDone = true;
}