Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix PrepareSequenceAcqusition typo #453

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+160 −160
Open

fix PrepareSequenceAcqusition typo #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8602de6
fix typo
tlambert03 Mar 23, 2024
421ec4d
bump dev version
tlambert03 Mar 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DeviceAdapters/AmScope/AmScope.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/AmScope/AmScope.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class AmScope : public CCameraBase<AmScope>
int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize);
int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize);
int ClearROI();
//int PrepareSequenceAcqusition();
//int PrepareSequenceAcquisition();
int StartSequenceAcquisition(double interval);
int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
int StopSequenceAcquisition();
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Andor/Andor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class AndorCamera : public CCameraBase<AndorCamera>
void ResizeSRRFImage(long radiality);

// high-speed interface
int PrepareSequenceAcqusition()
int PrepareSequenceAcquisition()
{
return DEVICE_OK;
}
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/AndorSDK3/AndorSDK3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class CAndorSDK3Camera : public CCameraBase<CAndorSDK3Camera>
int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize);
int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize);
int ClearROI();
int PrepareSequenceAcqusition() {return DEVICE_OK;}
int PrepareSequenceAcquisition() {return DEVICE_OK;}
int StartSequenceAcquisition(double interval);
int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
int StopSequenceAcquisition();
Expand Down
4 changes: 2 additions & 2 deletions DeviceAdapters/ArduinoCounter/ArduinoCounter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ int ArduinoCounterCamera::ClearROI()
return DEVICE_OK;
}

int ArduinoCounterCamera::PrepareSequenceAcqusition()
int ArduinoCounterCamera::PrepareSequenceAcquisition()
{
if (nrCamerasInUse_ < 1)
return ERR_NO_PHYSICAL_CAMERA;
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/ArduinoCounter/ArduinoCounter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class ArduinoCounterCamera : public CCameraBase<ArduinoCounterCamera>
int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize);
int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize);
int ClearROI();
int PrepareSequenceAcqusition();
int PrepareSequenceAcquisition();
int StartSequenceAcquisition(double interval);
int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
int StopSequenceAcquisition();
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Atik/Atik.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Atik/Atik.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class Atik : public CCameraBase<Atik>
int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize);
int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize);
int ClearROI();
int PrepareSequenceAcqusition();
int PrepareSequenceAcquisition();
int StartSequenceAcquisition(double interval);
int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
int StopSequenceAcquisition();
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Basler/BaslerPylonCamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1237,7 +1237,7 @@ int BaslerCamera::StopSequenceAcquisition()
return DEVICE_OK;
}

int BaslerCamera::PrepareSequenceAcqusition()
int BaslerCamera::PrepareSequenceAcquisition()
{
// nothing to prepare
return DEVICE_OK;
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Basler/BaslerPylonCamera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class BaslerCamera : public CCameraBase<BaslerCamera> {
int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
int StartSequenceAcquisition(double interval_ms);
int StopSequenceAcquisition();
int PrepareSequenceAcqusition();
int PrepareSequenceAcquisition();

/**
* Flag to indicate whether Sequence Acquisition is currently running.
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/DemoCamera/DemoCamera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ class CDemoCamera : public CCameraBase<CDemoCamera>
unsigned numROIs);
int GetMultiROI(unsigned* xs, unsigned* ys, unsigned* widths,
unsigned* heights, unsigned* length);
int PrepareSequenceAcqusition() { return DEVICE_OK; }
int PrepareSequenceAcquisition() { return DEVICE_OK; }
int StartSequenceAcquisition(double interval);
int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
int StopSequenceAcquisition();
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/FLICamera/FLICamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ int CFLICamera::OnExposure(MM::PropertyBase* pProp, MM::ActionType eAct)
return ret;
}

int CFLICamera::PrepareSequenceAcqusition()
int CFLICamera::PrepareSequenceAcquisition()
{
return DEVICE_OK;
}
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/FLICamera/FLICamera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class CFLICamera : public CCameraBase<CFLICamera>
int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize);
int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize);
int ClearROI();
int PrepareSequenceAcqusition();
int PrepareSequenceAcquisition();
double GetNominalPixelSizeUm() const;
double GetPixelSizeUm() const;
int GetBinning() const;
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/GigECamera/GigECamera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ class CGigECamera : public CCameraBase<CGigECamera>
int ClearROI();

// sequence-acquisition-related functions
int PrepareSequenceAcqusition() { return DEVICE_OK; }
int PrepareSequenceAcquisition() { return DEVICE_OK; }
int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
int StopSequenceAcquisition();
bool IsCapturing();
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/IDSPeak/IDSPeak.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class CIDSPeak : public CCameraBase<CIDSPeak>
unsigned numROIs);
int GetMultiROI(unsigned* xs, unsigned* ys, unsigned* widths,
unsigned* heights, unsigned* length);
int PrepareSequenceAcqusition() { return DEVICE_OK; }
int PrepareSequenceAcquisition() { return DEVICE_OK; }
int StartSequenceAcquisition(double interval);
int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
int StopSequenceAcquisition();
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/IDS_uEye/IDS_uEye.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ class CIDS_uEye : public CCameraBase<CIDS_uEye>
int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize);
int ClearROI();

int PrepareSequenceAcqusition()
int PrepareSequenceAcquisition()
{
return DEVICE_OK;
}
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/JAI/JAI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ int JAICamera::ClearROI()
return ResizeImageBuffer();
}

int JAICamera::PrepareSequenceAcqusition()
int JAICamera::PrepareSequenceAcquisition()
{
if (IsCapturing())
{
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/JAI/JAI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class JAICamera : public CCameraBase<JAICamera>

// overrides the same in the base class
int InsertImage();
int PrepareSequenceAcqusition();
int PrepareSequenceAcquisition();
int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
int StartSequenceAcquisition(double interval);
int StopSequenceAcquisition();
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Lumenera/LumeneraCamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1277,7 +1277,7 @@ int LumeneraCamera::StopSequenceAcquisition()
return DEVICE_OK;
}

int LumeneraCamera::PrepareSequenceAcqusition()
int LumeneraCamera::PrepareSequenceAcquisition()
{
// nothing to prepare
return DEVICE_OK;
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Lumenera/LumeneraCamera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class LumeneraCamera : public CCameraBase<LumeneraCamera> {
int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
int StartSequenceAcquisition(double interval_ms);
int StopSequenceAcquisition();
int PrepareSequenceAcqusition();
int PrepareSequenceAcquisition();
bool IsCapturing();


Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/MatrixVision/mvIMPACT_Acquire_Device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class mvIMPACT_Acquire_Device : public CCameraBase<mvIMPACT_Acquire_Device>
return SetProperty( MM::g_Keyword_Binning, CDeviceUtils::ConvertToString( binSize ) );
}

virtual int PrepareSequenceAcqusition( void )
virtual int PrepareSequenceAcquisition( void )
{
return DEVICE_OK;
}
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class CMightex_BUF_USBCCDCamera : public CCameraBase<CMightex_BUF_USBCCDCamera>
int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize);
int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize);
int ClearROI();
int PrepareSequenceAcqusition()
int PrepareSequenceAcquisition()
{
return DEVICE_OK;
}
Expand Down
6 changes: 3 additions & 3 deletions DeviceAdapters/Motic/MoticCamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Motic/MoticCamera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class CMoticCamera : public CCameraBase<CMoticCamera>
int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize);
int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize);
int ClearROI();
int PrepareSequenceAcqusition();
int PrepareSequenceAcquisition();
//int StartSequenceAcquisition(double interval);
// int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
// int StopSequenceAcquisition();
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/OpenCVgrabber/OpenCVgrabber.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class COpenCVgrabber : public CCameraBase<COpenCVgrabber>
int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize);
int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize);
int ClearROI();
int PrepareSequenceAcqusition()
int PrepareSequenceAcquisition()
{
return DEVICE_OK;
}
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/PCO_Generic/MicroManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2182,7 +2182,7 @@ int CPCOCam::ResizeImageBuffer()
return DEVICE_OK;
}

int CPCOCam::PrepareSequenceAcqusition()
int CPCOCam::PrepareSequenceAcquisition()
{
return DEVICE_OK;
}
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/PCO_Generic/MicroManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class CPCOCam : public CCameraBase<CPCOCam>
int SetROI(unsigned uX, unsigned uY, unsigned uXSize, unsigned uYSize);
int GetROI(unsigned& uX, unsigned& uY, unsigned& uXSize, unsigned& uYSize);
int ClearROI();
int PrepareSequenceAcqusition();
int PrepareSequenceAcquisition();
int StartSequenceAcquisition(long numImages, double /*interval_ms*/, bool stopOnOverflow);
int StopSequenceAcquisition();
int StoppedByThread();
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/PICAM/PICAMAdapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ class Universal : public CCameraBase<Universal>
#ifndef linux
// micromanager calls the "live" acquisition a "sequence"
// don't get this confused with a PICAM sequence acquisition, it's actually circular buffer mode
int PrepareSequenceAcqusition();
int PrepareSequenceAcquisition();
int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
int StopSequenceAcquisition();
#endif
Expand Down
6 changes: 3 additions & 3 deletions DeviceAdapters/PICAM/PICAMUniversal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
{
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/PVCAM/PVCAMAdapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ class Universal : public CCameraBase<Universal>
/**
* Micro-manager calls the "live" acquisition a "sequence". PVCAM calls this "continuous - circular buffer" mode.
*/
int PrepareSequenceAcqusition();
int PrepareSequenceAcquisition();
int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
int StopSequenceAcquisition();

Expand Down
6 changes: 3 additions & 3 deletions DeviceAdapters/PVCAM/PVCAMUniversal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Pixelink/Pixelink.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class Pixelink : public CCameraBase<Pixelink>
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();
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/PointGrey/PointGrey.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class PointGrey : public CCameraBase<PointGrey>
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();
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/PrincetonInstruments/PVCAMInt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ class Universal : public CCameraBase<Universal>
int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow);
int StopSequenceAcquisition();
// temporary debug methods
int PrepareSequenceAcqusition();
int PrepareSequenceAcquisition();
#endif

// action interface
Expand Down
4 changes: 2 additions & 2 deletions DeviceAdapters/PrincetonInstruments/PVCAMUniversal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1964,7 +1964,7 @@ int Universal::ThreadRun(void)
return ret;
}

int Universal::PrepareSequenceAcqusition()
int Universal::PrepareSequenceAcquisition()
{
if (IsCapturing())
return ERR_BUSY_ACQUIRING;
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/RaptorEPIX/RaptorEPIX.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ class CRaptorEPIX : public CCameraBase<CRaptorEPIX>
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;
}
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/SigmaKoki/Camera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class Camera : public CCameraBase<Camera>, 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();
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Spinnaker/SpinnakerCamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1532,7 +1532,7 @@ int SpinnakerCamera::allocateImageBuffer(const std::size_t size, const SPKR::Pix
}


int SpinnakerCamera::PrepareSequenceAcqusition()
int SpinnakerCamera::PrepareSequenceAcquisition()
{
return DEVICE_OK;
}
Expand Down
Loading