generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added PVAPI enums to highgui.hpp

Browse Source 
Added "PVAPI_" prefix to FrameStartTriggerMode definition
This commit is contained in:
Nick D'Ademo 2014-01-14 21:38:57 +11:00
parent 3cf5c0b991
commit 25870fa66b
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/highgui/include/opencv2/highgui.hpp
View File

@ -386,8 +386,16 @@ enum { CAP_PROP_GSTREAMER_QUEUE_LENGTH = 200 // default is 1
// PVAPI // PVAPI
enum { CAP_PROP_PVAPI_MULTICASTIP = 300 // ip for anable multicast master mode. 0 for disable multicast enum { CAP_PROP_PVAPI_MULTICASTIP = 300 // ip for anable multicast master mode. 0 for disable multicast
CAP_PROP_PVAPI_FRAMESTARTTRIGGERMODE = 301 // FrameStartTriggerMode: Determines how a frame is initiated
}; };
// PVAPI: FrameStartTriggerMode
enum { CAP_PVAPI_FSTRIGMODE_FREERUN = 0, // Freerun
CAP_PVAPI_FSTRIGMODE_SYNCIN1 = 1, // SyncIn1
CAP_PVAPI_FSTRIGMODE_SYNCIN2 = 2, // SyncIn2
CAP_PVAPI_FSTRIGMODE_FIXEDRATE = 3, // FixedRate
CAP_PVAPI_FSTRIGMODE_SOFTWARE = 4 // Software
};
// Properties of cameras available through XIMEA SDK interface // Properties of cameras available through XIMEA SDK interface
enum { CAP_PROP_XI_DOWNSAMPLING = 400, // Change image resolution by binning or skipping. enum { CAP_PROP_XI_DOWNSAMPLING = 400, // Change image resolution by binning or skipping.

8
modules/highgui/include/opencv2/highgui/highgui_c.h
View File

@ -421,12 +421,10 @@ enum
// Properties of cameras available through GStreamer interface // Properties of cameras available through GStreamer interface
CV_CAP_GSTREAMER_QUEUE_LENGTH = 200, // default is 1 CV_CAP_GSTREAMER_QUEUE_LENGTH = 200, // default is 1
// PVAPI
CV_CAP_PROP_PVAPI_MULTICASTIP = 300, // ip for anable multicast master mode. 0 for disable multicast CV_CAP_PROP_PVAPI_MULTICASTIP = 300, // ip for anable multicast master mode. 0 for disable multicast
CV_CAP_PROP_FRAMESTARTTRIGGERMODE = 301, // 0: For Freerun CV_CAP_PROP_PVAPI_FRAMESTARTTRIGGERMODE = 301, // FrameStartTriggerMode: Determines how a frame is initiated
// 1: For SyncIn1
// 2: For SyncIn2
// 3: For Fixedrate
// 4: For Software
// Properties of cameras available through XIMEA SDK interface // Properties of cameras available through XIMEA SDK interface
CV_CAP_PROP_XI_DOWNSAMPLING = 400, // Change image resolution by binning or skipping. CV_CAP_PROP_XI_DOWNSAMPLING = 400, // Change image resolution by binning or skipping.

4
modules/highgui/src/cap_pvapi.cpp
View File

@ -285,7 +285,7 @@ double CvCaptureCAM_PvAPI::getProperty( int property_id )
case CV_CAP_PROP_GAIN: case CV_CAP_PROP_GAIN:
PvAttrUint32Get(Camera.Handle, "GainValue", &nTemp); PvAttrUint32Get(Camera.Handle, "GainValue", &nTemp);
return (double)nTemp; return (double)nTemp;
case CV_CAP_PROP_FRAMESTARTTRIGGERMODE: case CV_CAP_PROP_PVAPI_FRAMESTARTTRIGGERMODE:
char triggerMode[256]; char triggerMode[256];
PvAttrEnumGet(Camera.Handle, "FrameStartTriggerMode", triggerMode, 256, NULL); PvAttrEnumGet(Camera.Handle, "FrameStartTriggerMode", triggerMode, 256, NULL);
if (strcmp(triggerMode, "Freerun")==0) if (strcmp(triggerMode, "Freerun")==0)
@ -388,7 +388,7 @@ bool CvCaptureCAM_PvAPI::setProperty( int property_id, double value )
return false; return false;
} }
break; break;
case CV_CAP_PROP_FRAMESTARTTRIGGERMODE: case CV_CAP_PROP_PVAPI_FRAMESTARTTRIGGERMODE:
tPvErr error; tPvErr error;
if (value==0) if (value==0)
error = PvAttrEnumSet(Camera.Handle, "FrameStartTriggerMode", "Freerun"); error = PvAttrEnumSet(Camera.Handle, "FrameStartTriggerMode", "Freerun");