Commit 5604b03a authored by unknown's avatar unknown

Merge branch 'master' of git://github.com/esrf-bliss/Lima-camera-pco into cmake

parents 814ba72e 218da5f2
call limasetdir
cd /D %GITLIMADIR%
cd install\Lima
@echo off
rem ================================================================================================================================
rem ================================================================================================================================
rem shortcut / tarjet:
rem %comspec% /k ""C:\Program Files\Microsoft Visual Studio 9.0\VC\lima_pco_ds_vc.bat"" install-2014-10-24_121113 160.103.36.67 edge
rem shortcut / start in : "C:\Program Files\Microsoft Visual Studio 9.0\"
rem this file MUST be located in C:\Program Files\Microsoft Visual Studio 9.0\VC\
rem the directory install (%1) must be located in c:\blissadm\
rem ================================================================================================================================
rem ================================================================================================================================
if not exist "%~dp0bin\vcvars32.bat" goto missing
call "%~dp0bin\vcvars32.bat"
goto doit
:missing
echo The specified configuration type is missing. The tools for the
echo configuration might not be installed.
pause
goto :eof
rem python LimaCCDs.py pcodimax1 -ORBendPoint giop:tcp:160.103.35.39:
:doit
c:
@echo on
rem cd c:\blissadm\lima\pco\%1
cd c:\blissadm\%1
python LimaCCDs.py %3 -ORBendPoint giop:tcp:%2:
pause
:eof
call limasetdir
cd /D %GITLIMADIR%
call limasetdir
robocopy %GITLIMADIR%\install %LIMAPCODIR% /S
call limasetdir
cd /D %GITLIMADIR%
cd install
dir *.py
python LimaCCDs.py pco > 1.txt
call limasetdir
cd /D %GITLIMADIR%
cd install
dir *.py
python LimaCCDs.py pco
call limasetdir
cd /D %GITLIMADIR%\install
dir *.py
call limasetdir
cd /D %GITLIMADIR%\third-party\Processlib
@echo off
c:
set GITLIMADIR=c:\blissadm\git\Lima
set LIMAPCODIR=c:\blissadm\lima\pco\install
IF NOT EXIST %LIMAPCODIR% mkdir %LIMAPCODIR%
IF not EXIST %GITLIMADIR%\install mkdir %GITLIMADIR%\install
IF not EXIST %GITLIMADIR%\install\lima mkdir %GITLIMADIR%\install\Lima
rem set GITLIMADIR="R:\dserver\classes\ccd\pco_rh\Lima\install\Lima"
@echo on
\ No newline at end of file
call limasetdir
cd /D %GITLIMADIR%\third-party\Processlib\sip
python configure.py
nmake clean
nmake
cd /D %GITLIMADIR%
windowsSipCompilation.py --config
windowsSipCompilation.py
call limasetdir
cd /D %LIMAPCODIR%
python LimaCCDs.py pco
import time
if __name__ == '__main__':
print time.strftime("%Y-%m-%d-%H%M%S")
@echo off
set PCODIR="C:\ProgramData\pco"
set BATDIR="c:\blissadm\pco\bat"
set LOGSONDIR="%BATDIR%\pcoLogsON"
set APPLICATION="%BATDIR%\getDate.py"
set DATEFILE="%PCODIR%\enviroment.txt"
c:
cd %PCODIR%
python %APPLICATION% > %DATEFILE%
set /P CurrentDate=<%DATEFILE%
set >> %DATEFILE%
md %CurrentDate%
copy *.log %CurrentDate%
copy *.txt %CurrentDate%
copy *.ini %CurrentDate%
@echo off
set PCODIR="C:\ProgramData\pco"
set BATDIR="c:\blissadm\pco\bat"
set LOGSONDIR="%BATDIR%\pcoLogsON"
set APPLICATION="%BATDIR%\getDate.py"
set DATEFILE="%PCODIR%\enviroment.txt"
c:
cd %PCODIR%
python %APPLICATION% > %DATEFILE%
set /P CurrentDate=<%DATEFILE%
set >> %DATEFILE%
md %CurrentDate%
move *.log %CurrentDate%
move *.txt %CurrentDate%
copy *.ini %CurrentDate%
\ No newline at end of file
@echo off
set PCODIR="C:\ProgramData\pco"
set BATDIR="c:\blissadm\pco\bat"
set LOGSONDIR="%BATDIR%\pcoLogsON"
set APPLICATION="%BATDIR%\getDate.py"
set DATEFILE="%PCODIR%\enviroment.txt"
c:
cd %PCODIR%
python %APPLICATION% > %DATEFILE%
set /P CurrentDate=<%DATEFILE%
md %CurrentDate%
move *.log %CurrentDate%
move *.txt %CurrentDate%
copy *.ini %CurrentDate%
rem =========================================
set >> %DATEFILE%
copy %LOGSONDIR%\*.ini .
copy %LOGSONDIR%\*.log .
@echo off
rem %comspec% /k ""C:\Program Files\Microsoft Visual Studio 9.0\VC\lima_pco_ds.bat"" install pco4k 160.103.35.39
rem %comspec% /k ""C:\Program Files\Microsoft Visual Studio 9.0\VC\lima_pco_ds.bat"" install-ok
rem if not exist "%~dp0bin\vcvars32.bat" goto missing
rem call "%~dp0bin\vcvars32.bat"
rem goto doit
@echo on
c:
cd "C:\Program Files\Microsoft Visual Studio 9.0\VC\"
if not exist ".\bin\vcvars32.bat" goto missing
call ".\bin\vcvars32.bat"
goto doit
:missing
echo The specified configuration type is missing. The tools for the
echo configuration might not be installed.
pause
goto :eof
:doit
c:
@echo on
cd c:\blissadm\lima\pco\%1
python LimaCCDs.py %2 -ORBendPoint giop:tcp:%3:
pause
:eof
[ExtLog]
EXTLOG=1
EXTLOG_BEFORE_CAMWARE=0
[Logging]
LOGGING=0x0000FFFF
[Logging]
LOGGING=0x000FFFFF
[Logging]
LOGGING=0x000FFFFF
[Logging]
LOGGING=0x000FFFFF
[Logging]
LOGGING=0x0000FFFF
[Logging]
LOGGING=0x000FFFFF
[Logging]
LOGGING=0x000FFFFF
[Logging]
LOGGING=0x000FFFFF
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Version="9,00"
Name="liblimapco"
ProjectGUID="{D821F68F-28BF-4A97-BF3C-83DCA6405475}"
RootNamespace="liblimapco"
......@@ -497,6 +497,10 @@
RelativePath="..\..\..\..\src\PcoCamera.cpp"
>
</File>
<File
RelativePath="..\..\..\..\src\PcoCameraSdk.cpp"
>
</File>
<File
RelativePath="..\..\..\..\src\PcoCameraUtils.cpp"
>
......@@ -625,6 +629,10 @@
<Filter
Name="doc"
>
<File
RelativePath="..\..\..\..\cpInstall"
>
</File>
<File
RelativePath="..\..\..\..\doc\index.rst"
>
......@@ -653,6 +661,10 @@
RelativePath="..\..\..\..\doc\VERSION.log"
>
</File>
<File
RelativePath="..\..\..\..\..\..\windowsInstall.py"
>
</File>
</Filter>
<Filter
Name="tango"
......@@ -678,6 +690,18 @@
>
</File>
</Filter>
<Filter
Name="sip"
>
<File
RelativePath="..\..\..\..\sip\PcoCamera.sip"
>
</File>
<File
RelativePath="..\..\..\..\sip\PcoInterface.sip"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
......
......@@ -5,26 +5,39 @@ REMDIR="/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco"
REMHOST="blissadm@lid00a"
#LOCDIR="/c/blissadm/git/pco/Lima/install"
LOCDIR="../../install"
LOCDIR_BAT="./bat"
TMPDIR="/t/rhoms1"
DLL="Lima/liblimapco.dll"
LOG="./doc/VERSION.log"
DT=`date +"%Y-%m-%d_%H%M%S"`
INSTALL="install-${DT}"
INSTALLBETA="install-beta"
INSTALLBETA_OLD="install-beta-${DT}"
echo ${INSTALL} > ${LOCDIR}/INSTALL_VERSION.txt
{
echo ${INSTALL}
echo
./ident.exe ${LOCDIR}/${DLL}
}> ${LOCDIR}/INSTALL_VERSION.txt
scp -r ${LOCDIR}/ ${REMHOST}:${REMDIR}/${INSTALL}
mkdir -p ${TMPDIR}/${INSTALL}/bat
cp -r ${LOCDIR}/ ${TMPDIR}/${INSTALL}
cp ${LOCDIR_BAT}/*.bat ${TMPDIR}/${INSTALL}/bat
mv ${TMPDIR}/${INSTALLBETA} ${TMPDIR}/${INSTALLBETA_OLD}
cp -r ${LOCDIR}/ ${TMPDIR}/${INSTALLBETA}
mkdir -p ${TMPDIR}/${INSTALLBETA}/bat
cp ${LOCDIR_BAT}/*.bat ${TMPDIR}/${INSTALLBETA}/bat
scp -r ${TMPDIR}/${INSTALL} ${REMHOST}:${REMDIR}
{
echo
date "+%Y/%m/%d %H:%M:%S =========================================="
echo "scp: copied local directory to segfs and /tmp_14_days:"
echo "from: [${LOCDIR}/]"
echo "from: [${LOCDIR}/] and [${LOCDIR_BAT}/]"
echo " to: [${REMHOST}:${REMDIR}/${INSTALL}]"
echo " to: [${TMPDIR}/${INSTALL}]"
echo " to: [${TMPDIR}/${INSTALLBETA}]"
......
This diff is collapsed.
......@@ -4,6 +4,28 @@
#===================================================
#===================================================
2016/06/06 17:29:24 ==========================================
- long tests done with pco gold /cameralink (wid19edge - 64b)
+++ total nrImages[32768][pco: 32768 lima: 32768 diff: 0] expTime[0.0001] execTime[822.088] fps[39.8595][40.5825] sn[62000031] [2016/06/06 19:30:31]
2016/06/03 17:48:13 ==========================================
- long tests done with pco edge/cameralink (wid19edge - 64b)
+++ total nrImages[32768][pco: 32768 lima: 32768 diff: 0] expTime[0.0001] execTime[666.811] fps[49.1414][50.3204] sn[429][2016/06/03 18:57:46]
#===================================================
# 2016/05/20
# update the working test version with usb3 / pco edge gold
#===================================================
- test running version
comp[2015/12/11 13:17:57] file[2015/12/11 13:16:45] [..\..\..\..\src\PcoCamera.cpp]
install-2015-12-11_131825
Branches: develop_02, remotes/github/develop_02
d2f1fe0cd12ab1c3433d6960bd73c7e1078865e7
2015-12-11 14:26:34
#===================================================
......
File added
......@@ -52,11 +52,16 @@
#define ERR_SIZE 256
#define ERRMSG_SIZE (256+128)
#define MODEL_TYPE_SIZE 32
#define INTERFACE_TYPE_SIZE 32
#define MODEL_TYPE_SIZE 64
#define MODEL_SUBTYPE_SIZE 64
#define INTERFACE_TYPE_SIZE 64
#define CAMERA_NAME_SIZE 128
#define MSG_SIZE 512
#define BUFF_XLAT_SIZE 128
#define MSG1K (1024 * 1)
#define MSG2K (1024 * 2)
#define MSG4K (1024 * 4)
#define MSG8K (1024 * 8)
#define ID_TIMESTAMP "$Id: [" __DATE__ " " __TIME__ "] [" __TIMESTAMP__ "] [" __FILE__ "] $"
......@@ -123,6 +128,9 @@ typedef int tPvErr;
#define PCO_FN3(er,mg, fn, x1, x2, x3) {mg = #fn; er = PcoCheckError(__LINE__, __FILE__, fn ( (x1),(x2),(x3) ), #fn ) ; }
#define PCO_FN4(er,mg, fn, x1, x2, x3, x4) {mg = #fn; er = PcoCheckError(__LINE__, __FILE__, fn ( (x1),(x2),(x3),(x4) ), #fn ) ; }
#define PCO_FN5(er,mg, fn, x1, x2, x3, x4, x5) {mg = #fn; er = PcoCheckError(__LINE__, __FILE__, fn ( (x1),(x2),(x3),(x4),(x5) ), #fn ) ; }
#define PCO_FN6(er,mg, fn, x1, x2, x3, x4, x5, x6) {mg = #fn; er = PcoCheckError(__LINE__, __FILE__, fn ( (x1),(x2),(x3),(x4),(x5),(x6) ), #fn ) ; }
char * _sprintComment(char *comment, char *comment1 ="" , char *comment2 ="" );
int _get_imageNr_from_imageTimestamp(void *buf,int shift);
int _get_time_from_imageTimestamp(void *buf,int shift,SYSTEMTIME *st);
#endif
......@@ -84,6 +84,7 @@ namespace lima
int _xferImag();
int _xferImag_getImage();
int _xferImag_getImage_edge();
int _xferImagMult();
void * BufferCtrlObj::_getLimaBuffer(int lima_buffer_nb, Sync::Status &status);
void _pcoAllocBuffersFree();
......
This diff is collapsed.
......@@ -45,8 +45,15 @@
#define CAMINFO_CAMERALINK (0x1LL << 16)
#define CAMINFO_CAMERATYPE (0x1LL << 17)
#define FILE_PCO_DLL "liblimapco.dll"
#define FILENAME_INSTALL_VERSION "INSTALL_VERSION"
#define FILEEXT_INSTALL_VERSION "txt"
char * _getComputerName(char *infoBuff, DWORD bufCharCount);
char * _getUserName(char *infoBuff, DWORD bufCharCount);
char * _getVSconfiguration(char *infoBuff, DWORD bufCharCount);
char * _getPcoSdkVersion(char *infoBuff, int strLen, char *lib);
char * _getDllPath(const char* pzFileName, char *path, size_t strLen);
#endif
......@@ -114,6 +114,8 @@ namespace lima
Cond m_cond;
int m_requestStop, m_requestStopRetry;
bool m_extTrigSingle_eq_Multi;
};
} // namespace Pco
......
#define PCO_SDK_VERSION "$Id: PCOSDK [1.18] $"
#define PCO_SDK_VERSION "$Id: PCOSDK [1.20] $"
--------------------------------- FROM [sdkPco_118]
--------------------------------- FROM [sdkPco_120]
--------------------------------- TO [sdkPco]
Thu Apr 21 14:17:43 RDT 2016
Tue Oct 4 12:34:00 RDT 2016
... copying [sdkPco/PcoSdkVersion.h]
7f1c875dd3be0fbc684ee54515397739 *sdkPco/PcoSdkVersion.h
-rw-r--r-- 1 homsrego Administ 60 Apr 21 12:40 sdkPco/PcoSdkVersion.h
1d041a50a22aa2be8623c42e3950d636 *sdkPco/PcoSdkVersion.h
-rw-r--r-- 1 homsrego Administ 60 Oct 4 12:33 sdkPco/PcoSdkVersion.h
... copying [sdkPco/bin/SC2_Cam.dll]
24761a29258a6e5882a51add6c786db3 *sdkPco/bin/SC2_Cam.dll
-rwxr-xr-x 1 homsrego Administ 381440 Apr 14 11:05 sdkPco/bin/SC2_Cam.dll
80351c2c99e1876d69817b8865f75dab *sdkPco/bin/SC2_Cam.dll
-rwxr-xr-x 1 homsrego Administ 402944 Sep 8 08:16 sdkPco/bin/SC2_Cam.dll
... copying [sdkPco/bin/sc2_cl_me4.dll]
d61038e9d4fd7c726bec82e7835e31f3 *sdkPco/bin/sc2_cl_me4.dll
-rwxr-xr-x 1 homsrego Administ 286208 Apr 14 11:05 sdkPco/bin/sc2_cl_me4.dll
4b1b94842cf84ae1c716a153310e9b4a *sdkPco/bin/sc2_cl_me4.dll
-rwxr-xr-x 1 homsrego Administ 311808 Jul 26 08:31 sdkPco/bin/sc2_cl_me4.dll
... copying [sdkPco/lib/SC2_Cam.lib]
bccd5bc50e029574c3582522e620679b *sdkPco/lib/SC2_Cam.lib
-rw-r--r-- 1 homsrego Administ 49142 Apr 14 11:05 sdkPco/lib/SC2_Cam.lib
b0353c9102f26ff382a396847a1c6a63 *sdkPco/lib/SC2_Cam.lib
-rw-r--r-- 1 homsrego Administ 49266 Sep 8 08:16 sdkPco/lib/SC2_Cam.lib
... copying [sdkPco/bin64/SC2_Cam.dll]
7b13b847efd2d02ab2cb8b6341e4230d *sdkPco/bin64/SC2_Cam.dll
-rwxr-xr-x 1 homsrego Administ 425472 Apr 14 11:05 sdkPco/bin64/SC2_Cam.dll
5ee6e68643a5a6f529eac32cd5671a81 *sdkPco/bin64/SC2_Cam.dll
-rwxr-xr-x 1 homsrego Administ 440832 Sep 8 08:16 sdkPco/bin64/SC2_Cam.dll
... copying [sdkPco/bin64/sc2_cl_me4.dll]
dbf27f7ffe531ddc90e675602366bc7b *sdkPco/bin64/sc2_cl_me4.dll
-rwxr-xr-x 1 homsrego Administ 304128 Apr 14 11:05 sdkPco/bin64/sc2_cl_me4.dll
0dde0d5ead6961b7f6e7012713051ce6 *sdkPco/bin64/sc2_cl_me4.dll
-rwxr-xr-x 1 homsrego Administ 334848 Jul 26 08:31 sdkPco/bin64/sc2_cl_me4.dll
... copying [sdkPco/lib64/SC2_Cam.lib]
ef127eddcbb5be4b894796edeeb4fb10 *sdkPco/lib64/SC2_Cam.lib
-rw-r--r-- 1 homsrego Administ 45136 Apr 14 11:05 sdkPco/lib64/SC2_Cam.lib
0ea07f45648080b77ea6f9903706608b *sdkPco/lib64/SC2_Cam.lib
-rw-r--r-- 1 homsrego Administ 45314 Sep 8 08:16 sdkPco/lib64/SC2_Cam.lib
... copying dir [sdkPco]
total 176
-rw-r--r-- 1 homsrego Administ 2542 Apr 14 11:05 PCO_Structures.h
-rw-r--r-- 1 homsrego Administ 38854 Apr 14 11:05 PCO_err.h
-rw-r--r-- 1 homsrego Administ 37415 Apr 14 11:05 PCO_errt.h
-rw-r--r-- 1 homsrego Administ 4550 Apr 14 11:05 Pco_ConvDlgExport.h
-rw-r--r-- 1 homsrego Administ 6630 Apr 14 11:05 Pco_ConvExport.h
-rw-r--r-- 1 homsrego Administ 9235 Apr 14 11:05 Pco_ConvStructures.h
-rw-r--r-- 1 homsrego Administ 124357 Apr 14 11:05 SC2_CamExport.h
-rw-r--r-- 1 homsrego Administ 10522 Apr 14 11:05 SC2_DialogExport.h
-rw-r--r-- 1 homsrego Administ 10539 Apr 14 11:05 SC2_SDKAddendum.h
-rw-r--r-- 1 homsrego Administ 44496 Apr 14 11:05 sc2_SDKStructures.h
-rw-r--r-- 1 homsrego Administ 5519 Apr 14 11:05 sc2_common.h
-rw-r--r-- 1 homsrego Administ 57655 Apr 14 11:05 sc2_defs.h
24761a29258a6e5882a51add6c786db3 *sdkPco/bin/SC2_Cam.dll
d61038e9d4fd7c726bec82e7835e31f3 *sdkPco/bin/sc2_cl_me4.dll
7b13b847efd2d02ab2cb8b6341e4230d *sdkPco/bin64/SC2_Cam.dll
dbf27f7ffe531ddc90e675602366bc7b *sdkPco/bin64/sc2_cl_me4.dll
001e53237fac0660aeb4091624f26ba0 *sdkPco/include/Pco_ConvDlgExport.h
c0a22e2d703f75b78366732061095e4f *sdkPco/include/Pco_ConvExport.h
02927354a905586ee46b0ed264f73a3d *sdkPco/include/Pco_ConvStructures.h
230c35b4a6a1a65a24466405ad160f01 *sdkPco/include/PCO_err.h
af9d50121c2f2b252b35054e643f1a7e *sdkPco/include/PCO_errt.h
total 182
-rw-r--r-- 1 homsrego Administ 2542 Aug 31 2010 PCO_Structures.h
-rw-r--r-- 1 homsrego Administ 39033 Nov 10 2015 PCO_err.h
-rw-r--r-- 1 homsrego Administ 37619 Nov 10 2015 PCO_errt.h
-rw-r--r-- 1 homsrego Administ 4633 Apr 17 2015 Pco_ConvDlgExport.h
-rw-r--r-- 1 homsrego Administ 8938 Mar 10 2015 Pco_ConvExport.h
-rw-r--r-- 1 homsrego Administ 9832 May 20 2015 Pco_ConvStructures.h
-rw-r--r-- 1 homsrego Administ 128007 Jul 25 16:24 SC2_CamExport.h
-rw-r--r-- 1 homsrego Administ 10522 Aug 29 2014 SC2_DialogExport.h
-rw-r--r-- 1 homsrego Administ 10719 Mar 19 2015 SC2_SDKAddendum.h
-rw-r--r-- 1 homsrego Administ 45231 Jul 25 16:35 sc2_SDKStructures.h
-rw-r--r-- 1 homsrego Administ 5519 Jul 15 2014 sc2_common.h
-rw-r--r-- 1 homsrego Administ 62213 Jul 25 16:21 sc2_defs.h
80351c2c99e1876d69817b8865f75dab *sdkPco/bin/SC2_Cam.dll
4b1b94842cf84ae1c716a153310e9b4a *sdkPco/bin/sc2_cl_me4.dll
5ee6e68643a5a6f529eac32cd5671a81 *sdkPco/bin64/SC2_Cam.dll
0dde0d5ead6961b7f6e7012713051ce6 *sdkPco/bin64/sc2_cl_me4.dll
4426d752e0d22d236bd6925f896778ad *sdkPco/include/Pco_ConvDlgExport.h
b370ef77abafdfd072574f7fb073fca6 *sdkPco/include/Pco_ConvExport.h
8fdc6c067d2a238d4471f1115bd8d796 *sdkPco/include/Pco_ConvStructures.h
af46d198de3037b5040aa0884b326d88 *sdkPco/include/PCO_err.h
83227d3c76a0ee80e584f5880fdf1710 *sdkPco/include/PCO_errt.h
1f2a3c56167094883ebb96a510b47efa *sdkPco/include/PCO_Structures.h
626e60b7e507585c0444fa23dd3438a3 *sdkPco/include/SC2_CamExport.h
2271bcc48f01d5fbf31146411bcc8b34 *sdkPco/include/SC2_CamExport.h
4b5c251043115e18ee6af5cefb7be74f *sdkPco/include/sc2_common.h
a0e1b6ef00c51c997a08367f5a5dd048 *sdkPco/include/sc2_defs.h
a45ec26171fe15af653cc2a3871d5603 *sdkPco/include/sc2_defs.h
276244167010a08c38e15b2510ac4931 *sdkPco/include/SC2_DialogExport.h
78141a2c3a054d5ad5baa5e220ce8c2b *sdkPco/include/SC2_SDKAddendum.h
a619577b0800392dcc4b242b34e039ce *sdkPco/include/sc2_SDKStructures.h
bccd5bc50e029574c3582522e620679b *sdkPco/lib/SC2_Cam.lib
ef127eddcbb5be4b894796edeeb4fb10 *sdkPco/lib64/SC2_Cam.lib
7f1c875dd3be0fbc684ee54515397739 *sdkPco/PcoSdkVersion.h
822ae32b80e9a5d61e3ef4c31b4fd91b *sdkPco/PcoSdkVersion.log
019d844fb588cc7a5772a2daf5d97bf1 *sdkPco/include/SC2_SDKAddendum.h
eee455cbc44ee64272f1338c5ffe1f35 *sdkPco/include/sc2_SDKStructures.h
b0353c9102f26ff382a396847a1c6a63 *sdkPco/lib/SC2_Cam.lib
0ea07f45648080b77ea6f9903706608b *sdkPco/lib64/SC2_Cam.lib
1d041a50a22aa2be8623c42e3950d636 *sdkPco/PcoSdkVersion.h
ca42ee4ad6771b462869d6fca6eb0ce1 *sdkPco/PcoSdkVersion.log
No preview for this file type
No preview for this file type
......@@ -255,6 +255,8 @@ DWORD GetErrorSource(DWORD dwerr);
#define PCO_ERROR_PROGRAMMER 0x00110000 // error in Programmer
#define PCO_ERROR_SDKAPPLICATION 0x00120000 // error in SDK Applikation
// ====================================================================================================== //
// -- 4. Error Messages: -------------------------------------------------------------------------------- //
// ====================================================================================================== //
......@@ -306,6 +308,7 @@ DWORD GetErrorSource(DWORD dwerr);
#define PCO_ERROR_VALIDATION 0xA0000010 // Validation after programming camera failed
#define PCO_ERROR_LIBRARYVERSION 0xA0000011 // wrong library version
#define PCO_ERROR_CAMERAVERSION 0xA0000012 // wrong camera version
#define PCO_ERROR_NOTAVAILABLE 0xA0000013 // Option is not available
// ------------------------------------------------------------------------------------------------------ //
// -- 4.2. Error codes generated by the driver: --------------------------------------------------------- //
......
This diff is collapsed.
......@@ -60,7 +60,7 @@ int PCO_CONVERT_DIALOG_EXPORTS PCO_GetStatusConvertDialog(HANDLE hLutDialog, int
int PCO_CONVERT_DIALOG_EXPORTS PCO_SetConvertDialog(HANDLE hLutDialog, HANDLE hLut);
int PCO_CONVERT_DIALOG_EXPORTS PCO_GetConvertDialog(HANDLE hLutDialog, HANDLE hLut);
int PCO_CONVERT_DIALOG_EXPORTS PCO_SetDataToDialog(HANDLE hLutDialog, int ixres, int iyres, void *b16_image, void *rgb_image);
int PCO_CONVERT_DIALOG_EXPORTS PCO_UpdateHistData(HANDLE ph, int ixres, int iyres);
typedef struct
{
WORD wCommand; // Command sent to the main application
......
......@@ -118,16 +118,56 @@ int PCOCONVERT_API PCO_Convert16TOCOL16(HANDLE ph, int mode, int icolmode, int w
// bit1: 1 = mirror
//width: width of picture
//height: height of picture
//b12: pointer to picture data array
//b12: pointer to raw picture data array
//b8: pointer to byte data array (bw: 1 byte per pixel, rgb: 3 byte pp)
//b24: pointer to byte data array (RGB, 3 byte per pixel, grayscale)
int PCOCONVERT_API PCO_GetWhiteBalance(HANDLE ph, int *color_temp, int *tint, int mode, int width, int height, word *gb12, int x_min, int y_min, int x_max, int y_max);
// gets white balanced values for color_temp and tint
//color_temp: int pointer to get the calculated color temperature
//tint: int pointer to get the calculated tint value
//mode: 0 = normal
// bit0: 1 = flip
// bit1: 1 = mirror
//width: width of picture
//height: height of picture
//gb12: pointer to raw picture data array
//x_m..: rectangle to set the image region to be used for calculation
int PCOCONVERT_API PCO_GetMaxLimit(float *r_max, float *g_max, float *b_max, float temp, float tint, int output_bits);
// GetMaxLimit gets the RGB values for a given temp and tint. The max value within the convert
// control dialog must not exceed the biggest value of the RGB values, e.g. in case R is the biggest
// value, the max value can increase till the R value hits the bit resolution (4095). Same condition
// must be met for decreasing the max value, e.g. in case B is the lowest value, the max value
// can decrease till the B value hits the min value.
// Usual: ....min....B..max.G...R...4095(12bit), with max = R+G+B/3
// Increase:....min.......B..max.G...R4095 -> max condition, R hits 4095
// Decrease:....minB..max.G...R.......4095 -> min condition, B hits min
//the values can be used to calculate the maximum values for scale_min and scale_max in the convert control
// fmax = max(r_max,g_max,b_max)
// fmin = min(r_max,g_max,b_max)
// flimit = (float)((1 << m_strConvertNew.str_SensorInfo.iDataBits) - 1)
// imaxmax = (int)(flimit / fmax);
// iminmax = (int)(fmin * flimit / fmax);
//r_max,g_max,b_max: float pointer to get the multiplicators
//color_temp: color temperature to be used for calculation
//tint: tint value to be used for calculation
//output_bits: bit range of raw data
int PCOCONVERT_API PCO_GetColorValues(float *pfColorTemp, float *pfColorTint, int iRedMax, int iGreenMax, int iBlueMax);
int PCOCONVERT_API PCO_WhiteBalanceToDisplayStruct(HANDLE ph, PCO_Display* strDisplay, int mode, int width, int height,
word *gb12, int x_min, int y_min, int x_max, int y_max);
// Calculates the white balance and sets the values to the strDisplay struct while maintaining the limits
// Gets the struct strDisplay from the convert Handle internally.
//mode: 0 = normal
// bit0: 1 = flip
// bit1: 1 = mirror
//width: width of picture
//height: height of picture
//gb12: pointer to raw picture data array
//x_m..: rectangle to set the image region to be used for calculation
#ifdef __cplusplus
}
#endif
......@@ -25,7 +25,7 @@
//-----------------------------------------------------------------//
// Rev.: | Date: | Changed: //
// --------- | ---------- | ---------------------------------------//
// 1.10 | 03.07.2003 | gamma, alignement added, FRE //
// 1.10 | 03.07.2003 | gamma, alignment added, FRE //
//-----------------------------------------------------------------//
// 1.13 | 16.03.2005 | PCO_CNV_COL_SET added, FRE //
//-----------------------------------------------------------------//
......@@ -74,19 +74,19 @@
typedef struct {
WORD wSize;
WORD wDummy;
int iScale_maxmax; // Maximum value for max
int iScale_min; // Lowest value for processing
int iScale_max; // Highest value for processing
int iColor_temp; // Color temperature 3500...20000