Merge pull request #511 from nicost/DahengGalaxy

DahengGalaxy: implement isCapturing function so that the shutter closes at the end of live mode.
micro-manager · Oct 22, 2024 · 110f0ea · 110f0ea
2 parents 216ddd7 + 36b5c73
commit 110f0ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/DeviceAdapters/DahengGalaxy/ClassGalaxy.cpp b/DeviceAdapters/DahengGalaxy/ClassGalaxy.cpp
@@ -836,10 +836,9 @@ int ClassGalaxy::StartSequenceAcquisition(double /* interval_ms */) {
     }
     return DEVICE_OK;
 }
+
 int ClassGalaxy::StopSequenceAcquisition()
 {
-
-
     if (m_objStreamFeatureControlPtr->GetBoolFeature("StreamIsGrabbing")->GetValue())
     {
         m_objFeatureControlPtr->GetCommandFeature("AcquisitionStop")->Execute();
@@ -852,6 +851,11 @@ int ClassGalaxy::StopSequenceAcquisition()
     return DEVICE_OK;
 }
 
+bool ClassGalaxy::IsCapturing()
+{
+   return m_objStreamFeatureControlPtr->GetBoolFeature("StreamIsGrabbing")->GetValue() ? true : false;
+}
+
 int ClassGalaxy::PrepareSequenceAcqusition()
 {
     AddToLog("PrepareSequenceAcqusition");

diff --git a/DeviceAdapters/DahengGalaxy/ClassGalaxy.h b/DeviceAdapters/DahengGalaxy/ClassGalaxy.h
@@ -104,7 +104,7 @@ class MODULE_API ClassGalaxy : public CCameraBase<ClassGalaxy>
 	//* Flag to indicate whether Sequence Acquisition is currently running.
 	//* Return true when Sequence acquisition is active, false otherwise
 	//*/
-	//bool IsCapturing();
+	bool IsCapturing();
 
 	////Genicam Callback
 	////void ResultingFramerateCallback(GenApi::INode* pNode);