diff --git a/DeviceAdapters/AmScope/AmScope.cpp b/DeviceAdapters/AmScope/AmScope.cpp index cecaf886d..8fb8f74c8 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..563210fb6 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(); 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/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..2ac05ec21 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(); diff --git a/DeviceAdapters/Atik/Atik.cpp b/DeviceAdapters/Atik/Atik.cpp index d5444c358..180b39d38 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 3e98fe9ba..8d12045fb 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/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/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..89e303f49 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; 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 38eb58c65..e06ca9d76 100644 --- a/DeviceAdapters/PCO_Generic/MicroManager.cpp +++ b/DeviceAdapters/PCO_Generic/MicroManager.cpp @@ -2182,7 +2182,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 eacade6f8..c2dae3d73 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 87a2ced4e..0c97a1ee1 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..7165aec5b 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(); diff --git a/DeviceAdapters/PointGrey/PointGrey.h b/DeviceAdapters/PointGrey/PointGrey.h index 68be193aa..54b691c76 100644 --- a/DeviceAdapters/PointGrey/PointGrey.h +++ b/DeviceAdapters/PointGrey/PointGrey.h @@ -79,7 +79,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 bd44d57bc..9b8fb37ef 100644 --- a/DeviceAdapters/Spinnaker/SpinnakerCamera.cpp +++ b/DeviceAdapters/Spinnaker/SpinnakerCamera.cpp @@ -1532,7 +1532,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 662a53ecc..2607d2a16 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 15a046bbd..110f964cc 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; @@ -1194,8 +1194,8 @@ void BitFlowCamera::GetCosineWarpLUT(vector &new_pixel, int image_width, in /* Again this code can be replaced by simpler code - The correction factor = � /sin � where � = pixel number (from the correct center pixel) * ?� - ?� = 2?/freq*127. The corretion factor is calculated for each pixel and applied to the pixel + The correction factor = � /sin � where � = pixel number (from the correct center pixel) * ?� + ?� = 2?/freq*127. The corretion factor is calculated for each pixel and applied to the pixel */ /*9 Loop to shift pixels to new image LUT*/ 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..59e123726 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(); 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 80fc4c141..54f1a1c00 100644 --- a/DeviceAdapters/Ximea/XIMEACamera.h +++ b/DeviceAdapters/Ximea/XIMEACamera.h @@ -6,7 +6,7 @@ // DESCRIPTION: XIMEA camera module. // // AUTHOR: Marian Zajko, -// COPYRIGHT: Marian Zajko and XIMEA GmbH, M�nster, 2011 +// COPYRIGHT: Marian Zajko and XIMEA GmbH, M�nster, 2011 // // LICENSE: This file is distributed under the BSD license. // License text is included with the source distribution. @@ -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 50b1c077e..10422054d 100644 --- a/DeviceAdapters/ZWO/MyASICam2.cpp +++ b/DeviceAdapters/ZWO/MyASICam2.cpp @@ -93,9 +93,9 @@ inline static void OutputDbgPrint(const char* strOutPutString, ...) MODULE_API void InitializeModuleData() { #ifdef _VEROPTICS - RegisterDevice(g_CameraName, MM::CameraDevice, "Micro-manager Veroptics camera");//������device list�� + RegisterDevice(g_CameraName, MM::CameraDevice, "Micro-manager Veroptics camera");//������device list�� #else - RegisterDevice(g_CameraName, MM::CameraDevice, "ZWO ASI camera");//������device list�� + RegisterDevice(g_CameraName, MM::CameraDevice, "ZWO ASI camera");//������device list�� #endif RegisterDevice(g_StateDeviceName, MM::StateDevice, "ZWO EFW filter wheel"); } @@ -218,19 +218,19 @@ CMyASICam::CMyASICam() : { ASIGetCameraProperty(&ASICameraInfo, i); #ifdef _VEROPTICS - StrReplace(ASICameraInfo.Name, ASICameraInfo.Name, "ZWO", "Veroptics");//���ִ�Сд - StrReplace(ASICameraInfo.Name, ASICameraInfo.Name, "ASI", "VER");//���ִ�Сд - StrReplace(ASICameraInfo.Name, ASICameraInfo.Name, "mc", "C", false);//�����ִ�Сд - StrReplace(ASICameraInfo.Name, ASICameraInfo.Name, "mm", "M", false);//�����ִ�Сд + StrReplace(ASICameraInfo.Name, ASICameraInfo.Name, "ZWO", "Veroptics");//���ִ�Сд + StrReplace(ASICameraInfo.Name, ASICameraInfo.Name, "ASI", "VER");//���ִ�Сд + StrReplace(ASICameraInfo.Name, ASICameraInfo.Name, "mc", "C", false);//�����ִ�Сд + StrReplace(ASICameraInfo.Name, ASICameraInfo.Name, "mm", "M", false);//�����ִ�Сд #endif - strcpy(ConnectedCamName[i], ASICameraInfo.Name);//�������ӵ�����ͷ���� + strcpy(ConnectedCamName[i], ASICameraInfo.Name);//�������ӵ�����ͷ���� CamIndexValues.push_back(ConnectedCamName[i]); } - CPropertyAction *pAct = new CPropertyAction (this, &CMyASICam::OnSelectCamIndex);//ͨ������ѡ��򿪵���� + CPropertyAction *pAct = new CPropertyAction (this, &CMyASICam::OnSelectCamIndex);//ͨ������ѡ��򿪵���� if(iConnectedCamNum > 0) { - strcpy(sz_ModelIndex, ConnectedCamName[0]);//Ĭ�ϴ򿪵�һ��camera + strcpy(sz_ModelIndex, ConnectedCamName[0]);//Ĭ�ϴ򿪵�һ��camera //iCamIndex = 0; ASIGetCameraProperty(&ASICameraInfo, 0); } @@ -244,7 +244,7 @@ CMyASICam::CMyASICam() : } // strcpy(sz_ModelIndex, "DropDown"); - ret = CreateProperty(g_DeviceIndex, sz_ModelIndex, MM::String, false, pAct, true); //ѡ������ͷ��� + ret = CreateProperty(g_DeviceIndex, sz_ModelIndex, MM::String, false, pAct, true); //ѡ������ͷ��� SetAllowedValues(g_DeviceIndex, CamIndexValues); assert(ret == DEVICE_OK); @@ -310,10 +310,10 @@ int CMyASICam::Initialize() // ASIGetCameraProperty(&ASICameraInfo, iCamIndex); #ifdef _VEROPTICS - StrReplace(ASICameraInfo.Name, ASICameraInfo.Name, "ZWO", "Veroptics");//���ִ�Сд - StrReplace(ASICameraInfo.Name, ASICameraInfo.Name, "ASI", "VER");//���ִ�Сд - StrReplace(ASICameraInfo.Name, ASICameraInfo.Name, "mc", "C", false);//�����ִ�Сд - StrReplace(ASICameraInfo.Name, ASICameraInfo.Name, "mm", "M", false);//�����ִ�Сд + StrReplace(ASICameraInfo.Name, ASICameraInfo.Name, "ZWO", "Veroptics");//���ִ�Сд + StrReplace(ASICameraInfo.Name, ASICameraInfo.Name, "ASI", "VER");//���ִ�Сд + StrReplace(ASICameraInfo.Name, ASICameraInfo.Name, "mc", "C", false);//�����ִ�Сд + StrReplace(ASICameraInfo.Name, ASICameraInfo.Name, "mm", "M", false);//�����ִ�Сд #endif char *sz_Name = ASICameraInfo.Name; int nRet = CreateStringProperty(MM::g_Keyword_CameraName, sz_Name, true); @@ -666,7 +666,7 @@ int CMyASICam::Shutdown() * (i.e., before readout). This behavior is needed for proper synchronization with the shutter. * Required by the MM::Camera API. */ -int CMyASICam::SnapImage()//�ع��ڼ�Ҫ���� +int CMyASICam::SnapImage()//�ع��ڼ�Ҫ���� { // GenerateImage(); // ASIGetStartPos(iCamIndex, &iStartXImg, &iStartYImg); @@ -830,7 +830,7 @@ unsigned CMyASICam::GetImageHeight() const * Returns image buffer pixel depth in bytes. * Required by the MM::Camera API. */ -unsigned CMyASICam::GetImageBytesPerPixel() const //ÿ�����ص��ֽ��� +unsigned CMyASICam::GetImageBytesPerPixel() const //ÿ�����ص��ֽ��� { return iPixBytes; } @@ -841,7 +841,7 @@ unsigned CMyASICam::GetImageHeight() const * a guideline on how to interpret pixel values. * Required by the MM::Camera API. */ -unsigned CMyASICam::GetBitDepth() const//��ɫ�ķ�Χ 8bit �� 16bit +unsigned CMyASICam::GetBitDepth() const//��ɫ�ķ�Χ 8bit �� 16bit { if(ImgType == ASI_IMG_RAW16) { @@ -931,16 +931,16 @@ void CMyASICam::DeleteImgBuf() pRGB64 = 0; } } -int CMyASICam::SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize)//bin2ʱ��ֵ�������bin2��ͼ���ϵ�, ��ASISetStartPos���������bin1�� +int CMyASICam::SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize)//bin2ʱ��ֵ�������bin2��ͼ���ϵ�, ��ASISetStartPos���������bin1�� { if (xSize == 0 && ySize == 0) ; else { /*20160107 - ����ROI������ʾͼƬΪ���յ�,���򴫽�������ʼ��(x, y)��������ʾͼƬ����ʼ��(����GetROI()�õ�)�������ѡ���ƫ�ƣ� - �ߴ����ʼ�㶼��ImgBin/iSetBin����, iSetBin��Ҫ���õ�binֵ - ����з�ת, ��Ҫ������������������ + ����ROI������ʾͼƬΪ���յ�,���򴫽�������ʼ��(x, y)��������ʾͼƬ����ʼ��(����GetROI()�õ�)�������ѡ���ƫ�ƣ� + �ߴ����ʼ�㶼��ImgBin/iSetBin����, iSetBin��Ҫ���õ�binֵ + ����з�ת, ��Ҫ������������������ */ switch(ImgFlip) { @@ -964,15 +964,15 @@ void CMyASICam::DeleteImgBuf() iSetHei = iSetHei/2*2; - iSetX = x*ImgBin/iSetBin;//bin�ı��, startpos�������bin��Ļ���ģ�ҲҪ���ձ����ı� + iSetX = x*ImgBin/iSetBin;//bin�ı��, startpos�������bin��Ļ���ģ�ҲҪ���ձ����ı� iSetY = y*ImgBin/iSetBin; iSetX = iSetX/4*4; iSetY = iSetY/2*2; - if(ASISetROIFormat(ASICameraInfo.CameraID, iSetWid, iSetHei, iSetBin, ImgType) == ASI_SUCCESS)//������óɹ� + if(ASISetROIFormat(ASICameraInfo.CameraID, iSetWid, iSetHei, iSetBin, ImgType) == ASI_SUCCESS)//������óɹ� { OutputDbgPrint("wid:%d hei:%d bin:%d\n", xSize, ySize, iBin); - DeleteImgBuf();//buff��С�ı� + DeleteImgBuf();//buff��С�ı� ASISetStartPos(ASICameraInfo.CameraID, iSetX, iSetY); } ASIGetROIFormat(ASICameraInfo.CameraID, &iROIWidth, &iROIHeight, &iBin, &ImgType); @@ -984,11 +984,11 @@ void CMyASICam::DeleteImgBuf() * Returns the actual dimensions of the current ROI. * Required by the MM::Camera API. */ -int CMyASICam::GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize)//�����������õ���ǰROI��㣬����ROI��ľ�����㣬�õ�ROI��ROI����� +int CMyASICam::GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize)//�����������õ���ǰROI��㣬����ROI��ľ�����㣬�õ�ROI��ROI����� { /* 20160107 - �õ���ʾͼ���ROI��Ϣ - ����з�ת, Ҫ����ɷ�����ߵ�����, ���������ӵõ���ROI,�ٻ�����������������*/ + �õ���ʾͼ���ROI��Ϣ + ����з�ת, Ҫ����ɷ�����ߵ�����, ���������ӵõ���ROI,�ٻ�����������������*/ x = ImgStartX; y = ImgStartY; @@ -1070,10 +1070,10 @@ int CMyASICam::GetBinning() const */ int CMyASICam::SetBinning(int binF) { - return SetProperty(MM::g_Keyword_Binning, CDeviceUtils::ConvertToString(binF));//����onBinning(, afterSet) + return SetProperty(MM::g_Keyword_Binning, CDeviceUtils::ConvertToString(binF));//����onBinning(, afterSet) } -int CMyASICam::PrepareSequenceAcqusition() +int CMyASICam::PrepareSequenceAcquisition() { if (IsCapturing()) return DEVICE_CAMERA_BUSY_ACQUIRING; @@ -1108,7 +1108,7 @@ int CMyASICam::StartSequenceAcquisition(long numImages, double interval_ms, bool Status = capturing; OutputDbgPrint("StartSeqAcq\n"); - thd_->Start(numImages,interval_ms);//��ʼ�߳� + thd_->Start(numImages,interval_ms);//��ʼ�߳� return DEVICE_OK; } @@ -1159,7 +1159,7 @@ int CMyASICam::InsertImage() pI = GetImageBuffer(); int ret = 0; ret = GetCoreCallback()->InsertImage(this, pI, iROIWidth, iROIHeight, iPixBytes, md.Serialize().c_str()); - if (ret == DEVICE_BUFFER_OVERFLOW)//����������Ҫ���, �����ܼ�������ͼ�����ס + if (ret == DEVICE_BUFFER_OVERFLOW)//����������Ҫ���, �����ܼ�������ͼ�����ס { // do not stop on overflow - just reset the buffer GetCoreCallback()->ClearImageBuffer(this); @@ -1177,10 +1177,10 @@ int CMyASICam::StopSequenceAcquisition() { if (!thd_->IsStopped()) { - thd_->Stop();//ֹͣ�߳� + thd_->Stop();//ֹͣ�߳� OutputDbgPrint("StopSeqAcq bf wait\n"); // if(!thd_->IsStopped()) - thd_->wait();//�ȴ��߳��˳� + thd_->wait();//�ȴ��߳��˳� OutputDbgPrint("StopSeqAcq af wait\n"); } // if(Status == capturing) @@ -1220,21 +1220,21 @@ int CMyASICam::OnBinning(MM::PropertyBase* pProp, MM::ActionType eAct) char binF; binF = binSize; - if( !thd_->IsStopped() )//micro manager�������binʱ�����ɳ���ֹͣ�����ã�����property������bin����ֹͣ�����´������Բ�ֹͣʱ�������� + if( !thd_->IsStopped() )//micro manager�������binʱ�����ɳ���ֹͣ�����ã�����property������bin����ֹͣ�����´������Բ�ֹͣʱ�������� return DEVICE_CAMERA_BUSY_ACQUIRING; - /* bin��� ��ʼ��ͳߴ��� ������ֵ���� old Bin/new Bin ���ŵ�*/ + /* bin��� ��ʼ��ͳߴ��� ������ֵ���� old Bin/new Bin ���ŵ�*/ iSetWid = iSetWid*iSetBin/binF;// 2->1, *2 iSetHei = iSetHei*iSetBin/binF;//1->2. *0.5 iSetWid = iSetWid/8*8; iSetHei = iSetHei/2*2; - iSetX = iSetX*iSetBin/binF;//bin�ı��, startpos�������bin��Ļ���ģ�ҲҪ���ձ����ı� + iSetX = iSetX*iSetBin/binF;//bin�ı��, startpos�������bin��Ļ���ģ�ҲҪ���ձ����ı� iSetY = iSetY*iSetBin/binF; if(ASISetROIFormat(ASICameraInfo.CameraID, iSetWid, iSetHei, binF, ImgType) == ASI_SUCCESS) { DeleteImgBuf(); - ASISetStartPos(ASICameraInfo.CameraID, iSetX, iSetY);//�����¼���startx ��starty������ѡ����ͬ�����Ҫ�������� + ASISetStartPos(ASICameraInfo.CameraID, iSetX, iSetY);//�����¼���startx ��starty������ѡ����ͬ�����Ҫ�������� } ASIGetROIFormat(ASICameraInfo.CameraID, &iROIWidth, &iROIHeight, &iBin, &ImgType); iSetBin = binF; @@ -1253,7 +1253,7 @@ int CMyASICam::OnBinning(MM::PropertyBase* pProp, MM::ActionType eAct) */ int CMyASICam::OnPixelType(MM::PropertyBase* pProp, MM::ActionType eAct) { - if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ + if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ { string val; pProp->Get(val); @@ -1295,7 +1295,7 @@ int CMyASICam::OnPixelType(MM::PropertyBase* pProp, MM::ActionType eAct) } - else if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ + else if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ { ASIGetROIFormat(ASICameraInfo.CameraID, &iROIWidth, &iROIHeight, &iBin, &ImgType); @@ -1354,7 +1354,7 @@ int CMyASICam::OnGain(MM::PropertyBase* pProp, MM::ActionType eAct) int CMyASICam::OnSelectCamIndex(MM::PropertyBase* pProp, MM::ActionType eAct) { string str; - if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ + if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ { pProp->Get(str); for(int i = 0; i < iConnectedCamNum; i++) @@ -1368,7 +1368,7 @@ int CMyASICam::OnSelectCamIndex(MM::PropertyBase* pProp, MM::ActionType eAct) } } } - else if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ + else if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ { pProp->Set(sz_ModelIndex); } @@ -1402,12 +1402,12 @@ int CMyASICam::OnBrightness(MM::PropertyBase* pProp,MM::ActionType eAct) { long lVal; ASI_BOOL bAuto; - if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ + if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ { pProp->Get(lVal); ASISetControlValue(ASICameraInfo.CameraID,ASI_BRIGHTNESS, lVal, ASI_FALSE); } - else if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ + else if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ { ASIGetControlValue(ASICameraInfo.CameraID, ASI_BRIGHTNESS, &lVal, &bAuto); pProp->Set(lVal); @@ -1423,12 +1423,12 @@ int CMyASICam::OnUSBTraffic(MM::PropertyBase* pProp, MM::ActionType eAct) { long lVal; ASI_BOOL bAuto; - if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ + if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ { pProp->Get(lVal); ASISetControlValue(ASICameraInfo.CameraID,ASI_BANDWIDTHOVERLOAD, lVal, ASI_FALSE); } - else if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ + else if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ { ASIGetControlValue(ASICameraInfo.CameraID,ASI_BANDWIDTHOVERLOAD, &lVal, &bAuto); pProp->Set(lVal); @@ -1444,7 +1444,7 @@ int CMyASICam::OnUSB_Auto(MM::PropertyBase* pProp, MM::ActionType eAct) { long lVal; ASI_BOOL bAuto; - if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ + if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ { ASIGetControlValue(ASICameraInfo.CameraID,ASI_BANDWIDTHOVERLOAD, &lVal, &bAuto); string strVal; @@ -1453,7 +1453,7 @@ int CMyASICam::OnUSB_Auto(MM::PropertyBase* pProp, MM::ActionType eAct) ASISetControlValue(ASICameraInfo.CameraID,ASI_BANDWIDTHOVERLOAD, lVal, bAuto); // SetPropertyReadOnly(g_Keyword_USBTraffic, bAuto); } - else if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ + else if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ { ASIGetControlValue(ASICameraInfo.CameraID,ASI_BANDWIDTHOVERLOAD, &lVal, &bAuto); pProp->Set(bAuto==ASI_TRUE?g_Keyword_on:g_Keyword_off); @@ -1473,11 +1473,11 @@ int CMyASICam::OnCoolerOn(MM::PropertyBase* pProp, MM::ActionType eAct) { // ASIGetControlValue(iCamIndex, ASI_TARGET_TEMP, &lVal, &bAuto); string strVal; - pProp->Get(strVal);//�ӿؼ��õ�ѡ����ֵ + pProp->Get(strVal);//�ӿؼ��õ�ѡ����ֵ lVal = !strVal.compare(g_Keyword_on); ASISetControlValue(ASICameraInfo.CameraID, ASI_COOLER_ON, lVal, ASI_FALSE); } - else if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ + else if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ { ASIGetControlValue(ASICameraInfo.CameraID, ASI_COOLER_ON, &lVal, &bAuto); pProp->Set(lVal > 0?g_Keyword_on:g_Keyword_off); @@ -1495,11 +1495,11 @@ int CMyASICam::OnHeater(MM::PropertyBase* pProp, MM::ActionType eAct) { // ASIGetControlValue(iCamIndex, ASI_TARGET_TEMP, &lVal, &bAuto); string strVal; - pProp->Get(strVal);//�ӿؼ��õ�ѡ����ֵ + pProp->Get(strVal);//�ӿؼ��õ�ѡ����ֵ lVal = !strVal.compare(g_Keyword_on); ASISetControlValue(ASICameraInfo.CameraID, ASI_ANTI_DEW_HEATER, lVal, ASI_FALSE); } - else if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ + else if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ { ASIGetControlValue(ASICameraInfo.CameraID, ASI_ANTI_DEW_HEATER, &lVal, &bAuto); pProp->Set(lVal > 0?g_Keyword_on:g_Keyword_off); @@ -1516,10 +1516,10 @@ int CMyASICam::OnTargetTemp(MM::PropertyBase* pProp, MM::ActionType eAct) if (eAct == MM::AfterSet) { ASIGetControlValue(ASICameraInfo.CameraID,ASI_TARGET_TEMP, &lVal, &bAuto); - pProp->Get(lVal);//�ӿؼ��õ�ѡ����ֵ->���� + pProp->Get(lVal);//�ӿؼ��õ�ѡ����ֵ->���� ASISetControlValue(ASICameraInfo.CameraID,ASI_TARGET_TEMP, lVal, bAuto); } - else if (eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ + else if (eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ { ASIGetControlValue(ASICameraInfo.CameraID,ASI_TARGET_TEMP, &lVal, &bAuto); pProp->Set(lVal); @@ -1535,10 +1535,10 @@ int CMyASICam::OnCoolerPowerPerc(MM::PropertyBase* pProp, MM::ActionType eAct) ASI_BOOL bAuto; if (eAct == MM::AfterSet) { - pProp->Get(lVal);//�ӿؼ��õ�ѡ����ֵ->���� + pProp->Get(lVal);//�ӿؼ��õ�ѡ����ֵ->���� } - else if (eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ + else if (eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ { ASIGetControlValue(ASICameraInfo.CameraID,ASI_COOLER_POWER_PERC, &lVal, &bAuto); pProp->Set(lVal); @@ -1554,10 +1554,10 @@ int CMyASICam::OnWB_R(MM::PropertyBase* pProp, MM::ActionType eAct) ASI_BOOL bAuto; if (eAct == MM::AfterSet) { - pProp->Get(lVal);//�ӿؼ��õ�ѡ����ֵ->���� + pProp->Get(lVal);//�ӿؼ��õ�ѡ����ֵ->���� ASISetControlValue(ASICameraInfo.CameraID,ASI_WB_R, lVal, ASI_FALSE); } - else if (eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ + else if (eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ { ASIGetControlValue(ASICameraInfo.CameraID,ASI_WB_R, &lVal, &bAuto); pProp->Set(lVal); @@ -1573,10 +1573,10 @@ int CMyASICam::OnWB_B(MM::PropertyBase* pProp, MM::ActionType eAct) ASI_BOOL bAuto; if (eAct == MM::AfterSet) { - pProp->Get(lVal);//�ӿؼ��õ�ѡ����ֵ->���� + pProp->Get(lVal);//�ӿؼ��õ�ѡ����ֵ->���� ASISetControlValue(ASICameraInfo.CameraID,ASI_WB_B, lVal, ASI_FALSE); } - else if (eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ + else if (eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ { ASIGetControlValue(ASICameraInfo.CameraID,ASI_WB_B, &lVal, &bAuto); pProp->Set(lVal); @@ -1594,14 +1594,14 @@ int CMyASICam::OnAutoWB(MM::PropertyBase* pProp, MM::ActionType eAct) if (eAct == MM::AfterSet) { ASIGetControlValue(ASICameraInfo.CameraID,ASI_WB_B, &lVal, &bAuto); - pProp->Get(strVal);//�ӿؼ��õ�ѡ����ֵ->���� + pProp->Get(strVal);//�ӿؼ��õ�ѡ����ֵ->���� bAuto = strVal.compare(g_Keyword_on)?ASI_FALSE:ASI_TRUE; ASISetControlValue(ASICameraInfo.CameraID,ASI_WB_B, lVal, bAuto); // SetPropertyReadOnly(g_Keyword_WB_R,bAuto ); // SetPropertyReadOnly(g_Keyword_WB_B,bAuto ); } - else if (eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ + else if (eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ { ASIGetControlValue(ASICameraInfo.CameraID,ASI_WB_B, &lVal, &bAuto); pProp->Set(bAuto?g_Keyword_on:g_Keyword_off); @@ -1617,13 +1617,13 @@ int CMyASICam::OnGamma(MM::PropertyBase* pProp, MM::ActionType eAct) { long lVal; ASI_BOOL bAuto; - if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ->���� + if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ->���� { pProp->Get(lVal); ASISetControlValue(ASICameraInfo.CameraID,ASI_GAMMA, lVal, ASI_FALSE); } - else if(eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ + else if(eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ { ASIGetControlValue(ASICameraInfo.CameraID,ASI_GAMMA, &lVal, &bAuto); pProp->Set(lVal); @@ -1637,7 +1637,7 @@ int CMyASICam::OnAutoExp(MM::PropertyBase* pProp, MM::ActionType eAct) { long lVal; ASI_BOOL bAuto; - if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ->���� + if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ->���� { ASIGetControlValue(ASICameraInfo.CameraID,ASI_EXPOSURE, &lVal, &bAuto); string strVal; @@ -1645,7 +1645,7 @@ int CMyASICam::OnAutoExp(MM::PropertyBase* pProp, MM::ActionType eAct) bAuto = strVal.compare(g_Keyword_on)?ASI_FALSE:ASI_TRUE; ASISetControlValue(ASICameraInfo.CameraID,ASI_EXPOSURE, lVal, bAuto); } - else if(eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ + else if(eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ { ASIGetControlValue(ASICameraInfo.CameraID,ASI_EXPOSURE, &lVal, &bAuto); pProp->Set(bAuto?g_Keyword_on:g_Keyword_off); @@ -1660,7 +1660,7 @@ int CMyASICam::OnAutoGain(MM::PropertyBase* pProp, MM::ActionType eAct) { long lVal; ASI_BOOL bAuto; - if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ->���� + if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ->���� { ASIGetControlValue(ASICameraInfo.CameraID,ASI_GAIN, &lVal, &bAuto); string strVal; @@ -1668,7 +1668,7 @@ int CMyASICam::OnAutoGain(MM::PropertyBase* pProp, MM::ActionType eAct) bAuto = strVal.compare(g_Keyword_on)?ASI_FALSE:ASI_TRUE; ASISetControlValue(ASICameraInfo.CameraID,ASI_GAIN, lVal, bAuto); } - else if(eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ + else if(eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ { ASIGetControlValue(ASICameraInfo.CameraID,ASI_GAIN, &lVal, &bAuto); pProp->Set(bAuto?g_Keyword_on:g_Keyword_off); @@ -1683,7 +1683,7 @@ int CMyASICam::OnFlip(MM::PropertyBase* pProp, MM::ActionType eAct) { long lVal; ASI_BOOL bAuto; - if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ->���� + if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ->���� { ASIGetControlValue(ASICameraInfo.CameraID, ASI_FLIP, &lVal, &bAuto); string strVal; @@ -1698,7 +1698,7 @@ int CMyASICam::OnFlip(MM::PropertyBase* pProp, MM::ActionType eAct) } } - else if(eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ + else if(eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ { ASIGetControlValue(ASICameraInfo.CameraID,ASI_FLIP, &lVal, &bAuto); pProp->Set(FlipArr[lVal]); @@ -1712,14 +1712,14 @@ int CMyASICam::OnHighSpeedMod(MM::PropertyBase* pProp, MM::ActionType eAct) { long lVal; ASI_BOOL bAuto; - if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ->���� + if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ->���� { string strVal; pProp->Get(strVal); lVal = strVal.compare(g_Keyword_on)?0:1; ASISetControlValue(ASICameraInfo.CameraID,ASI_HIGH_SPEED_MODE, lVal, ASI_FALSE); } - else if(eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ + else if(eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ { ASIGetControlValue(ASICameraInfo.CameraID,ASI_HIGH_SPEED_MODE, &lVal, &bAuto); pProp->Set(lVal?g_Keyword_on:g_Keyword_off); @@ -1733,14 +1733,14 @@ int CMyASICam::OnHardwareBin(MM::PropertyBase* pProp, MM::ActionType eAct) { long lVal; ASI_BOOL bAuto; - if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ->���� + if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ->���� { string strVal; pProp->Get(strVal); lVal = strVal.compare(g_Keyword_on)?0:1; ASISetControlValue(ASICameraInfo.CameraID,ASI_HARDWARE_BIN, lVal, ASI_FALSE); } - else if(eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ + else if(eAct == MM::BeforeGet)//����ֵ->�ؼ���ʾ { ASIGetControlValue(ASICameraInfo.CameraID,ASI_HARDWARE_BIN, &lVal, &bAuto); pProp->Set(lVal?g_Keyword_on:g_Keyword_off); @@ -1850,14 +1850,14 @@ CMyEFW::CMyEFW() : for(int i = 0; i < iConnectedEFWNum; i++) { EFWGetID(i, &EFWInfo.ID); - sprintf(ConnectedEFWName[i], "EFW (ID %d)", EFWInfo.ID);//�������� + sprintf(ConnectedEFWName[i], "EFW (ID %d)", EFWInfo.ID);//�������� EFWIndexValues.push_back(ConnectedEFWName[i]); } - CPropertyAction *pAct = new CPropertyAction (this, &CMyEFW::OnSelectEFWIndex);//ͨ������ѡ��򿪵���� + CPropertyAction *pAct = new CPropertyAction (this, &CMyEFW::OnSelectEFWIndex);//ͨ������ѡ��򿪵���� if(iConnectedEFWNum > 0) { - strcpy(sz_ModelIndex, ConnectedEFWName[0]);//Ĭ�ϴ򿪵�һ�� + strcpy(sz_ModelIndex, ConnectedEFWName[0]);//Ĭ�ϴ򿪵�һ�� //iCamIndex = 0; EFWGetID(0, &EFWInfo.ID); } @@ -1866,7 +1866,7 @@ CMyEFW::CMyEFW() : strcpy(sz_ModelIndex,"no EFW connected"); } // strcpy(sz_ModelIndex, "DropDown"); - ret = CreateProperty(g_DeviceIndex, sz_ModelIndex, MM::String, false, pAct, true); //ѡ������ͷ��� + ret = CreateProperty(g_DeviceIndex, sz_ModelIndex, MM::String, false, pAct, true); //ѡ������ͷ��� SetAllowedValues(g_DeviceIndex, EFWIndexValues); assert(ret == DEVICE_OK); } @@ -1942,7 +1942,7 @@ int CMyEFW::Initialize() return DEVICE_OK; } -bool CMyEFW::Busy()//����trueʱ��ˢ��label��state +bool CMyEFW::Busy()//����trueʱ��ˢ��label��state { if(bPosWait)// { @@ -1983,9 +1983,9 @@ int CMyEFW::Shutdown() // Action handlers /////////////////////////////////////////////////////////////////////////////// -int CMyEFW::OnState(MM::PropertyBase* pProp, MM::ActionType eAct)//CStateDeviceBase::OnLabel ��������� +int CMyEFW::OnState(MM::PropertyBase* pProp, MM::ActionType eAct)//CStateDeviceBase::OnLabel ��������� { - if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ + if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ { int pos; EFWGetPosition(EFWInfo.ID, &pos); @@ -1998,7 +1998,7 @@ int CMyEFW::Shutdown() } // nothing to do, let the caller to use cached property } - else if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ->���� + else if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ->���� { // Set timer for the Busy signal // changedTime_ = GetCurrentMMTime(); @@ -2024,7 +2024,7 @@ int CMyEFW::Shutdown() int CMyEFW::OnSelectEFWIndex(MM::PropertyBase* pProp, MM::ActionType eAct) { string str; - if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ + if (eAct == MM::AfterSet)//�ӿؼ��õ�ѡ����ֵ { pProp->Get(str); for(int i = 0; i < iConnectedEFWNum; i++) @@ -2038,7 +2038,7 @@ int CMyEFW::OnSelectEFWIndex(MM::PropertyBase* pProp, MM::ActionType eAct) } } } - else if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ + else if (eAct == MM::BeforeGet)//ֵ���ؼ���ʾ { pProp->Set(sz_ModelIndex); } diff --git a/DeviceAdapters/ZWO/MyASICam2.h b/DeviceAdapters/ZWO/MyASICam2.h index b0b466df4..2fad61eda 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(); @@ -99,10 +99,10 @@ class CMyASICam:public CCameraBase unsigned long iBufSize; - int iPixBytes;//ÿ�������ֽ��� + int iPixBytes;//ÿ�������ֽ��� int iComponents; - int iROIWidth, iROIHeight, iBin;//sensor������ߴ���Ϣ - int iSetWid, iSetHei, iSetBin, iSetX, iSetY; //Ҫ���õ�����ߴ���Ϣ + int iROIWidth, iROIHeight, iBin;//sensor������ߴ���Ϣ + int iSetWid, iSetHei, iSetBin, iSetX, iSetY; //Ҫ���õ�����ߴ���Ϣ ASI_IMG_TYPE ImgType; friend class SequenceThread; @@ -111,7 +111,7 @@ class CMyASICam:public CCameraBase ASI_CAMERA_INFO ASICameraInfo; int iCtrlNum; ASI_FLIP_STATUS ImgFlip; - int ImgStartX, ImgStartY, ImgBin, ImgWid, ImgHei;//����ʾͼ�������ߴ���Ϣ + int ImgStartX, ImgStartY, ImgBin, ImgWid, ImgHei;//����ʾͼ�������ߴ���Ϣ // int iCamIndex; @@ -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 \ No newline at end of file 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 fc3d80c68..edf27f91b 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 d6a7db5e0..63cc47178 100644 --- a/MMDevice/MMDevice.h +++ b/MMDevice/MMDevice.h @@ -28,7 +28,7 @@ // Header version // If any of the class definitions changes, the interface version // must be incremented -#define DEVICE_INTERFACE_VERSION 71 +#define DEVICE_INTERFACE_VERSION 72 /////////////////////////////////////////////////////////////////////////////// // N.B. @@ -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