Change 'PrepareSequenceAcqusition' to 'PrepareSequenceAcquisition'.

micro-manager · Oct 9, 2024 · ebd2f6c · ebd2f6c
1 parent c1f94d0
commit ebd2f6c
Show file tree

Hide file tree

Showing 66 changed files with 87 additions and 87 deletions.
diff --git a/DeviceAdapters/AmScope/AmScope.cpp b/DeviceAdapters/AmScope/AmScope.cpp
@@ -694,7 +694,7 @@ int AmScope::SetBinning(int binF)
    return SetProperty("Binning-Software", CDeviceUtils::ConvertToString(binF));
 }
 
-//int AmScope::PrepareSequenceAcqusition()
+//int AmScope::PrepareSequenceAcquisition()
 //{
 //   if (IsCapturing())
 //      return DEVICE_CAMERA_BUSY_ACQUIRING;

diff --git a/DeviceAdapters/AmScope/AmScope.h b/DeviceAdapters/AmScope/AmScope.h
@@ -54,7 +54,7 @@ class AmScope : public CCameraBase<AmScope>
    int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize); 
    int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize); 
    int ClearROI();
-   //int PrepareSequenceAcqusition();
+   //int PrepareSequenceAcquisition();
    int StartSequenceAcquisition(double interval);
    int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
    int StopSequenceAcquisition();
@@ -281,4 +281,4 @@ class SequenceThread : public MMDeviceThreadBase
 }; 
 
 
-#endif  // _AMSCOPE_H_
+#endif  // _AMSCOPE_H_
diff --git a/DeviceAdapters/Andor/Andor.h b/DeviceAdapters/Andor/Andor.h
@@ -110,7 +110,7 @@ class AndorCamera : public CCameraBase<AndorCamera>
    void ResizeSRRFImage(long radiality);
 
    // high-speed interface
-   int PrepareSequenceAcqusition()
+   int PrepareSequenceAcquisition()
    { 
       return DEVICE_OK; 
    }

diff --git a/DeviceAdapters/AndorSDK3/AndorSDK3.h b/DeviceAdapters/AndorSDK3/AndorSDK3.h
@@ -101,7 +101,7 @@ class CAndorSDK3Camera : public CCameraBase<CAndorSDK3Camera>
    int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize); 
    int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize); 
    int ClearROI();
-   int PrepareSequenceAcqusition() {return DEVICE_OK;}
+   int PrepareSequenceAcquisition() {return DEVICE_OK;}
    int StartSequenceAcquisition(double interval);
    int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
    int StopSequenceAcquisition();

diff --git a/DeviceAdapters/Aravis/AravisCamera.cpp b/DeviceAdapters/Aravis/AravisCamera.cpp
@@ -1076,7 +1076,7 @@ int AravisCamera::OnTriggerSource(MM::PropertyBase* pProp, MM::ActionType eAct)
 }
 
 
-int AravisCamera::PrepareSequenceAcqusition()
+int AravisCamera::PrepareSequenceAcquisition()
 {
    return DEVICE_OK;
 }

diff --git a/DeviceAdapters/Aravis/AravisCamera.h b/DeviceAdapters/Aravis/AravisCamera.h
@@ -77,7 +77,7 @@ class AravisCamera : public CCameraBase<AravisCamera>
 
   // Continuous acquisition.
   bool IsCapturing();
-  int PrepareSequenceAcqusition();
+  int PrepareSequenceAcquisition();
   int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
   int StartSequenceAcquisition(double interval_ms);
   int StopSequenceAcquisition();

diff --git a/DeviceAdapters/ArduinoCounter/ArduinoCounter.cpp b/DeviceAdapters/ArduinoCounter/ArduinoCounter.cpp
@@ -492,7 +492,7 @@ int ArduinoCounterCamera::ClearROI()
    return DEVICE_OK;
 }
 
-int ArduinoCounterCamera::PrepareSequenceAcqusition()
+int ArduinoCounterCamera::PrepareSequenceAcquisition()
 {
    if (nrCamerasInUse_ < 1)
       return ERR_NO_PHYSICAL_CAMERA;
@@ -502,7 +502,7 @@ int ArduinoCounterCamera::PrepareSequenceAcqusition()
       MM::Camera* camera = (MM::Camera*)GetDevice(usedCameras_[i].c_str());
       if (camera != 0)
       {
-         int ret = camera->PrepareSequenceAcqusition();
+         int ret = camera->PrepareSequenceAcquisition();
          if (ret != DEVICE_OK)
             return ret;
       }

diff --git a/DeviceAdapters/ArduinoCounter/ArduinoCounter.h b/DeviceAdapters/ArduinoCounter/ArduinoCounter.h
@@ -96,7 +96,7 @@ class ArduinoCounterCamera : public CCameraBase<ArduinoCounterCamera>
    int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize);
    int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize);
    int ClearROI();
-   int PrepareSequenceAcqusition();
+   int PrepareSequenceAcquisition();
    int StartSequenceAcquisition(double interval);
    int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
    int StopSequenceAcquisition();
@@ -140,4 +140,4 @@ class ArduinoCounterCamera : public CCameraBase<ArduinoCounterCamera>
 };
 
 
-#endif //_ArduinoCounter_H_
+#endif //_ArduinoCounter_H_
diff --git a/DeviceAdapters/Atik/Atik.cpp b/DeviceAdapters/Atik/Atik.cpp
@@ -823,7 +823,7 @@ int Atik::SetBinning(int binF)
 	return SetProperty(MM::g_Keyword_Binning, CDeviceUtils::ConvertToString(binF));
 }
 
-int Atik::PrepareSequenceAcqusition()
+int Atik::PrepareSequenceAcquisition()
 {
 	//log("");
 	if (IsCapturing())

diff --git a/DeviceAdapters/Atik/Atik.h b/DeviceAdapters/Atik/Atik.h
@@ -64,7 +64,7 @@ class Atik : public CCameraBase<Atik>
    int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize); 
    int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize); 
    int ClearROI();
-   int PrepareSequenceAcqusition();
+   int PrepareSequenceAcquisition();
    int StartSequenceAcquisition(double interval);
    int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
    int StopSequenceAcquisition();

diff --git a/DeviceAdapters/Basler/BaslerPylonCamera.cpp b/DeviceAdapters/Basler/BaslerPylonCamera.cpp
@@ -1237,7 +1237,7 @@ int BaslerCamera::StopSequenceAcquisition()
 	return DEVICE_OK;
 }
 
-int BaslerCamera::PrepareSequenceAcqusition()
+int BaslerCamera::PrepareSequenceAcquisition()
 {
 	// nothing to prepare
 	return DEVICE_OK;

diff --git a/DeviceAdapters/Basler/BaslerPylonCamera.h b/DeviceAdapters/Basler/BaslerPylonCamera.h
@@ -115,7 +115,7 @@ class BaslerCamera : public CCameraBase<BaslerCamera>  {
 	int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
 	int StartSequenceAcquisition(double interval_ms);
 	int StopSequenceAcquisition();
-	int PrepareSequenceAcqusition();
+	int PrepareSequenceAcquisition();
 
 	/**
 	* Flag to indicate whether Sequence Acquisition is currently running.

diff --git a/DeviceAdapters/DahengGalaxy/ClassGalaxy.cpp b/DeviceAdapters/DahengGalaxy/ClassGalaxy.cpp
@@ -852,9 +852,9 @@ int ClassGalaxy::StopSequenceAcquisition()
     return DEVICE_OK;
 }
 
-int ClassGalaxy::PrepareSequenceAcqusition()
+int ClassGalaxy::PrepareSequenceAcquisition()
 {
-    AddToLog("PrepareSequenceAcqusition");
+    AddToLog("PrepareSequenceAcquisition");
     // nothing to prepare
     return DEVICE_OK;
 }

diff --git a/DeviceAdapters/DahengGalaxy/ClassGalaxy.h b/DeviceAdapters/DahengGalaxy/ClassGalaxy.h
@@ -98,7 +98,7 @@ class MODULE_API ClassGalaxy : public CCameraBase<ClassGalaxy>
 	int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow) final ;
 	int StartSequenceAcquisition(double interval_ms) final;
 	int StopSequenceAcquisition() final;
-	int PrepareSequenceAcqusition() final;
+	int PrepareSequenceAcquisition() final;
 
 	///**
 	//* Flag to indicate whether Sequence Acquisition is currently running.
@@ -229,4 +229,4 @@ class CircularBufferInserter : public ICaptureEventHandler {
 	CircularBufferInserter(ClassGalaxy* dev);
 
 	virtual void DoOnImageCaptured(CImageDataPointer& objImageDataPointer, void* pUserParam);
-};
+};
diff --git a/DeviceAdapters/DemoCamera/DemoCamera.h b/DeviceAdapters/DemoCamera/DemoCamera.h
@@ -148,7 +148,7 @@ class CDemoCamera : public CCameraBase<CDemoCamera>
            unsigned numROIs);
    int GetMultiROI(unsigned* xs, unsigned* ys, unsigned* widths,
            unsigned* heights, unsigned* length);
-   int PrepareSequenceAcqusition() { return DEVICE_OK; }
+   int PrepareSequenceAcquisition() { return DEVICE_OK; }
    int StartSequenceAcquisition(double interval);
    int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
    int StopSequenceAcquisition();

diff --git a/DeviceAdapters/FLICamera/FLICamera.cpp b/DeviceAdapters/FLICamera/FLICamera.cpp
@@ -716,7 +716,7 @@ int CFLICamera::OnExposure(MM::PropertyBase* pProp, MM::ActionType eAct)
 	return ret; 
 }
 
-int CFLICamera::PrepareSequenceAcqusition()
+int CFLICamera::PrepareSequenceAcquisition()
 {
 	return DEVICE_OK;
 }

diff --git a/DeviceAdapters/FLICamera/FLICamera.h b/DeviceAdapters/FLICamera/FLICamera.h
@@ -58,7 +58,7 @@ class CFLICamera : public CCameraBase<CFLICamera>
 		int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize); 
 		int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize); 
 		int ClearROI();
-		int PrepareSequenceAcqusition();
+		int PrepareSequenceAcquisition();
 		double GetNominalPixelSizeUm() const;
 		double GetPixelSizeUm() const;
 		int GetBinning() const;

diff --git a/DeviceAdapters/GigECamera/GigECamera.h b/DeviceAdapters/GigECamera/GigECamera.h
@@ -182,7 +182,7 @@ class CGigECamera : public CCameraBase<CGigECamera>
 	int ClearROI();
 
 	// sequence-acquisition-related functions
-	int PrepareSequenceAcqusition() { return DEVICE_OK; }
+	int PrepareSequenceAcquisition() { return DEVICE_OK; }
 	int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
 	int StopSequenceAcquisition();
 	bool IsCapturing();

diff --git a/DeviceAdapters/Hikrobot/HikrobotCamera.cpp b/DeviceAdapters/Hikrobot/HikrobotCamera.cpp
@@ -1611,7 +1611,7 @@ int HikrobotCamera::StopSequenceAcquisition()
 	return DEVICE_OK;
 }
 
-int HikrobotCamera::PrepareSequenceAcqusition()
+int HikrobotCamera::PrepareSequenceAcquisition()
 {
 	// nothing to prepare
 	return DEVICE_OK;

diff --git a/DeviceAdapters/Hikrobot/HikrobotCamera.h b/DeviceAdapters/Hikrobot/HikrobotCamera.h
@@ -119,7 +119,7 @@ class HikrobotCamera : public CCameraBase<HikrobotCamera>  {
 	int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
 	int StartSequenceAcquisition(double interval_ms);
 	int StopSequenceAcquisition();
-	int PrepareSequenceAcqusition();
+	int PrepareSequenceAcquisition();
 
 	/**
 	* Flag to indicate whether Sequence Acquisition is currently running.

diff --git a/DeviceAdapters/IDSPeak/IDSPeak.h b/DeviceAdapters/IDSPeak/IDSPeak.h
@@ -150,7 +150,7 @@ class CIDSPeak : public CCameraBase<CIDSPeak>
         unsigned numROIs);
     int GetMultiROI(unsigned* xs, unsigned* ys, unsigned* widths,
         unsigned* heights, unsigned* length);
-    int PrepareSequenceAcqusition() { return DEVICE_OK; }
+    int PrepareSequenceAcquisition() { return DEVICE_OK; }
     int StartSequenceAcquisition(double interval);
     int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
     int StopSequenceAcquisition();

diff --git a/DeviceAdapters/IDS_uEye/IDS_uEye.h b/DeviceAdapters/IDS_uEye/IDS_uEye.h
@@ -256,7 +256,7 @@ class CIDS_uEye : public CCameraBase<CIDS_uEye>
   int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize); 
   int ClearROI();
 
-  int PrepareSequenceAcqusition()
+  int PrepareSequenceAcquisition()
   {
     return DEVICE_OK;
   }

diff --git a/DeviceAdapters/JAI/JAI.cpp b/DeviceAdapters/JAI/JAI.cpp
@@ -749,7 +749,7 @@ int JAICamera::ClearROI()
 	return ResizeImageBuffer();
 }
 
-int JAICamera::PrepareSequenceAcqusition()
+int JAICamera::PrepareSequenceAcquisition()
 {
    if (IsCapturing())
    {

diff --git a/DeviceAdapters/JAI/JAI.h b/DeviceAdapters/JAI/JAI.h
@@ -171,7 +171,7 @@ class JAICamera : public CCameraBase<JAICamera>
 
    // overrides the same in the base class
    int InsertImage();
-   int PrepareSequenceAcqusition();
+   int PrepareSequenceAcquisition();
    int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
    int StartSequenceAcquisition(double interval);
    int StopSequenceAcquisition(); 

diff --git a/DeviceAdapters/Lumenera/LumeneraCamera.cpp b/DeviceAdapters/Lumenera/LumeneraCamera.cpp
@@ -1277,7 +1277,7 @@ int LumeneraCamera::StopSequenceAcquisition()
 	return DEVICE_OK;
 }
 
-int LumeneraCamera::PrepareSequenceAcqusition()
+int LumeneraCamera::PrepareSequenceAcquisition()
 {
 	// nothing to prepare
 	return DEVICE_OK;
@@ -2770,4 +2770,4 @@ int LumeneraCamera::OnGain(MM::PropertyBase* pProp, MM::ActionType eAct)
 	RETURN_ON_ERROR(OnLinkedVideoAndStillProperty(pProp, eAct));
 
 	return DEVICE_OK;
-}
+}
diff --git a/DeviceAdapters/Lumenera/LumeneraCamera.h b/DeviceAdapters/Lumenera/LumeneraCamera.h
@@ -125,7 +125,7 @@ class LumeneraCamera : public CCameraBase<LumeneraCamera> {
 	int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
 	int StartSequenceAcquisition(double interval_ms);
 	int StopSequenceAcquisition();
-	int PrepareSequenceAcqusition();
+	int PrepareSequenceAcquisition();
 	bool IsCapturing();
 
 

diff --git a/DeviceAdapters/MatrixVision/mvIMPACT_Acquire_Device.h b/DeviceAdapters/MatrixVision/mvIMPACT_Acquire_Device.h
@@ -96,7 +96,7 @@ class mvIMPACT_Acquire_Device : public CCameraBase<mvIMPACT_Acquire_Device>
       return SetProperty( MM::g_Keyword_Binning, CDeviceUtils::ConvertToString( binSize ) );
    }
 
-   virtual int PrepareSequenceAcqusition( void )
+   virtual int PrepareSequenceAcquisition( void )
    {
       return DEVICE_OK;
    }

diff --git a/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.h b/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.h
@@ -84,7 +84,7 @@ class CMightex_BUF_USBCCDCamera : public CCameraBase<CMightex_BUF_USBCCDCamera>
    int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize); 
    int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize); 
    int ClearROI();
-   int PrepareSequenceAcqusition()
+   int PrepareSequenceAcquisition()
    {
       return DEVICE_OK;
    }

diff --git a/DeviceAdapters/Motic/MoticCamera.cpp b/DeviceAdapters/Motic/MoticCamera.cpp
@@ -739,10 +739,10 @@ int CMoticCamera::SetBinning(int binF)
   return SetProperty(MM::g_Keyword_Binning, CDeviceUtils::ConvertToString(binF));
 }
 
-int CMoticCamera::PrepareSequenceAcqusition()
+int CMoticCamera::PrepareSequenceAcquisition()
 {
 #ifdef _LOG_OUT_
-  OutputDebugString("PrepareSequenceAcqusition");
+  OutputDebugString("PrepareSequenceAcquisition");
 #endif
    if (IsCapturing())
       return DEVICE_CAMERA_BUSY_ACQUIRING;
@@ -751,7 +751,7 @@ int CMoticCamera::PrepareSequenceAcqusition()
    if (ret != DEVICE_OK)
       return ret;
 #ifdef _LOG_OUT_
-   OutputDebugString("PrepareSequenceAcqusition OK");
+   OutputDebugString("PrepareSequenceAcquisition OK");
 #endif
    return DEVICE_OK;
 }

diff --git a/DeviceAdapters/Motic/MoticCamera.h b/DeviceAdapters/Motic/MoticCamera.h
@@ -83,7 +83,7 @@ class CMoticCamera : public CCameraBase<CMoticCamera>
   int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize); 
   int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize); 
   int ClearROI();
-  int PrepareSequenceAcqusition();
+  int PrepareSequenceAcquisition();
   //int StartSequenceAcquisition(double interval);
  // int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
  // int StopSequenceAcquisition();

diff --git a/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.h b/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.h
@@ -97,7 +97,7 @@ class COpenCVgrabber : public CCameraBase<COpenCVgrabber>
    int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize); 
    int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize); 
    int ClearROI();
-   int PrepareSequenceAcqusition()
+   int PrepareSequenceAcquisition()
    {
          return DEVICE_OK;
    }

diff --git a/DeviceAdapters/PCO_Generic/MicroManager.cpp b/DeviceAdapters/PCO_Generic/MicroManager.cpp
@@ -2227,7 +2227,7 @@ int CPCOCam::ResizeImageBuffer()
   return DEVICE_OK;
 }
 
-int CPCOCam::PrepareSequenceAcqusition()
+int CPCOCam::PrepareSequenceAcquisition()
 {
   return DEVICE_OK;
 }

diff --git a/DeviceAdapters/PCO_Generic/MicroManager.h b/DeviceAdapters/PCO_Generic/MicroManager.h
@@ -93,7 +93,7 @@ class CPCOCam : public CCameraBase<CPCOCam>
   int SetROI(unsigned uX, unsigned uY, unsigned uXSize, unsigned uYSize); 
   int GetROI(unsigned& uX, unsigned& uY, unsigned& uXSize, unsigned& uYSize); 
   int ClearROI();
-  int PrepareSequenceAcqusition();
+  int PrepareSequenceAcquisition();
   int StartSequenceAcquisition(long numImages, double /*interval_ms*/, bool stopOnOverflow);
   int StopSequenceAcquisition();
   int StoppedByThread();

diff --git a/DeviceAdapters/PICAM/PICAMAdapter.h b/DeviceAdapters/PICAM/PICAMAdapter.h
@@ -235,7 +235,7 @@ class Universal : public CCameraBase<Universal>
 #ifndef linux
       // micromanager calls the "live" acquisition a "sequence"
       //  don't get this confused with a PICAM sequence acquisition, it's actually circular buffer mode
-      int PrepareSequenceAcqusition();
+      int PrepareSequenceAcquisition();
       int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
       int StopSequenceAcquisition();
 #endif

diff --git a/DeviceAdapters/PICAM/PICAMUniversal.cpp b/DeviceAdapters/PICAM/PICAMUniversal.cpp
@@ -2325,9 +2325,9 @@ int Universal::ThreadRun(void)
  * Micromanager calls the "live" acquisition a "sequence"
  *  don't get this confused with a PICAM sequence acquisition, it's actually circular buffer mode
  */
-int Universal::PrepareSequenceAcqusition()
+int Universal::PrepareSequenceAcquisition()
 {
-   START_METHOD("Universal::PrepareSequenceAcqusition");
+   START_METHOD("Universal::PrepareSequenceAcquisition");
 
    if (IsCapturing())
    {
@@ -2364,7 +2364,7 @@ int Universal::StartSequenceAcquisition(long numImages, double interval_ms, bool
 {
    START_METHOD("Universal::StartSequenceAcquisition");
 
-   int ret = PrepareSequenceAcqusition();
+   int ret = PrepareSequenceAcquisition();
    if (ret != DEVICE_OK)
       return ret;
 

diff --git a/DeviceAdapters/PVCAM/PVCAMAdapter.h b/DeviceAdapters/PVCAM/PVCAMAdapter.h
@@ -223,7 +223,7 @@ class Universal : public CCameraBase<Universal>
     /**
     * Micro-manager calls the "live" acquisition a "sequence". PVCAM calls this "continuous - circular buffer" mode.
     */
-    int PrepareSequenceAcqusition();
+    int PrepareSequenceAcquisition();
     int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
     int StopSequenceAcquisition();
-Original file line number
+Diff line change
@@ Expand Up @@
     }
-    int AravisCamera::PrepareSequenceAcqusition()
+    int AravisCamera::PrepareSequenceAcquisition()
     {
        return DEVICE_OK;
     }
@@ Expand Down @@