enable frame burst property

DeviceAdapters/Basler/BaslerPylonCamera.cpp

@@ -380,7 +380,7 @@ int BaslerCamera::Initialize()
 		InitOrSyncAcquisitionStatusSelectorStandardProperty();
 		InitOrSyncAcquisitionStatusStandardProperty();
 
-		SkipBurstFrameCountStandardProperty(); 
+		InitOrSyncAcquisitionBurstFrameCountStandardProperty();
 
 		SkipRollingShutterLineOffsetStandardProperty();
 		SkipRollingShutterActiveLinesStandardProperty();
@@ -1424,6 +1424,32 @@ int BaslerCamera::OnAcquisitionStatus(MM::PropertyBase* pProp, MM::ActionType eA
     return DEVICE_OK;
 }
 
+int BaslerCamera::OnAcquisitionBurstFrameCount(MM::PropertyBase* pProp, MM::ActionType eAct)
+{
+    try
+    {
+        CIntegerPtr AcquisitionBurstFrameCount(nodeMap_->GetNode("AcquisitionBurstFrameCount"));
+        if (AcquisitionBurstFrameCount != NULL && IsAvailable(AcquisitionBurstFrameCount))
+        {
+            if (eAct == MM::AfterSet) {
+                std::string countStr;
+                pProp->Get(countStr);
+                AcquisitionBurstFrameCount->SetValue(std::stoi(countStr));
+            }
+            else if (eAct == MM::BeforeGet) {
+                pProp->Set(std::to_string(AcquisitionBurstFrameCount->GetValue()).c_str());
+            }
+        }
+    }
+    catch (const GenericException & e)
+    {
+        // Error handling.
+        AddToLog(e.GetDescription());
+        return DEVICE_ERR;
+    }
+    return DEVICE_OK;
+}
+
 int BaslerCamera::OnLineMode(MM::PropertyBase* pProp, MM::ActionType eAct)
 {
     int ret = HandleEnumerationProperty(pProp, eAct, "LineMode");
@@ -3028,4 +3054,28 @@ int BaslerCamera::InitOrSyncAcquisitionStatusStandardProperty()
 	return DEVICE_OK;
 }
 
+int BaslerCamera::InitOrSyncAcquisitionBurstFrameCountStandardProperty()
+{
+	CIntegerPtr node(nodeMap_->GetNode("AcquisitionBurstFrameCount"));
+	bool cameraHasIt = IsAvailable(node);
+	bool propertyExists = HasStandardProperty("AcquisitionBurstFrameCount");
+
+	if (cameraHasIt && !propertyExists) {
+		// Camera has the feature but property doesn't exist yet - initialize it
+		std::string currentValue = node->ToString();
+		CPropertyAction* action = new CPropertyAction(this, &BaslerCamera::OnAcquisitionBurstFrameCount);
+		return CreateAcquisitionBurstFrameCountStandardProperty(currentValue.c_str(), action);
+	}
+	else if (!cameraHasIt && propertyExists) {
+		// Camera doesn't have the feature but property exists - remove it
+		SkipAcquisitionBurstFrameCountStandardProperty();
+	}
+	else {
+		// It doesn't exist, mark to skip
+		SkipAcquisitionBurstFrameCountStandardProperty();
+	}	
+
+	return DEVICE_OK;
+}
+
 

DeviceAdapters/Basler/BaslerPylonCamera.h

@@ -131,6 +131,8 @@ class BaslerCamera : public CNewAPICameraBase<BaslerCamera>  {
 	int OnAcquisitionStatusSelector(MM::PropertyBase* pProp, MM::ActionType eAct);
 	int OnAcquisitionStatus(MM::PropertyBase* pProp, MM::ActionType eAct);
 
+	int OnAcquisitionBurstFrameCount(MM::PropertyBase* pProp, MM::ActionType eAct);
+
 
 	// non-standard properties
 	int OnAcqFramerate(MM::PropertyBase* pProp, MM::ActionType eAct);
@@ -189,22 +191,6 @@ class BaslerCamera : public CNewAPICameraBase<BaslerCamera>  {
 
 	std::vector<std::string> GetAvailableEnumValues(const GenApi::IEnumeration& node);
 
-	// Standard property initialization functions
-	int InitTriggerSelectorStandardProperty();
-	int InitTriggerModeStandardProperty();
-	int InitTriggerSourceStandardProperty();
-	int InitTriggerActivationStandardProperty();
-	int InitTriggerDelayStandardProperty();
-	int InitTriggerOverlapStandardProperty();
-	int InitExposureModeStandardProperty();
-	int InitExposureTimeStandardProperty();
-	int InitLineSelectorStandardProperty();
-	int InitLineModeStandardProperty();
-	int InitLineInverterStandardProperty();
-	int InitLineSourceStandardProperty();
-	int InitLineStatusStandardProperty();
-	int InitEventSelectorStandardProperty();
-	int InitEventNotificationStandardProperty();
 
 private:
 
@@ -263,6 +249,7 @@ class BaslerCamera : public CNewAPICameraBase<BaslerCamera>  {
 	int InitOrSyncAcquisitionFrameRateEnableStandardProperty();
 	int InitOrSyncAcquisitionStatusSelectorStandardProperty();
 	int InitOrSyncAcquisitionStatusStandardProperty();
+	int InitOrSyncAcquisitionBurstFrameCountStandardProperty();
 
 };
 

MMDevice/DeviceBase.h

@@ -229,12 +229,12 @@ class CDeviceBase : public T
       SkipStandardProperty<MM::g_ExposureModeProperty>();
    }
 
-   int CreateBurstFrameCountStandardProperty(const char* value, MM::ActionFunctor* pAct = 0) {
-      return CreateStandardProperty<MM::g_BurstFrameCountProperty>(value, pAct);
+   int CreateAcquisitionBurstFrameCountStandardProperty(const char* value, MM::ActionFunctor* pAct = 0) {
+      return CreateStandardProperty<MM::g_AcquisitionBurstFrameCountProperty>(value, pAct);
    }
 
-   void SkipBurstFrameCountStandardProperty() {
-      SkipStandardProperty<MM::g_BurstFrameCountProperty>();
+   void SkipAcquisitionBurstFrameCountStandardProperty() {
+      SkipStandardProperty<MM::g_AcquisitionBurstFrameCountProperty>();
    }
 
    int CreateLineSelectorStandardProperty(const char* value, const std::vector<std::string>& values, MM::ActionFunctor* pAct = 0) {
@@ -1972,7 +1972,7 @@ class COldAPICameraBase : public CAllCamerasBase<U>
       SkipExposureModeStandardProperty();
       SkipExposureTimeStandardProperty();   
 
-      SkipBurstFrameCountStandardProperty();
+      SkipAcquisitionBurstFrameCountStandardProperty();
       SkipLineSelectorStandardProperty();
       SkipLineInverterStandardProperty();
       SkipLineSourceStandardProperty();

MMDevice/MMDevice.h

@@ -467,8 +467,8 @@ namespace MM {
    // the FrameBurstStart trigger is enabled and the FrameBurstEnd trigger is disabled. Note that 
    // the total number of frames captured is also conditioned by AcquisitionFrameCount if 
    //AcquisitionMode is MultiFrame and ignored if AcquisitionMode is Single.
-   static const MM::StandardProperty g_BurstFrameCountProperty{
-      "BurstFrameCount",    // name
+   static const MM::StandardProperty g_AcquisitionBurstFrameCountProperty{
+      "AcquisitionBurstFrameCount",    // name
       Integer,              // type
       false,                // isReadOnly
       false,                // isPreInit
@@ -477,7 +477,7 @@ namespace MM {
       1,                    // lowerLimit
       PropertyLimitUndefined, // upperLimit
    };
-   MM_INTERNAL_LINK_STANDARD_PROP_TO_DEVICE_TYPE(CameraDevice, g_BurstFrameCountProperty)
+   MM_INTERNAL_LINK_STANDARD_PROP_TO_DEVICE_TYPE(CameraDevice, g_AcquisitionBurstFrameCountProperty)
 
 
    // Selects the physical line (or pin) of the external device connector to configure.