Commit f0234126 authored by Roberto Arturo Homs-Regojo's avatar Roberto Arturo Homs-Regojo

Merge branch '16-generate-conda-packages' into 'master'

16 generate conda packages

See merge request !3
parents 7d5e257a dbc2486d
......@@ -31,11 +31,20 @@ set(PCO_SDKLIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sdkPcoLin" CACHE PATH "location
IF(WIN32)
#Sources
SET(${NAME}_srcs src/PcoCamera.cpp src/PcoInterface.cpp src/PcoDetInfoCtrlObj.cpp
src/PcoSyncCtrlObj.cpp src/PcoRoiCtrlObj.cpp
src/PcoBufferCtrlObj.cpp src/PcoHwEventCtrlObj.cpp
src/PcoCameraUtils.cpp src/PcoCameraSdk.cpp)
SET(${NAME}_srcs
src/PcoBinCtrlObj.cpp
src/PcoBufferCtrlObj.cpp
src/PcoCamera.cpp
src/PcoCameraSdk.cpp
src/PcoCameraSdkWin.cpp
src/PcoCameraSip.cpp
src/PcoCameraUtils.cpp
src/PcoDetInfoCtrlObj.cpp
src/PcoHwEventCtrlObj.cpp
src/PcoInterface.cpp
src/PcoRoiCtrlObj.cpp
src/PcoSyncCtrlObj.cpp
)
ADD_LIBRARY(lima${NAME} SHARED ${${NAME}_srcs})
......@@ -50,8 +59,6 @@ IF(WIN32)
TARGET_LINK_LIBRARIES(lima${NAME} ${PCO_LIB_CAM})
limatools_set_library_soversion(lima${NAME} "VERSION")
SET_TARGET_PROPERTIES(lima${NAME} PROPERTIES PREFIX "lib")
INSTALL(TARGETS lima${NAME} DESTINATION lib)
IF(LIMA_ENABLE_PYTHON)
limatools_run_sip_for_camera(${NAME})
......@@ -126,15 +133,14 @@ if(UNIX)
limatools_set_library_soversion(lima${NAME} "VERSION")
install(TARGETS lima${NAME} LIBRARY DESTINATION lib)
if(LIMA_ENABLE_PYTHON)
limatools_run_sip_for_camera(${NAME})
install(FILES python/__init__.py DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/Lima/Pco")
endif()
endif()
limatools_set_install_libdir(lima${NAME})
#============================================================================
#============================================================================
......@@ -661,7 +661,7 @@ namespace lima
DEB_CLASS_NAMESPC(DebModCamera,"Camera","Pco");
public:
Camera(const char *camPar);
Camera(const std::string& camPar);
~Camera();
enum Status {Fault,Ready,Exposure,Readout,Latency,Config};
......@@ -706,7 +706,7 @@ namespace lima
void getCameraName(std::string& name);
const char *talk(const char *cmd);
const char *talk(const std::string& cmd);
const char *_talk(const char *cmd, char *output, int lg);
......
......@@ -8,14 +8,14 @@ namespace Pco
%End
public:
Camera(const char*);
Camera(const std::string&);
~Camera();
void startAcq();
void reset(int);
const char *talk(const char *cmd);
const char *talk(const std::string& cmd);
int getNbAcquiredFrames();
......
......@@ -803,7 +803,7 @@ Camera::_AcqThread::~_AcqThread()
//=========================================================================================================
//=========================================================================================================
Camera::Camera(const char *params)
Camera::Camera(const std::string& camPar)
{
//DEF_FNID;
DEB_CONSTRUCTOR();
......@@ -850,7 +850,7 @@ Camera::Camera(const char *params)
// properties: params
paramsInit(params);
paramsInit(camPar.c_str());
char *value;
const char *key;
......
......@@ -2831,7 +2831,7 @@ void Camera::_pco_GetFirmwareInfo(char *buf_in, int size_in, int &err)
PCO_FW_Vers strFirmwareVersion;
WORD wblock = 0;
int iCnt, err;
int iCnt;
// err = PCO_GetFirmwareInfo(m_handle, wblock++, &strFirmwareVersion);
err = PCO_GetFirmwareInfo(m_handle, wblock++, &strFirmwareVersion);
nrDev = (err == PCO_NOERROR) ? strFirmwareVersion.DeviceNum : 0;
......
......@@ -132,6 +132,7 @@ time_t getTimestamp() { return time(NULL); }
//$Id: [Oct 8 2013 15:21:07] [Tue Oct 8 15:21:07 2013] (..\..\..\..\src\PcoCamera.cpp) $
#define LEN_BUFF_DATE 128
#define LEN_BUFF_PATH 260 //Same as MAX_PATH under Windows
#define TOKNR_DT 5
......@@ -171,9 +172,9 @@ int __xlat_date(char *s1, char &ptrTo, int lenTo) {
}
char *_xlat_date(char *s1, char *s2, char *s3) {
static char buff[LEN_BUFF_DATE+1];
static char buff[2 * LEN_BUFF_DATE + LEN_BUFF_PATH];
char *ptr = buff;
char *ptrMax = buff + LEN_BUFF_DATE;
char *ptrMax = buff + sizeof(buff) - 1;
ptr += sprintf_s(ptr, ptrMax - ptr, "$Id: comp[");
ptr += __xlat_date(s1, *ptr, (int) (ptrMax - ptr));
......@@ -263,14 +264,14 @@ void stcPcoData::traceMsg(char *s){
}
static char buff[BUFF_INFO_SIZE +16];
const char *Camera::talk(const char *cmd){
const char *Camera::talk(const std::string& cmd){
DEB_MEMBER_FUNCT();
static char buff[BUFF_INFO_SIZE +16];
sprintf_s(buff, BUFF_INFO_SIZE, "talk> %s", cmd);
sprintf_s(buff, BUFF_INFO_SIZE, "talk> %s", cmd.c_str());
m_msgLog->add(buff);
return _talk(cmd, buff, BUFF_INFO_SIZE);
return _talk(cmd.c_str(), buff, BUFF_INFO_SIZE);
}
#define NRTOK 10
......
......@@ -24,7 +24,7 @@
//=========================================================================================================
//=========================================================================================================
Camera::Camera(const char *params) :
Camera::Camera(const std::string& camPar) :
m_cam_connected(false),
m_acq_frame_nb(1),
m_sync(NULL),
......@@ -58,7 +58,7 @@ Camera::Camera(const char *params) :
// properties: params
paramsInit(params);
paramsInit(camPar.c_str());
char *value;
const char *key;
......
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