From b45f363a62e2ffa16cf5b473d20f123912f543f2 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Fri, 9 Oct 2009 17:11:11 +0000 Subject: [PATCH] remove deprecated --- src2/README.txt | 6 +- src2/creaImageIORFImageReader.cpp | 172 ------------------------------ src2/creaImageIORFImageReader.h | 40 ------- src2/creaImageIOWxGimmickPanel.h | 10 +- 4 files changed, 9 insertions(+), 219 deletions(-) delete mode 100644 src2/creaImageIORFImageReader.cpp delete mode 100644 src2/creaImageIORFImageReader.h diff --git a/src2/README.txt b/src2/README.txt index c62bb92..fbe4fd9 100644 --- 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 index b1f2331..0000000 --- a/src2/creaImageIORFImageReader.cpp +++ /dev/null @@ -1,172 +0,0 @@ -#include -#include -#include -#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 "<& v) - { - v.push_back("rf"); - } - //===================================================================== - - - - //===================================================================== - void RFImageReader::ReadAttributes(const std::string& filename, - std::map& attr) - { - // std::cout << "RFImageReader::ReadDicomInfo '"<::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:"< -#include - -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&); - 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 aaea672..43a9361 100644 --- a/src2/creaImageIOWxGimmickPanel.h +++ b/src2/creaImageIOWxGimmickPanel.h @@ -49,12 +49,14 @@ namespace creaImageIO //Image Selection //=============================================================================================== - void GetSelectedImages(std::vector& s, int dim) - { mView->GetSelectedImages(s, dim); } + void GetSelectedImages(std::vector& 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 //===================================================================== -- 2.45.1