Added PVAPI enums to highgui.hpp

Added "PVAPI_" prefix to FrameStartTriggerMode definition

modules/highgui/include/opencv2/highgui.hpp

@@ -385,9 +385,17 @@ enum { CAP_PROP_GSTREAMER_QUEUE_LENGTH = 200 // default is 1
 
 
 // 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
 enum { CAP_PROP_XI_DOWNSAMPLING  = 400, // Change image resolution by binning or skipping.

modules/highgui/include/opencv2/highgui/highgui_c.h

@@ -420,13 +420,11 @@ enum
     CV_CAP_OPENNI_DEPTH_GENERATOR_REGISTRATION_ON = CV_CAP_OPENNI_DEPTH_GENERATOR_REGISTRATION,
 
     // 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
-    CV_CAP_PROP_PVAPI_MULTICASTIP     = 300, // ip for anable multicast master mode. 0 for disable multicast
+
-    CV_CAP_PROP_FRAMESTARTTRIGGERMODE = 301, // 0: For Freerun
+    // PVAPI
-                                             // 1: For SyncIn1
+    CV_CAP_PROP_PVAPI_MULTICASTIP           = 300, // ip for anable multicast master mode. 0 for disable multicast
-                                             // 2: For SyncIn2
+    CV_CAP_PROP_PVAPI_FRAMESTARTTRIGGERMODE = 301, // FrameStartTriggerMode: Determines how a frame is initiated
-                                             // 3: For Fixedrate
-                                             // 4: For Software
 
     // Properties of cameras available through XIMEA SDK interface
     CV_CAP_PROP_XI_DOWNSAMPLING  = 400,      // Change image resolution by binning or skipping.

modules/highgui/src/cap_pvapi.cpp

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