remove deprecated

diff --git a/src2/README.txt b/src2/README.txt
index c62bb9284c66ac7401c5dc50fd284891d94db081..fbe4fd90bf60ff59c01fd08b6fffd819c662120d 100644 (file)
--- a/src2/README.txt
+++ b/src2/README.txt
@@ -27,9 +27,9 @@ ComparatorWithOrder : Abstract Comparator whose order can be reversed
                    Concrete comparison is done by method compare(Node* const &, Node* const &)
 LexicographicalComparator :  A Comparator which stores a vector of Comparators and which performs lexicographical comparison               
 
-IntComparator : Compares the values of a given Attribute of the Nodes which is decoded as an int value
-FloatComparator : Compares the values of a given Attribute of the Nodes which is decoded as a float value
-StringComparator : Compares the values of a given Attribute of the Nodes which is decoded as a string value
+IntComparator    : Compares the values of a given Attribute of the Nodes which is decoded as an int    value
+FloatComparator  : Compares the values of a given Attribute of the Nodes which is decoded as a  float  value
+StringComparator : Compares the values of a given Attribute of the Nodes which is decoded as a  string value
 
 
 * Models : TreeHandler and descendants

diff --git a/src2/creaImageIORFImageReader.cpp b/src2/creaImageIORFImageReader.cpp
deleted file mode 100644 (file)
index b1f2331..0000000
--- a/src2/creaImageIORFImageReader.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-#include <creaImageIORFImageReader.h>
-#include <creaVtk.h>
-#include <creaImageIOSystem.h>
-#include "boost/filesystem/path.hpp"
-
-namespace creaImageIO
-{
-#define HEADER_SIZE 19
-
-
-  //=====================================================================
-  RFImageReader::RFImageReader()
-  {
-    SetName("rf");
-  }
-  //=====================================================================
-  
-  //=====================================================================
-  RFImageReader::~RFImageReader()
-  {
-  }
-  //=====================================================================
-
-  //=====================================================================
-  struct rf_header
-  {
-    // frames, width, height
-    int frame,width,height;
-  };
-  //=====================================================================
-
-
-  //=====================================================================
-  bool ReadHeader( FILE *rf_file, rf_header& h )
-  {
-    int *header=(int*)malloc(sizeof(int)*HEADER_SIZE);
-    fread(header,sizeof(int),HEADER_SIZE,rf_file);
-    h.frame  = header[1];
-    h.height = header[2];
-    h.width = header[3];
-    free(header);  
-    return true;
-  }
-  //=====================================================================
-
-  //=====================================================================
-  bool RFImageReader::CanRead(const std::string& filename)
-  { 
-    bool ok = false;
-    FILE *rf_file=fopen(filename.c_str(),"rb");
-    if (rf_file) 
-      {
-       rf_header h;
-       ok = ReadHeader(rf_file,h);
-       fclose(rf_file);
-      }
-    return ok;
-  }
-  //=====================================================================
-  
-  //=====================================================================
-  vtkImageData* RFImageReader::ReadImage(const std::string& filename)
-  {
-
-         std::cout<<"RFImageReader reading "<<std::endl;
-
-    FILE *rf_file=fopen(filename.c_str(),"rb");
-    if (!rf_file) return false;
-    rf_header h;
-    if (!ReadHeader(rf_file,h)) 
-      {
-        fclose(rf_file);  
-       return 0;
-      }
-    
-    long im_size = h.height * h.width * h.frame;
-    short* data = (short*)malloc(sizeof(short)*im_size);
-
-    long frame_size = h.height * h.width;
-    short* ptr = data;
-    for (int k=0; k<h.frame; k++) {
-      int frame_number;
-      fread(&frame_number,sizeof(int),1,rf_file);
-      fread(ptr,sizeof(short),frame_size,rf_file);
-      ptr += frame_size;
-    }
-    fclose(rf_file);  
-
-    //    std::cout << "NewVtkImageDataFromRaw" << std::endl;
-    vtkImageData* im = crea::NewVtkImageDataFromRaw( data,
-                                                    h.width,
-                                                    h.height,
-                                                    h.frame);
-    return im;
-
-    //    std::cout << "OK" << std::endl;
-    
-  }
-  //=====================================================================
-  
- 
-  //=====================================================================
-  void RFImageReader::PushBackExtensions(std::vector<std::string>& v)
-  {
-    v.push_back("rf");
-  }
-  //=====================================================================
- 
-
-
-  //=====================================================================
-  void RFImageReader::ReadAttributes(const std::string& filename, 
-                                     std::map<std::string,std::string>& attr)
-  {
-    //      std::cout << "RFImageReader::ReadDicomInfo '"<<filename<<"'"<<std::endl;
-    GimmickMessage(2,"Reading attributes from '"<<filename<<std::endl);
- 
-
-    FILE *rf_file=fopen(filename.c_str(),"rb");
-    if (!rf_file) return;
-    rf_header h;
-    if (!ReadHeader(rf_file,h)) 
-      {
-        fclose(rf_file);  
-       return;
-      }
-    fclose(rf_file);  
-  
-    // Columns
-    char cols[128];
-    sprintf(cols,"%i",h.width);
-    // Rows
-    char rows[128];
-    sprintf(rows,"%i",h.height);
-    // Planes 
-    char planes[128];
-    sprintf(planes,"%i",h.frame);
-    
-    
-    // 
-    std::map<std::string,std::string>::iterator i;
-    if ( (i = attr.find("FullFileName")) != attr.end())
-      {
-       //        boost::filesystem::path full_path(filename);
-       // std::string f = full_path.leaf();
-       i->second = filename;
-      }
-    if ( (i = attr.find("D0004_1500")) != attr.end())
-      {
-       boost::filesystem::path full_path(filename);
-       std::string f = full_path.leaf();
-       i->second = f;
-      }
-    if ( (i = attr.find("D0028_0010")) != attr.end())
-      {
-       i->second = rows;
-      }
-    if ( (i = attr.find("D0028_0011")) != attr.end())
-      {
-       i->second = cols;
-      }
-    
-    if ( (i = attr.find("D0028_0012")) != attr.end())
-      {
-       i->second = planes;
-      }
-    
-   GimmickMessage(2,"Attributes map:"<<std::endl<<attr<<std::endl);
-  }
-  //=====================================================================
-
-} // namespace creaImageIO

diff --git a/src2/creaImageIORFImageReader.h b/src2/creaImageIORFImageReader.h
deleted file mode 100644 (file)
index 4388f2e..0000000
--- a/src2/creaImageIORFImageReader.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef __creaImageIORFImageReader_h_INCLUDED__
-#define __creaImageIORFImageReader_h_INCLUDED__
-
-
-#include <creaImageIOAbstractImageReader.h>
-#include <creaImageIOSystem.h>
-
-namespace creaImageIO
-{
-
-
-  /**
-   * \ingroup IO
-   */
-  
-  //=====================================================================
-  /// Concrete image reader for ultrasonix 'rf' files
-  class CREAIMAGEIO_EXPORT RFImageReader : virtual public AbstractImageReader
-  {
-  public:
-    RFImageReader();
-
-    virtual ~RFImageReader();
-
-    virtual void PushBackExtensions(std::vector<std::string>&);
-    virtual bool CanRead(const std::string& filename);
-    virtual vtkImageData* ReadImage(const std::string& filename);
-    virtual void ReadAttributes(const std::string& filename, 
-                               tree::AttributeMapType& attr);
-
-  };
-  //=====================================================================
-
-
-
-} // namespace creaImageIO
-
-
-
-#endif // #ifndef __creaImageIORFImageReader_h_INCLUDED__

diff --git a/src2/creaImageIOWxGimmickPanel.h b/src2/creaImageIOWxGimmickPanel.h
index aaea672248cf2ba135f109a25b1856d3d9966dce..43a93614504201d2412eb1cad6e7a7047a899d33 100644 (file)
--- a/src2/creaImageIOWxGimmickPanel.h
+++ b/src2/creaImageIOWxGimmickPanel.h
@@ -49,12 +49,14 @@ namespace creaImageIO
        //Image Selection
        //===============================================================================================
 
-       void GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
-    { mView->GetSelectedImages(s, dim); }
+    void GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
+    { 
+       mView->GetSelectedImages(s, dim); 
+    }
 
     void OnSelectedImage(bool t);
 
-       void AddImagesToDB(std::string dir);
+    void AddImagesToDB(std::string dir);
 
     //    DECLARE_EVENT_TABLE();
   private :
@@ -63,7 +65,7 @@ namespace creaImageIO
     WxGimmickView* mView;
 
        ///The sendImage signal
-       SendImageSignalType mSendImageSignal;
+    SendImageSignalType mSendImageSignal;
 
   }; // class WxGimmickPanel
   //=====================================================================