From ebd2f6cd4ccb4025a6db5b5ee382da7d3863b67a Mon Sep 17 00:00:00 2001 From: Hazen Babcock Date: Wed, 9 Oct 2024 16:56:17 -0400 Subject: [PATCH] Change 'PrepareSequenceAcqusition' to 'PrepareSequenceAcquisition'. --- DeviceAdapters/AmScope/AmScope.cpp | 2 +- DeviceAdapters/AmScope/AmScope.h | 4 ++-- DeviceAdapters/Andor/Andor.h | 2 +- DeviceAdapters/AndorSDK3/AndorSDK3.h | 2 +- DeviceAdapters/Aravis/AravisCamera.cpp | 2 +- DeviceAdapters/Aravis/AravisCamera.h | 2 +- DeviceAdapters/ArduinoCounter/ArduinoCounter.cpp | 4 ++-- DeviceAdapters/ArduinoCounter/ArduinoCounter.h | 4 ++-- DeviceAdapters/Atik/Atik.cpp | 2 +- DeviceAdapters/Atik/Atik.h | 2 +- DeviceAdapters/Basler/BaslerPylonCamera.cpp | 2 +- DeviceAdapters/Basler/BaslerPylonCamera.h | 2 +- DeviceAdapters/DahengGalaxy/ClassGalaxy.cpp | 4 ++-- DeviceAdapters/DahengGalaxy/ClassGalaxy.h | 4 ++-- DeviceAdapters/DemoCamera/DemoCamera.h | 2 +- DeviceAdapters/FLICamera/FLICamera.cpp | 2 +- DeviceAdapters/FLICamera/FLICamera.h | 2 +- DeviceAdapters/GigECamera/GigECamera.h | 2 +- DeviceAdapters/Hikrobot/HikrobotCamera.cpp | 2 +- DeviceAdapters/Hikrobot/HikrobotCamera.h | 2 +- DeviceAdapters/IDSPeak/IDSPeak.h | 2 +- DeviceAdapters/IDS_uEye/IDS_uEye.h | 2 +- DeviceAdapters/JAI/JAI.cpp | 2 +- DeviceAdapters/JAI/JAI.h | 2 +- DeviceAdapters/Lumenera/LumeneraCamera.cpp | 4 ++-- DeviceAdapters/Lumenera/LumeneraCamera.h | 2 +- DeviceAdapters/MatrixVision/mvIMPACT_Acquire_Device.h | 2 +- DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.h | 2 +- DeviceAdapters/Motic/MoticCamera.cpp | 6 +++--- DeviceAdapters/Motic/MoticCamera.h | 2 +- DeviceAdapters/OpenCVgrabber/OpenCVgrabber.h | 2 +- DeviceAdapters/PCO_Generic/MicroManager.cpp | 2 +- DeviceAdapters/PCO_Generic/MicroManager.h | 2 +- DeviceAdapters/PICAM/PICAMAdapter.h | 2 +- DeviceAdapters/PICAM/PICAMUniversal.cpp | 6 +++--- DeviceAdapters/PVCAM/PVCAMAdapter.h | 2 +- DeviceAdapters/PVCAM/PVCAMUniversal.cpp | 6 +++--- DeviceAdapters/Pixelink/Pixelink.h | 4 ++-- DeviceAdapters/PlayerOne/POACamera.cpp | 6 +++--- DeviceAdapters/PlayerOne/POACamera.h | 2 +- DeviceAdapters/PointGrey/PointGrey.h | 2 +- DeviceAdapters/PrincetonInstruments/PVCAMInt.h | 2 +- DeviceAdapters/PrincetonInstruments/PVCAMUniversal.cpp | 4 ++-- DeviceAdapters/RaptorEPIX/RaptorEPIX.h | 2 +- DeviceAdapters/SigmaKoki/Camera.h | 2 +- DeviceAdapters/Spinnaker/SpinnakerCamera.cpp | 2 +- DeviceAdapters/Spinnaker/SpinnakerCamera.h | 2 +- DeviceAdapters/TSI/TSI3Cam.cpp | 6 +++--- DeviceAdapters/TSI/TSI3Cam.h | 2 +- DeviceAdapters/TSI/TSICam.cpp | 2 +- DeviceAdapters/TSI/TSICam.h | 2 +- DeviceAdapters/TUCam/MMTUCam.h | 2 +- DeviceAdapters/ThorlabsUSBCamera/ThorlabsUSBCamera.h | 2 +- DeviceAdapters/TwoPhoton/TwoPhoton.cpp | 2 +- DeviceAdapters/TwoPhoton/TwoPhoton.h | 2 +- DeviceAdapters/UniversalMMHubUsb/ummhUsb.h | 4 ++-- DeviceAdapters/Utilities/MultiCamera.cpp | 4 ++-- DeviceAdapters/Utilities/Utilities.h | 2 +- DeviceAdapters/Ximea/XIMEACamera.h | 2 +- DeviceAdapters/ZWO/MyASICam2.cpp | 2 +- DeviceAdapters/ZWO/MyASICam2.h | 4 ++-- MMCore/Devices/CameraInstance.cpp | 2 +- MMCore/Devices/CameraInstance.h | 2 +- MMCore/MMCore.cpp | 2 +- MMDevice/DeviceBase.h | 2 +- MMDevice/MMDevice.h | 2 +- 66 files changed, 87 insertions(+), 87 deletions(-) diff --git a/DeviceAdapters/AmScope/AmScope.cpp b/DeviceAdapters/AmScope/AmScope.cpp index 77a043190..a599e896e 100644 --- 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 index 5f40626e0..97d3fbdd6 100644 --- a/DeviceAdapters/AmScope/AmScope.h +++ b/DeviceAdapters/AmScope/AmScope.h @@ -54,7 +54,7 @@ class AmScope : public CCameraBase 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_ \ No newline at end of file +#endif // _AMSCOPE_H_ diff --git a/DeviceAdapters/Andor/Andor.h b/DeviceAdapters/Andor/Andor.h index 8d97ca506..ced5dcffa 100644 --- a/DeviceAdapters/Andor/Andor.h +++ b/DeviceAdapters/Andor/Andor.h @@ -110,7 +110,7 @@ class AndorCamera : public CCameraBase 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 index a7ae179be..ef2f07a88 100644 --- a/DeviceAdapters/AndorSDK3/AndorSDK3.h +++ b/DeviceAdapters/AndorSDK3/AndorSDK3.h @@ -101,7 +101,7 @@ class CAndorSDK3Camera : public CCameraBase 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 index ad492ba33..28e038313 100644 --- 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 index 5f62e9d9f..714dab18d 100644 --- a/DeviceAdapters/Aravis/AravisCamera.h +++ b/DeviceAdapters/Aravis/AravisCamera.h @@ -77,7 +77,7 @@ class AravisCamera : public CCameraBase // 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 index 53ceb5f2a..e40062cf2 100644 --- 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 index 41f05f022..0ec11daa6 100644 --- a/DeviceAdapters/ArduinoCounter/ArduinoCounter.h +++ b/DeviceAdapters/ArduinoCounter/ArduinoCounter.h @@ -96,7 +96,7 @@ class ArduinoCounterCamera : public CCameraBase 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 }; -#endif //_ArduinoCounter_H_ \ No newline at end of file +#endif //_ArduinoCounter_H_ diff --git a/DeviceAdapters/Atik/Atik.cpp b/DeviceAdapters/Atik/Atik.cpp index 5165f8385..696337894 100644 --- 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 index e8a24673e..301753071 100644 --- a/DeviceAdapters/Atik/Atik.h +++ b/DeviceAdapters/Atik/Atik.h @@ -64,7 +64,7 @@ class Atik : public CCameraBase 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 index c0b71a755..40b379587 100644 --- 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 index 22838e55a..9b3ef0744 100644 --- a/DeviceAdapters/Basler/BaslerPylonCamera.h +++ b/DeviceAdapters/Basler/BaslerPylonCamera.h @@ -115,7 +115,7 @@ class BaslerCamera : public CCameraBase { 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 index a06cfd0bf..48aa4d5e6 100644 --- 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 index d9e614883..97b919f75 100644 --- a/DeviceAdapters/DahengGalaxy/ClassGalaxy.h +++ b/DeviceAdapters/DahengGalaxy/ClassGalaxy.h @@ -98,7 +98,7 @@ class MODULE_API ClassGalaxy : public CCameraBase 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); -}; \ No newline at end of file +}; diff --git a/DeviceAdapters/DemoCamera/DemoCamera.h b/DeviceAdapters/DemoCamera/DemoCamera.h index 1de99da9b..db326ce3e 100644 --- a/DeviceAdapters/DemoCamera/DemoCamera.h +++ b/DeviceAdapters/DemoCamera/DemoCamera.h @@ -148,7 +148,7 @@ class CDemoCamera : public CCameraBase 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 index 65a1f3e31..edaed991a 100644 --- 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 index 073bf7c52..b5e13dbbf 100644 --- a/DeviceAdapters/FLICamera/FLICamera.h +++ b/DeviceAdapters/FLICamera/FLICamera.h @@ -58,7 +58,7 @@ class CFLICamera : public CCameraBase 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 index ae2f370ce..07e625e27 100644 --- a/DeviceAdapters/GigECamera/GigECamera.h +++ b/DeviceAdapters/GigECamera/GigECamera.h @@ -182,7 +182,7 @@ class CGigECamera : public CCameraBase 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 index 353c4f78e..13734b7d6 100644 --- 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 index 162168e6e..2662c50f7 100644 --- a/DeviceAdapters/Hikrobot/HikrobotCamera.h +++ b/DeviceAdapters/Hikrobot/HikrobotCamera.h @@ -119,7 +119,7 @@ class HikrobotCamera : public CCameraBase { 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 index b67a882cc..e0ab809d2 100644 --- a/DeviceAdapters/IDSPeak/IDSPeak.h +++ b/DeviceAdapters/IDSPeak/IDSPeak.h @@ -150,7 +150,7 @@ class CIDSPeak : public CCameraBase 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 index 3d43d571f..f489bafb4 100644 --- a/DeviceAdapters/IDS_uEye/IDS_uEye.h +++ b/DeviceAdapters/IDS_uEye/IDS_uEye.h @@ -256,7 +256,7 @@ class CIDS_uEye : public CCameraBase 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 index ffb7d901c..f2564fea7 100644 --- 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 index b1904e7d6..b366a4b02 100644 --- a/DeviceAdapters/JAI/JAI.h +++ b/DeviceAdapters/JAI/JAI.h @@ -171,7 +171,7 @@ class JAICamera : public CCameraBase // 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 index d5d301723..3f03c98fa 100644 --- 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; -} \ No newline at end of file +} diff --git a/DeviceAdapters/Lumenera/LumeneraCamera.h b/DeviceAdapters/Lumenera/LumeneraCamera.h index e5efbd344..7fc09fb65 100644 --- a/DeviceAdapters/Lumenera/LumeneraCamera.h +++ b/DeviceAdapters/Lumenera/LumeneraCamera.h @@ -125,7 +125,7 @@ class LumeneraCamera : public CCameraBase { 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 index 37b6fe185..ebccdc2db 100644 --- a/DeviceAdapters/MatrixVision/mvIMPACT_Acquire_Device.h +++ b/DeviceAdapters/MatrixVision/mvIMPACT_Acquire_Device.h @@ -96,7 +96,7 @@ class mvIMPACT_Acquire_Device : public CCameraBase 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 index 3f9196be2..51ef6aee4 100755 --- 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 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 index f3d800f83..1183b53b0 100644 --- 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 index 9fbd45640..fe82a06c9 100644 --- a/DeviceAdapters/Motic/MoticCamera.h +++ b/DeviceAdapters/Motic/MoticCamera.h @@ -83,7 +83,7 @@ class CMoticCamera : public CCameraBase 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 index f9e802fc9..6bf73bc1f 100644 --- a/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.h +++ b/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.h @@ -97,7 +97,7 @@ class COpenCVgrabber : public CCameraBase 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 index 57ca48314..d7410a6bd 100644 --- 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 index b9f965831..67de735ab 100644 --- a/DeviceAdapters/PCO_Generic/MicroManager.h +++ b/DeviceAdapters/PCO_Generic/MicroManager.h @@ -93,7 +93,7 @@ class CPCOCam : public CCameraBase 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 index df97181c6..4698a3095 100644 --- a/DeviceAdapters/PICAM/PICAMAdapter.h +++ b/DeviceAdapters/PICAM/PICAMAdapter.h @@ -235,7 +235,7 @@ class Universal : public CCameraBase #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 index f2d0489d1..79bda34ea 100644 --- 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 index cb6f0fd9e..34889603e 100644 --- a/DeviceAdapters/PVCAM/PVCAMAdapter.h +++ b/DeviceAdapters/PVCAM/PVCAMAdapter.h @@ -223,7 +223,7 @@ class Universal : public CCameraBase /** * 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(); diff --git a/DeviceAdapters/PVCAM/PVCAMUniversal.cpp b/DeviceAdapters/PVCAM/PVCAMUniversal.cpp index a87a7a9b3..d7c27b25d 100644 --- a/DeviceAdapters/PVCAM/PVCAMUniversal.cpp +++ b/DeviceAdapters/PVCAM/PVCAMUniversal.cpp @@ -1990,9 +1990,9 @@ bool Universal::IsCapturing() return bCapturing; } -int Universal::PrepareSequenceAcqusition() +int Universal::PrepareSequenceAcquisition() { - START_METHOD("Universal::PrepareSequenceAcqusition"); + START_METHOD("Universal::PrepareSequenceAcquisition"); if (isAcquiring_) return ERR_BUSY_ACQUIRING; @@ -2048,7 +2048,7 @@ int Universal::StartSequenceAcquisition(long numImages, double interval_ms, bool if (ret != DEVICE_OK) return ret; - ret = PrepareSequenceAcqusition(); + ret = PrepareSequenceAcquisition(); if (ret != DEVICE_OK) return ret; diff --git a/DeviceAdapters/Pixelink/Pixelink.h b/DeviceAdapters/Pixelink/Pixelink.h index abe4aa85a..b2d7c3319 100644 --- a/DeviceAdapters/Pixelink/Pixelink.h +++ b/DeviceAdapters/Pixelink/Pixelink.h @@ -71,7 +71,7 @@ class Pixelink : public CCameraBase 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(); @@ -204,4 +204,4 @@ class MySequenceThread : public MMDeviceThreadBase MM::MMTime lastFrameTime_; MMThreadLock stopLock_; MMThreadLock suspendLock_; -}; \ No newline at end of file +}; diff --git a/DeviceAdapters/PlayerOne/POACamera.cpp b/DeviceAdapters/PlayerOne/POACamera.cpp index 91894d391..fbefd7f5b 100644 --- a/DeviceAdapters/PlayerOne/POACamera.cpp +++ b/DeviceAdapters/PlayerOne/POACamera.cpp @@ -1284,9 +1284,9 @@ int POACamera::SendExposureSequence() const { } -int POACamera::PrepareSequenceAcqusition() +int POACamera::PrepareSequenceAcquisition() { - LOG("PrepareSequenceAcqusition") + LOG("PrepareSequenceAcquisition") if (IsCapturing()) return DEVICE_CAMERA_BUSY_ACQUIRING; @@ -3353,4 +3353,4 @@ int DemoHub::DetectInstalledDevices() void DemoHub::GetName(char* pName) const { CDeviceUtils::CopyLimitedString(pName, g_HubDeviceName); -} \ No newline at end of file +} diff --git a/DeviceAdapters/PlayerOne/POACamera.h b/DeviceAdapters/PlayerOne/POACamera.h index 6651a0de4..1c26bd2f3 100644 --- a/DeviceAdapters/PlayerOne/POACamera.h +++ b/DeviceAdapters/PlayerOne/POACamera.h @@ -118,7 +118,7 @@ class POACamera : public CCameraBase bool SupportsMultiROI(); - int PrepareSequenceAcqusition(); + int PrepareSequenceAcquisition(); int StartSequenceAcquisition(double interval); int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow); int StopSequenceAcquisition(); diff --git a/DeviceAdapters/PointGrey/PointGrey.h b/DeviceAdapters/PointGrey/PointGrey.h index 802157910..d9103fd40 100644 --- a/DeviceAdapters/PointGrey/PointGrey.h +++ b/DeviceAdapters/PointGrey/PointGrey.h @@ -84,7 +84,7 @@ class PointGrey : public CCameraBase 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/PrincetonInstruments/PVCAMInt.h b/DeviceAdapters/PrincetonInstruments/PVCAMInt.h index ffc3b132a..91dfbe2f1 100644 --- a/DeviceAdapters/PrincetonInstruments/PVCAMInt.h +++ b/DeviceAdapters/PrincetonInstruments/PVCAMInt.h @@ -175,7 +175,7 @@ class Universal : public CCameraBase int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow); int StopSequenceAcquisition(); // temporary debug methods - int PrepareSequenceAcqusition(); + int PrepareSequenceAcquisition(); #endif // action interface diff --git a/DeviceAdapters/PrincetonInstruments/PVCAMUniversal.cpp b/DeviceAdapters/PrincetonInstruments/PVCAMUniversal.cpp index 043e4fc2c..ac20f58b3 100644 --- a/DeviceAdapters/PrincetonInstruments/PVCAMUniversal.cpp +++ b/DeviceAdapters/PrincetonInstruments/PVCAMUniversal.cpp @@ -1964,7 +1964,7 @@ int Universal::ThreadRun(void) return ret; } -int Universal::PrepareSequenceAcqusition() +int Universal::PrepareSequenceAcquisition() { if (IsCapturing()) return ERR_BUSY_ACQUIRING; @@ -1996,7 +1996,7 @@ int Universal::StartSequenceAcquisition(long numImages, double interval_ms, bool { if (!sequenceModeReady_) { - int ret = PrepareSequenceAcqusition(); + int ret = PrepareSequenceAcquisition(); if (ret != DEVICE_OK) return ret; } diff --git a/DeviceAdapters/RaptorEPIX/RaptorEPIX.h b/DeviceAdapters/RaptorEPIX/RaptorEPIX.h index 3c49638ef..7356104cc 100644 --- a/DeviceAdapters/RaptorEPIX/RaptorEPIX.h +++ b/DeviceAdapters/RaptorEPIX/RaptorEPIX.h @@ -188,7 +188,7 @@ class CRaptorEPIX : public CCameraBase 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/SigmaKoki/Camera.h b/DeviceAdapters/SigmaKoki/Camera.h index cc40a655a..854c0b3b3 100644 --- a/DeviceAdapters/SigmaKoki/Camera.h +++ b/DeviceAdapters/SigmaKoki/Camera.h @@ -85,7 +85,7 @@ class Camera : public CCameraBase, public SigmaBase int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize); int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize); int ClearROI(); - int PrepareSequenceAcqusition() { return DEVICE_OK; }; + int PrepareSequenceAcquisition() { return DEVICE_OK; }; int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow); int StartSequenceAcquisition(double interval_ms); int StopSequenceAcquisition(); diff --git a/DeviceAdapters/Spinnaker/SpinnakerCamera.cpp b/DeviceAdapters/Spinnaker/SpinnakerCamera.cpp index 2cae743bf..05ba313c2 100644 --- a/DeviceAdapters/Spinnaker/SpinnakerCamera.cpp +++ b/DeviceAdapters/Spinnaker/SpinnakerCamera.cpp @@ -1534,7 +1534,7 @@ int SpinnakerCamera::allocateImageBuffer(const std::size_t size, const SPKR::Pix } -int SpinnakerCamera::PrepareSequenceAcqusition() +int SpinnakerCamera::PrepareSequenceAcquisition() { return DEVICE_OK; } diff --git a/DeviceAdapters/Spinnaker/SpinnakerCamera.h b/DeviceAdapters/Spinnaker/SpinnakerCamera.h index bd2e7d445..c7e264822 100644 --- a/DeviceAdapters/Spinnaker/SpinnakerCamera.h +++ b/DeviceAdapters/Spinnaker/SpinnakerCamera.h @@ -42,7 +42,7 @@ class SpinnakerCamera : public CCameraBase int SetBinning(int binSize); int IsExposureSequenceable(bool& isSequenceable) const { isSequenceable = false; return DEVICE_OK; }; - int PrepareSequenceAcqusition(); + int PrepareSequenceAcquisition(); int StartSequenceAcquisition(double interval); int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow); int StopSequenceAcquisition(); diff --git a/DeviceAdapters/TSI/TSI3Cam.cpp b/DeviceAdapters/TSI/TSI3Cam.cpp index fd2c2c79e..25fb3b56b 100644 --- a/DeviceAdapters/TSI/TSI3Cam.cpp +++ b/DeviceAdapters/TSI/TSI3Cam.cpp @@ -741,7 +741,7 @@ int Tsi3Cam::ClearROI() return ResizeImageBuffer(); } -int Tsi3Cam::PrepareSequenceAcqusition() +int Tsi3Cam::PrepareSequenceAcquisition() { if (IsCapturing()) { @@ -765,7 +765,7 @@ int Tsi3Cam::StartSequenceAcquisition(long numImages, double /*interval_ms*/, bo } if (!prepared) { - this->PrepareSequenceAcqusition(); + this->PrepareSequenceAcquisition(); } // the camera ignores interval, running at the rate dictated by the exposure @@ -785,7 +785,7 @@ int Tsi3Cam::StartSequenceAcquisition(double /*interval_ms*/) } if (!prepared) { - this->PrepareSequenceAcqusition(); + this->PrepareSequenceAcquisition(); } // the camera ignores interval, running at the rate dictated by the exposure diff --git a/DeviceAdapters/TSI/TSI3Cam.h b/DeviceAdapters/TSI/TSI3Cam.h index 07455c0ec..a1d5f67e0 100644 --- a/DeviceAdapters/TSI/TSI3Cam.h +++ b/DeviceAdapters/TSI/TSI3Cam.h @@ -139,7 +139,7 @@ class Tsi3Cam : public CCameraBase // 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/TSI/TSICam.cpp b/DeviceAdapters/TSI/TSICam.cpp index fdc48af21..39cd4951f 100644 --- a/DeviceAdapters/TSI/TSICam.cpp +++ b/DeviceAdapters/TSI/TSICam.cpp @@ -689,7 +689,7 @@ int TsiCam::ClearROI() return ResizeImageBuffer(roiBinData); } -int TsiCam::PrepareSequenceAcqusition() +int TsiCam::PrepareSequenceAcquisition() { if (IsCapturing()) { diff --git a/DeviceAdapters/TSI/TSICam.h b/DeviceAdapters/TSI/TSICam.h index d996a5fac..12233220c 100644 --- a/DeviceAdapters/TSI/TSICam.h +++ b/DeviceAdapters/TSI/TSICam.h @@ -109,7 +109,7 @@ class TsiCam : public CCameraBase // 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/TUCam/MMTUCam.h b/DeviceAdapters/TUCam/MMTUCam.h index 03bfa01a6..98b1e563c 100755 --- a/DeviceAdapters/TUCam/MMTUCam.h +++ b/DeviceAdapters/TUCam/MMTUCam.h @@ -225,7 +225,7 @@ class CMMTUCam : public CCameraBase 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/ThorlabsUSBCamera/ThorlabsUSBCamera.h b/DeviceAdapters/ThorlabsUSBCamera/ThorlabsUSBCamera.h index 7ed8bec9e..80da3fb3f 100644 --- a/DeviceAdapters/ThorlabsUSBCamera/ThorlabsUSBCamera.h +++ b/DeviceAdapters/ThorlabsUSBCamera/ThorlabsUSBCamera.h @@ -76,7 +76,7 @@ class ThorlabsUSBCam : public CCameraBase 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/TwoPhoton/TwoPhoton.cpp b/DeviceAdapters/TwoPhoton/TwoPhoton.cpp index 62df9a22e..0e2f0b045 100644 --- a/DeviceAdapters/TwoPhoton/TwoPhoton.cpp +++ b/DeviceAdapters/TwoPhoton/TwoPhoton.cpp @@ -635,7 +635,7 @@ int BitFlowCamera::StopSequenceAcquisition() return DEVICE_OK; } -int BitFlowCamera::PrepareSequenceAcqusition() +int BitFlowCamera::PrepareSequenceAcquisition() { // nothing to prepare return DEVICE_OK; diff --git a/DeviceAdapters/TwoPhoton/TwoPhoton.h b/DeviceAdapters/TwoPhoton/TwoPhoton.h index c66d48109..77dd9e842 100644 --- a/DeviceAdapters/TwoPhoton/TwoPhoton.h +++ b/DeviceAdapters/TwoPhoton/TwoPhoton.h @@ -101,7 +101,7 @@ class BitFlowCamera : public CCameraBase { 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/UniversalMMHubUsb/ummhUsb.h b/DeviceAdapters/UniversalMMHubUsb/ummhUsb.h index bb68e6e26..0aaf48941 100644 --- a/DeviceAdapters/UniversalMMHubUsb/ummhUsb.h +++ b/DeviceAdapters/UniversalMMHubUsb/ummhUsb.h @@ -430,7 +430,7 @@ class UmmhCamera : public UmmhDeviceUtilities, public CCameraBase int ClearROI(); // sequence acquisition - 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(); @@ -516,4 +516,4 @@ class MySequenceThread : public MMDeviceThreadBase }; -#endif //_UMMHUSB_H_ \ No newline at end of file +#endif //_UMMHUSB_H_ diff --git a/DeviceAdapters/Utilities/MultiCamera.cpp b/DeviceAdapters/Utilities/MultiCamera.cpp index ff28f8c38..8d477eafa 100644 --- a/DeviceAdapters/Utilities/MultiCamera.cpp +++ b/DeviceAdapters/Utilities/MultiCamera.cpp @@ -433,7 +433,7 @@ int MultiCamera::ClearROI() return DEVICE_OK; } -int MultiCamera::PrepareSequenceAcqusition() +int MultiCamera::PrepareSequenceAcquisition() { if (nrCamerasInUse_ < 1) return ERR_NO_PHYSICAL_CAMERA; @@ -443,7 +443,7 @@ int MultiCamera::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/Utilities/Utilities.h b/DeviceAdapters/Utilities/Utilities.h index 9b7864728..0e5cf2e13 100644 --- a/DeviceAdapters/Utilities/Utilities.h +++ b/DeviceAdapters/Utilities/Utilities.h @@ -162,7 +162,7 @@ class MultiCamera : public CCameraBase 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/Ximea/XIMEACamera.h b/DeviceAdapters/Ximea/XIMEACamera.h index bd4c76bd3..a4a648d3d 100644 --- a/DeviceAdapters/Ximea/XIMEACamera.h +++ b/DeviceAdapters/Ximea/XIMEACamera.h @@ -89,7 +89,7 @@ class XimeaCamera : public CCameraBase int SetMultiROI(const unsigned* xs, const unsigned* ys, const unsigned* widths, const unsigned* heights, 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/ZWO/MyASICam2.cpp b/DeviceAdapters/ZWO/MyASICam2.cpp index 86a9b25c3..858acb98c 100644 --- a/DeviceAdapters/ZWO/MyASICam2.cpp +++ b/DeviceAdapters/ZWO/MyASICam2.cpp @@ -1073,7 +1073,7 @@ int CMyASICam::SetBinning(int binF) return SetProperty(MM::g_Keyword_Binning, CDeviceUtils::ConvertToString(binF));//就是onBinning(, afterSet) } -int CMyASICam::PrepareSequenceAcqusition() +int CMyASICam::PrepareSequenceAcquisition() { if (IsCapturing()) return DEVICE_CAMERA_BUSY_ACQUIRING; diff --git a/DeviceAdapters/ZWO/MyASICam2.h b/DeviceAdapters/ZWO/MyASICam2.h index 6710bf6b1..7ff8997f7 100644 --- a/DeviceAdapters/ZWO/MyASICam2.h +++ b/DeviceAdapters/ZWO/MyASICam2.h @@ -41,7 +41,7 @@ class CMyASICam:public CCameraBase int SetBinning(int binSize); int IsExposureSequenceable(bool& seq) const {seq = false; return DEVICE_OK;} - int PrepareSequenceAcqusition(); + int PrepareSequenceAcquisition(); int StartSequenceAcquisition(double interval); int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow); int StopSequenceAcquisition(); @@ -190,4 +190,4 @@ class CMyEFW : public CStateDeviceBase bool bPosWait; // long position_; }; -//2.0.0.0->20170113:增加anti-dew和EFW \ No newline at end of file +//2.0.0.0->20170113:增加anti-dew和EFW diff --git a/MMCore/Devices/CameraInstance.cpp b/MMCore/Devices/CameraInstance.cpp index 8633d1b5d..f1b292498 100644 --- a/MMCore/Devices/CameraInstance.cpp +++ b/MMCore/Devices/CameraInstance.cpp @@ -130,7 +130,7 @@ int CameraInstance::GetMultiROI(unsigned* xs, unsigned* ys, unsigned* widths, int CameraInstance::StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow) { RequireInitialized(__func__); return GetImpl()->StartSequenceAcquisition(numImages, interval_ms, stopOnOverflow); } int CameraInstance::StartSequenceAcquisition(double interval_ms) { RequireInitialized(__func__); return GetImpl()->StartSequenceAcquisition(interval_ms); } int CameraInstance::StopSequenceAcquisition() { RequireInitialized(__func__); return GetImpl()->StopSequenceAcquisition(); } -int CameraInstance::PrepareSequenceAcqusition() { RequireInitialized(__func__); return GetImpl()->PrepareSequenceAcqusition(); } +int CameraInstance::PrepareSequenceAcquisition() { RequireInitialized(__func__); return GetImpl()->PrepareSequenceAcquisition(); } bool CameraInstance::IsCapturing() { RequireInitialized(__func__); return GetImpl()->IsCapturing(); } std::string CameraInstance::GetTags() diff --git a/MMCore/Devices/CameraInstance.h b/MMCore/Devices/CameraInstance.h index f228a37e6..60698f8e4 100644 --- a/MMCore/Devices/CameraInstance.h +++ b/MMCore/Devices/CameraInstance.h @@ -70,7 +70,7 @@ class CameraInstance : public DeviceInstanceBase int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow); int StartSequenceAcquisition(double interval_ms); int StopSequenceAcquisition(); - int PrepareSequenceAcqusition(); + int PrepareSequenceAcquisition(); bool IsCapturing(); std::string GetTags(); void AddTag(const char* key, const char* deviceLabel, const char* value); diff --git a/MMCore/MMCore.cpp b/MMCore/MMCore.cpp index 4bef95471..c61a8afcd 100644 --- a/MMCore/MMCore.cpp +++ b/MMCore/MMCore.cpp @@ -2754,7 +2754,7 @@ void CMMCore::prepareSequenceAcquisition(const char* label) throw (CMMError) LOG_DEBUG(coreLogger_) << "Will prepare camera " << label << " for sequence acquisition"; - int nRet = pCam->PrepareSequenceAcqusition(); + int nRet = pCam->PrepareSequenceAcquisition(); if (nRet != DEVICE_OK) throw CMMError(getDeviceErrorText(nRet, pCam).c_str(), MMERR_DEVICE_GENERIC); diff --git a/MMDevice/DeviceBase.h b/MMDevice/DeviceBase.h index 84cef7177..fe0354cca 100644 --- a/MMDevice/DeviceBase.h +++ b/MMDevice/DeviceBase.h @@ -1415,7 +1415,7 @@ class CCameraBase : public CDeviceBase } // temporary debug methods - virtual int PrepareSequenceAcqusition() {return DEVICE_OK;} + virtual int PrepareSequenceAcquisition() {return DEVICE_OK;} /** * Default implementation. diff --git a/MMDevice/MMDevice.h b/MMDevice/MMDevice.h index cddfebd00..3b8f428c0 100644 --- a/MMDevice/MMDevice.h +++ b/MMDevice/MMDevice.h @@ -503,7 +503,7 @@ namespace MM { /** * Sets up the camera so that Sequence acquisition can start without delay */ - virtual int PrepareSequenceAcqusition() = 0; + virtual int PrepareSequenceAcquisition() = 0; /** * Flag to indicate whether Sequence Acquisition is currently running. * Return true when Sequence acquisition is active, false otherwise