From f15490012fa1bd748ea49e430518e81dde5df8c7 Mon Sep 17 00:00:00 2001 From: Lars Kool Date: Mon, 1 Jul 2024 09:58:37 +0200 Subject: [PATCH] Cleaned up files --- MMCore/MMCore.cpp | 2 +- MMCore/MMCore.h | 1 - MMDevice/MMDevice.h | 160 -------------------------------------------- 3 files changed, 1 insertion(+), 162 deletions(-) diff --git a/MMCore/MMCore.cpp b/MMCore/MMCore.cpp index 2098be6fc..b7f696a11 100644 --- a/MMCore/MMCore.cpp +++ b/MMCore/MMCore.cpp @@ -179,7 +179,6 @@ CMMCore::~CMMCore() delete properties_; delete cbuf_; delete pixelSizeGroup_; - delete pixelSizeGroup_; delete pPostedErrorsLock_; LOG_INFO(coreLogger_) << "Core session ended"; @@ -1904,6 +1903,7 @@ void CMMCore::setAdapterOriginXY(double newXUm, double newYUm) throw (CMMError) * The returned value is determined by the most recent call to * setFocusDirection() for the stage, or defaults to what the stage device * adapter declares (often 0, for unknown). + * adapter declares (often 0, for unknown). * * An exception is thrown if the direction has not been set and the device * encounters an error when determining the default direction. diff --git a/MMCore/MMCore.h b/MMCore/MMCore.h index e453e5842..759fda0be 100644 --- a/MMCore/MMCore.h +++ b/MMCore/MMCore.h @@ -89,7 +89,6 @@ class CPluginManager; class CircularBuffer; -class CircularBuffer; class ConfigGroupCollection; class CoreCallback; class CorePropertyCollection; diff --git a/MMDevice/MMDevice.h b/MMDevice/MMDevice.h index 4d12a85f2..3615802f1 100644 --- a/MMDevice/MMDevice.h +++ b/MMDevice/MMDevice.h @@ -1251,166 +1251,6 @@ namespace MM { virtual int GetChannel(char* channelName) = 0; }; - /** - * Pump API - */ - class Pump : public Device - { - public: - Pump() {} - virtual ~Pump() {} - - // MMDevice API - virtual DeviceType GetType() const { return Type; } - static const DeviceType Type; - - /** - * Homes the pump. - */ - virtual int Home() = 0; - - /** - * Stops the pump. The implementation should halt any dispensing/withdrawal, - * and make the pump available again (make Busy() return false). - */ - virtual int Stop() = 0; - - /** - * Dispenses until volume is zero, or stopped - */ - virtual int Dispense() = 0; - - /** - * Dispenses/withdraws for the provided time, with the flowrate provided - * by GetFlowrate_uLperMin - * Dispensing for an undetermined amount of time can be done with DBL_MAX - * During the dispensing/withdrawal, Busy() should return "true". - * - * Required by MMPump API. - */ - virtual int DispenseDuration(double durSec) = 0; - - /** - * Dispenses/withdraws the provided volume. - * - * The implementation should cause positive volumes to be dispensed, whereas - * negative volumes should be withdrawn. The implementation should prevent - * the volume to go negative (i.e. stop the pump once the syringe is empty), - * or to go over the maximum volume (i.e. stop the pump once it is full). - * This automatically allows for dispensing/withdrawal for an undetermined - * amount of time by providing DBL_MAX for dispense, and DBL_MIN for - * withdraw. - * - * During the dispensing/withdrawal, Busy() should return "true". - * - * Required by MMPump API. - */ - virtual int DispenseVolume(double volUl) = 0; - - /** - * Gets the maximum volume of the pump in microliters (uL). - * - * Required by MMPump API. - */ - virtual int GetMaxVolumeUl(double& volUl) = 0; - - /** - * Sets the maximum volume of the pump in microliters (uL). - * - * Required by MMPump API. - */ - virtual int SetMaxVolumeUl(double volUl) = 0; - - /** - * Gets the current volume of the pump in microliters (uL). - * - * Required by MMPump API. - */ - virtual int GetVolumeUl(double& volUl) = 0; - - /** - * Sets the current volume of the pump in microliters (uL). - * - * Required by MMPump API. - */ - virtual int SetVolumeUl(double volUl) = 0; - - /** - * Sets the direction of the pump. Certain pump - * (e.g. peristaltic and DC pumps) don't have an apriori forward-reverse direction, - * as it depends on how it is connected. This function allows you to switch - * forward and reverse. - * - * The implementation of this function should allow two values, [1] and [-1], - * and should ignore all other values, where [1] indicates that the direction - * is left as-is, and [-1] indicates that the direction should be reversed. - * When the pump is uni-directional, the function should always assign [1] to - * [direction] - * - * Required by MMPump API. - */ - virtual int IsDirectionInverted(bool& inverted) = 0; - - /** - * Sets the direction of the pump. Certain pump - * (e.g. peristaltic and DC pumps) don't have an apriori forward-reverse direction, - * as it depends on how it is connected. This function allows you to switch - * forward and reverse. - * - * The implementation of this function should allow two values, 1 and -1, - * and should ignore all other values, where 1 indicates that the direction - * is left as-is, and -1 indicates that the direction should be reversed. If - * the pump is uni-directional, this function does not need to be - * implemented. - * - * Required by MMPump API. - */ - virtual int InvertDirection(bool inverted) = 0; - - /** - * Gets the flowrate in microliter (uL) per second. - * - * Required by MMPump API. - */ - virtual int GetFlowrateUlPerSecond(double& flowrate) = 0; - - /** - * Sets the flowrate in microliter (uL) per second. The implementation - * should convert the provided flowrate to whichever unit the pump desires - * (steps/s, mL/h, V). - * - * Required by MMPump API. - */ - virtual int SetFlowrateUlPerSecond(double flowrate) = 0; - - /** - * Calibrates the pressure controller. Might not be supported, if so - * either return DEVICE_UNSUPPORTED_COMMAND, or DEVICE_OK, depending - * on the desired behavior - * - * Required by MMPump API. - */ - virtual int Calibrate() = 0; - - /** - * Sets the pressure of the pressure controller. The provided value will - * be in kPa. The implementation should convert the unit from kPa to the - * desired unit by the device. - * - * Required by MMPump API. - */ - virtual int SetPressure(double pressure) = 0; - - /** - * Gets the pressure of the pressure controller. The returned value - * has to be in kPa. The implementation, therefore, should convert the - * value provided by the pressure controller to kPa. - * - * Required by MMPump API. - */ - virtual int GetPressure(double& pressure) = 0; - }; - /** * HUB device. Used for complex uber-device functionality in microscope stands * and managing auto-configuration (discovery) of other devices