added memeber functions to MCI3DT

core/image/MultiChannelImage3DT.h

@@ -30,19 +30,19 @@ protected:
   /** image data, use carefully !!! data[channel][pixel_offset] */
   std::vector<P*> data;
 //    P **data;
-  
+
   /** image width */
   int xsize;
-  
+
   /** image height */
   int ysize;
 
   /** image depth */
   int zsize;
-  
+
   /** number of image channels */
   uint numChannels;
-  
+
 public:
 
   virtual inline int width() const;
@@ -95,20 +95,24 @@ public:
 
   void addChannel( int newChans = 1 );
 
+  /** add a channel to Image */
+  template<class SrcP>
+  void addChannel(const NICE::ImageT<SrcP> &newImg );
+  
   /** add a channel to Multichannel Image */
   template<class SrcP>
   void addChannel(const NICE::MultiChannelImageT<SrcP> &newImg );
-  
+
   template<class SrcP>
   void addChannel(const NICE::MultiChannelImage3DT<SrcP> &newImg);
 
   /** add channels only as references (no deep memory copy) */
   template<class SrcP>
   void addChannelReferences(const NICE::MultiChannelImage3DT<SrcP> &newImg);
-  
+
   /** get value */
   P get( int x, int y, int z, uint channel = 0 ) const;
-  
+
   /** get data pointer */
   std::vector<P*> getDataPointer() const;
   //P** getDataPointer();
@@ -124,14 +128,14 @@ public:
 
   /** calc integral image */
   void calcIntegral( uint channel = 0 );
-  
-  /** 
+
+  /**
    * @brief calculate the variance image map of a channel
    * @param srcchan source channel with raw data
    * @param tarchan target channel for the variance map
    */
   void calcVariance( uint srcchan = 0, uint tarchan = 1 );
-  
+
   /**
    * @brief calculate the integral value in the volume given by upper left front corner and lower right back corner, including out of boundary check
    * @warning make sure that the given channel is an integral 3d image
@@ -161,6 +165,9 @@ public:
   /** return x-slice as image */
   ImageT<P> getXSlice ( int x, uint channel = 0 ) const;
 
+  /** return rgb image (reading channels 0, 1, 2) as MultiChannelImageT */
+  MultiChannelImageT<P> getColorMCI(int z) const;
+
   /** return rgb image (reading channels 0, 1, 2) for visualization */
   ColorImage getColor(int z) const;
 
@@ -177,19 +184,19 @@ public:
 
   /** do a histogram equalization */
   void equalizeHistogram( uint channel = 0 ) const;
-  
+
   /** dump all data to RAW format: xsize, ysize, numChannels, <data> */
   void store( std::string filename ) const;
 
   /** read all data from RAW format: xsize, ysize, numChannels, <data> */
   void restore( std::string filename );
-  
+
   /** copy alls data to new object */
   MultiChannelImage3DT<P>& operator=( const MultiChannelImage3DT<P>& orig );
-  
+
   /** element operator */
   P & operator() (int x, int y, int z, uint channel = 0);
-  
+
   /** element operator */
   MultiChannelImageT<P> operator[] (uint c);
 };

core/image/MultiChannelImage3DT.tcc

@@ -50,7 +50,7 @@ MultiChannelImageT<P> MultiChannelImage3DT<P>::operator[] (uint z)
 }
 
 template<class P>
-MultiChannelImage3DT<P>& MultiChannelImage3DT<P>::operator=(const MultiChannelImage3DT<P>& orig) 
+MultiChannelImage3DT<P>& MultiChannelImage3DT<P>::operator=(const MultiChannelImage3DT<P>& orig)
 {
   if(  xsize == orig.xsize
      && ysize == orig.ysize
@@ -80,7 +80,7 @@ MultiChannelImage3DT<P>& MultiChannelImage3DT<P>::operator=(const MultiChannelIm
         data.push_back( t_newData );
     }
   }
-  
+
   return *this;
 }
 
@@ -138,41 +138,26 @@ void MultiChannelImage3DT<P>::addChannel( int newChans )
     }
 
     numChannels = this->data.size();
-/* old and ugly:
-   P **tmpData = new P *[numChannels+newChans];
-
-  bool allocMem = false;
-  int i = 0;
-
-  for ( ; i < (int)numChannels; i++ )
-  {
-    tmpData[i] = data[i];
-
-    if ( data[i] != NULL )
-      allocMem = true;
-  }
+}
 
-  if ( allocMem )
-  {
-    for ( ; i < newChans + (int)numChannels; i++ )
+template<class P>
+template<class SrcP>
+void MultiChannelImage3DT<P>::addChannel( const NICE::ImageT<SrcP> &newImg )
+{
+    int oldchan = numChannels;
+    if(this->xsize > 0)
     {
-      tmpData[i] = new P [xsize*ysize*zsize];
+        assert(newImg.width() == this->width() && newImg.height() == this->height());
+        addChannel(1);
     }
-  }
-
-  numChannels += newChans;
-
-  delete [] data;
-
-  data = new P *[numChannels];
-
-  for ( i = 0; i < (int)numChannels; i++ )
-  {
-    data[i] = tmpData[i];
-  }
-
-  delete [] tmpData;
-  */
+    else
+    {
+        reInit( newImg.width(), newImg.height(), 1, 1 );
+    }
+    
+    for ( int y = 0; y < ysize; y++ )
+        for ( int x = 0; x < ysize; x++ )
+            data[oldchan][x + y*xsize] = (P) newImg.getPixelQuick(x,y);
 }
 
 template<class P>
@@ -190,7 +175,7 @@ void MultiChannelImage3DT<P>::addChannel(const NICE::MultiChannelImageT<SrcP> &n
   {
     reInit( newMCImg.width(), newMCImg.height(), newMCImg.channels(), 1 );
   }
-  
+
   for(int z = 0; z < this->zsize; z++)
   {
     //NICE::ImageT<SrcP> newImg = newMCImg[z];
@@ -219,9 +204,9 @@ void MultiChannelImage3DT<P>::addChannel(const NICE::MultiChannelImage3DT<SrcP>
   {
       reInit( newImg.width(), newImg.height(), newImg.depth(), newImg.channels() );
   }
-  
+
   int chanNI = 0;
-  
+
   for(int c = oldchan; c < (int)numChannels; c++, chanNI++)
   {
     int val = 0;
@@ -565,7 +550,27 @@ void MultiChannelImage3DT<P>::convertToColor( NICE::ColorImage & img, int z, con
 }
 
 template<class P>
-ColorImage MultiChannelImage3DT<P>::getColor(int z) const
+NICE::MultiChannelImageT<P> MultiChannelImage3DT<P>::getColorMCI(int z) const
+{
+    assert( z < zsize );
+    assert( numChannels >= 3 );
+
+    NICE::MultiChannelImageT<P> img( xsize, ysize, 3 );
+    long k = 0;
+
+    for ( int y = 0 ; y < ysize; y++ )
+        for ( int x = 0; x < xsize; x++ )
+        {
+            img.set( x, y, 0, ( int )( data[0][z*xsize*ysize + k] ) );
+            img.set( x, y, 1, ( int )( data[1][z*xsize*ysize + k] ) );
+            img.set( x, y, 2, ( int )( data[2][z*xsize*ysize + k] ) );
+        }
+
+    return img;
+}
+
+template<class P>
+NICE::ColorImage MultiChannelImage3DT<P>::getColor(int z) const
 {
   assert( z < zsize );
 	assert( numChannels >= 3 );
@@ -589,7 +594,7 @@ ColorImage MultiChannelImage3DT<P>::getColor(int z) const
 }
 
 template<class P>
-ColorImage MultiChannelImage3DT<P>::getColorImageFromChannels(int z, int channel0, int channel1, int channel2) const
+NICE::ColorImage MultiChannelImage3DT<P>::getColorImageFromChannels(int z, int channel0, int channel1, int channel2) const
 {
   assert( z < zsize );
   assert( numChannels >= std::max( std::max(channel0,channel1),channel2 ) );