Skip to content

MMDevice: remove 3 Camera functions (bumps DIV) #860

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

Open
marktsuchida wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −27
Open

MMDevice: remove 3 Camera functions (bumps DIV) #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 0 additions & 15 deletions MMDevice/DeviceBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,23 +1422,11 @@ class CCameraBase : public CDeviceBase<MM::Camera, U>
*/
virtual int StopSequenceAcquisition() = 0;

// It appears that this function was never used by MMCore and is slated for
// removal. Concrete cameras should not override.
double GetPixelSizeUm() const final { return 0.0; }

virtual unsigned GetNumberOfComponents() const
{
return 1; // Default to monochrome (ie not RGB)
}

// To be removed (never used by MMCore); devices should not override.
virtual int GetComponentName(unsigned channel, char* name) final
{
(void)channel;
CDeviceUtils::CopyLimitedString(name, "");
return DEVICE_OK;
}

/**
* @brief Return the number of channels.
*
Expand Down Expand Up @@ -1494,9 +1482,6 @@ class CCameraBase : public CDeviceBase<MM::Camera, U>
CDeviceUtils::CopyLimitedString(serializedMetadata, md.Serialize());
}

// To be removed; devices should no longer override.
virtual int PrepareSequenceAcqusition() final {return DEVICE_OK;}

/**
* @brief Start sequence acquisition.
*/
Expand Down
13 changes: 1 addition & 12 deletions MMDevice/MMDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
// Header version
// If any of the class definitions changes, the interface version
// must be incremented
#define DEVICE_INTERFACE_VERSION 74
#define DEVICE_INTERFACE_VERSION 75
///////////////////////////////////////////////////////////////////////////////

// N.B.
Expand Down Expand Up @@ -373,9 +373,6 @@ namespace MM {
*/
virtual unsigned GetNumberOfComponents() const = 0;

/** Unused; to be removed. */
virtual int GetComponentName(unsigned component, char* name) = 0;

/**
* @brief Return the number of simultaneous channels that camera is capable of.
*
Expand Down Expand Up @@ -422,10 +419,6 @@ namespace MM {
* Required by the MM::Camera API.
*/
virtual unsigned GetBitDepth() const = 0;
/**
* @brief Unused and slated for removal. Implemented in DeviceBase.h.
*/
virtual double GetPixelSizeUm() const = 0;
/**
* @brief Return the current binning factor.
*/
Expand Down Expand Up @@ -488,10 +481,6 @@ namespace MM {
* @brief Stop an ongoing sequence acquisition.
*/
virtual int StopSequenceAcquisition() = 0;
/**
* @brief Set up the camera so that Sequence acquisition can start without delay.
*/
virtual int PrepareSequenceAcqusition() = 0;
/**
* @brief Indicate whether sequence acquisition is currently running.
*
Expand Down
Loading