Split MMDevice/ImgBuffer.h to make separate version for Core

MMDevice/ImgBuffer.{h,cpp} contained ImgBuffer, used as a utility class
in some device adapters, and FrameBuffer, only used by the Core
CircularBuffer.

Delete FrameBuffer from MMDevice, and replace CircularBuffer's usage
with a duplicated mm::ImgBuffer and mm::FrameBuffer, so that the Core
implementation is no longer tied to the MMDevice interface.

git-svn-id: https://valelab.ucsf.edu/svn/micromanager2/trunk@16281 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd

Author: mark

MMCore/CircularBuffer.cpp

@@ -152,7 +152,7 @@ bool CircularBuffer::InsertMultiChannel(const unsigned char* pixArray, unsigned
 {
    MMThreadGuard guard(g_insertLock);
 
-   ImgBuffer* pImg;
+   mm::ImgBuffer* pImg;
    unsigned long singleChannelSize = (unsigned long)width * height * byteDepth;
 
    {
@@ -241,23 +241,23 @@ bool CircularBuffer::InsertMultiChannel(const unsigned char* pixArray, unsigned
 
 const unsigned char* CircularBuffer::GetTopImage() const
 {
-   ImgBuffer* img = GetNthFromTopImageBuffer(0, 0, 0);
+   const mm::ImgBuffer* img = GetNthFromTopImageBuffer(0, 0, 0);
    if (!img)
       return 0;
    return img->GetPixels();
 }
 
-const ImgBuffer* CircularBuffer::GetTopImageBuffer(unsigned channel, unsigned slice) const
+const mm::ImgBuffer* CircularBuffer::GetTopImageBuffer(unsigned channel, unsigned slice) const
 {
    return GetNthFromTopImageBuffer(0, channel, slice);
 }
 
-const ImgBuffer* CircularBuffer::GetNthFromTopImageBuffer(unsigned long n) const
+const mm::ImgBuffer* CircularBuffer::GetNthFromTopImageBuffer(unsigned long n) const
 {
    return GetNthFromTopImageBuffer(static_cast<long>(n), 0, 0);
 }
 
-const ImgBuffer* CircularBuffer::GetNthFromTopImageBuffer(long n,
+const mm::ImgBuffer* CircularBuffer::GetNthFromTopImageBuffer(long n,
       unsigned channel, unsigned slice) const
 {
    MMThreadGuard guard(g_bufferLock);
@@ -276,13 +276,13 @@ const ImgBuffer* CircularBuffer::GetNthFromTopImageBuffer(long n,
 
 const unsigned char* CircularBuffer::GetNextImage()
 {
-   ImgBuffer* img = GetNextImageBuffer(0, 0);
+   const mm::ImgBuffer* img = GetNextImageBuffer(0, 0);
    if (!img)
       return 0;
-   return img.GetPixels();
+   return img->GetPixels();
 }
 
-const ImgBuffer* CircularBuffer::GetNextImageBuffer(unsigned channel, unsigned slice)
+const mm::ImgBuffer* CircularBuffer::GetNextImageBuffer(unsigned channel, unsigned slice)
 {
    MMThreadGuard guard(g_bufferLock);
 

MMCore/CircularBuffer.h

@@ -26,7 +26,7 @@
 #define _CIRCULAR_BUFFER_
 
 #include <vector>
-#include "../MMDevice/ImgBuffer.h"
+#include "FrameBuffer.h"
 #include "../MMDevice/MMDevice.h"
 #include "ErrorCodes.h"
 #include "Error.h"
@@ -64,10 +64,10 @@ class CircularBuffer
    bool InsertMultiChannel(const unsigned char* pixArray, unsigned int numChannels, unsigned int width, unsigned int height, unsigned int byteDepth, const Metadata* pMd) throw (CMMError);
    const unsigned char* GetTopImage() const;
    const unsigned char* GetNextImage();
-   const ImgBuffer* GetTopImageBuffer(unsigned channel, unsigned slice) const;
-   const ImgBuffer* GetNthFromTopImageBuffer(unsigned long n) const;
-   const ImgBuffer* GetNthFromTopImageBuffer(long n, unsigned channel, unsigned slice) const;
-   const ImgBuffer* GetNextImageBuffer(unsigned channel, unsigned slice);
+   const mm::ImgBuffer* GetTopImageBuffer(unsigned channel, unsigned slice) const;
+   const mm::ImgBuffer* GetNthFromTopImageBuffer(unsigned long n) const;
+   const mm::ImgBuffer* GetNthFromTopImageBuffer(long n, unsigned channel, unsigned slice) const;
+   const mm::ImgBuffer* GetNextImageBuffer(unsigned channel, unsigned slice);
    void Clear() {MMThreadGuard guard(g_bufferLock); insertIndex_=0; saveIndex_=0; overflow_ = false;}
 
    bool Overflow() {MMThreadGuard guard(g_bufferLock); return overflow_;}
@@ -89,7 +89,7 @@ class CircularBuffer
    unsigned int numChannels_;
    unsigned int numSlices_;
    bool overflow_;
-   std::vector<FrameBuffer> frameArray_;
+   std::vector<mm::FrameBuffer> frameArray_;
 };
 
 

MMCore/CoreCallback.cpp

@@ -27,6 +27,7 @@
 
 #include "../MMDevice/DeviceThreads.h"
 #include "../MMDevice/DeviceUtils.h"
+#include "../MMDevice/ImgBuffer.h"
 #include "CircularBuffer.h"
 #include "CoreCallback.h"
 #include "DeviceManager.h"

MMCore/CoreCallback.h

@@ -85,7 +85,7 @@ class CoreCallback : public MM::Core
    void Sleep(const MM::Device* caller, double intervalMs);
 
    // continous acquisition support
-   int InsertImage(const MM::Device* caller, const ImgBuffer& imgBuf);
+   int InsertImage(const MM::Device* caller, const ImgBuffer& imgBuf); // Note: _not_ mm::ImgBuffer
    int InsertImage(const MM::Device* caller, const unsigned char* buf, unsigned width, unsigned height, unsigned byteDepth, const char* serializedMetadata, const bool doProcess = true);
 
    /*Deprecated*/ int InsertImage(const MM::Device* caller, const unsigned char* buf, unsigned width, unsigned height, unsigned byteDepth, const Metadata* pMd = 0, const bool doProcess = true);