std::string vs wxString

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4e9615e9d24faf861c2a156def452c9e000d0c81..b4696dd0df00c0a035f98bb7e19edd1829214ba3 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,8 +24,6 @@ FILE(GLOB SOURCES_CREAIMAGEIO
   creaImageIOListener.cpp
 )
  
- 
- 
  # Attributed tree data structure
 FILE(GLOB SOURCES_CREAIMAGEIO_TREE
          creaImageIOTree.cpp
@@ -42,7 +40,6 @@ IF(USE_GDCM)
  FILE(GLOB SOURCES_CREAIMAGEIO_IMG_DICOM_READER
                creaImageIODicomImageReader.cpp)
 ENDIF(USE_GDCM)
-
          
 IF(USE_GDCM2)
  FILE(GLOB SOURCES_CREAIMAGEIO_IMG_DICOM_READER
@@ -61,7 +58,6 @@ FILE(GLOB SOURCES_CREAIMAGEIO_IMG_READER
          ${SOURCES_CREAIMAGEIO_IMG_DICOM_READER}
          )
 
-
 # The wxWidgets-based components
 if (USE_WXWIDGETS)
 FILE(GLOB SOURCES_CREAIMAGEIO_WX
@@ -122,9 +118,6 @@ else (BUILD_CREA_PACS)
                )
 endif (BUILD_CREA_PACS)
 
-
-
-
 OPTION(${LIBRARY_NAME}_BUILD_SHARED 
   "Build ${LIBRARY_NAME} as a shared library (dynamic) ?" ON)
 IF (${LIBRARY_NAME}_BUILD_SHARED)

diff --git a/src/creaImageIODicomImageReader2.cpp b/src/creaImageIODicomImageReader2.cpp
index 3dd8120f299a35ea3c47e965202eda047be4f369..c736e16ee7d9d22ea6024e30a96586d2d0b32488 100644 (file)
--- a/src/creaImageIODicomImageReader2.cpp
+++ b/src/creaImageIODicomImageReader2.cpp
@@ -19,8 +19,8 @@ namespace creaImageIO
   //=====================================================================
   DicomImageReader::DicomImageReader()
   {
-         mReader =  vtkGDCMImageReader::New();
-    SetName ( "Dicom" );
+      mReader =  vtkGDCMImageReader::New();
+      SetName ( "Dicom" );
        
   };
   //=====================================================================
@@ -28,14 +28,14 @@ namespace creaImageIO
   //=====================================================================
   DicomImageReader::~DicomImageReader()
   {
-         mReader->Delete();
+      mReader->Delete();
   }
   //=====================================================================
 
   //=====================================================================  
   bool DicomImageReader::CanRead(const std::string& filename)
   { 
-         gdcm::Reader reader;
+      gdcm::Reader reader;
       reader.SetFileName( filename.c_str() );
       return  reader.Read();
         
@@ -100,9 +100,9 @@ namespace creaImageIO
                   <<filename<<"'"<<std::endl);
 
    
-        gdcm::Reader reader;
+      gdcm::Reader reader;
       reader.SetFileName( filename.c_str() );
-         if (reader.Read())
+      if (reader.Read())
       {
        std::map<std::string,std::string>::iterator i;
        for (i=attr.begin();i!=attr.end();++i)
@@ -127,7 +127,7 @@ namespace creaImageIO
              {
                uint16_t el;
                uint16_t gr;
-               
+
                tree::AttributeDescriptor::GetDicomGroupElementFromKey(i->first,gr,el);
                if ( ( gr!=0 ) && ( el!=0 ) )
                  {
@@ -143,7 +143,6 @@ namespace creaImageIO
 void DicomImageReader::ReadAttributes2(const std::string& filename, 
                      std::map<std::string,std::string>& attr)
   {
-      
        if(!b_loaded)
        {
                std::map<std::string,std::string>::iterator i;
@@ -197,22 +196,7 @@ void DicomImageReader::ReadAttributes2(const std::string& filename,
         }
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  const std::string DicomImageReader::GetStringValueFromTag(const gdcm::DataElement& de)
+const std::string DicomImageReader::GetStringValueFromTag(const gdcm::DataElement& de)
 {
   static std::string buffer;
   buffer = "";  // cleanup previous call
@@ -225,7 +209,6 @@ void DicomImageReader::ReadAttributes2(const std::string& filename,
       // Will be padded with at least one \0
       }
 
-
   // Since return is a const char* the very first \0 will be considered
   return buffer.c_str();
 }

diff --git a/src/creaImageIOImageReader.cpp b/src/creaImageIOImageReader.cpp
index 4b67e04c005f2c37ae91a1dc7fefdc588ef82741..d6edb7854d55a7fc2ee3a490a5574972860dd158 100644 (file)
--- a/src/creaImageIOImageReader.cpp
+++ b/src/creaImageIOImageReader.cpp
@@ -18,15 +18,10 @@
 #include <vtkMetaImageReader.h>
 //#include <vtkGESignalReader.h>
 
-
 #include "boost/filesystem/path.hpp"
 
 namespace creaImageIO
 {
-  
-
-
-
 
   //=====================================================================
   ImageReader::ImageReader()
@@ -37,7 +32,7 @@ namespace creaImageIO
     //    std::cout << "#### ImageReader::ImageReader()"<<std::endl;
     if (mUnreadableImage!=0) return;
        
-       Register( boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkPNGReader::New(), "PNG", ".png")));
+    Register( boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkPNGReader::New(), "PNG", ".png")));
     Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkTIFFReader::New(), "JPEG", ".jpeg")));
     Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkJPEGReader::New())));
     Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkBMPReader::New())));
@@ -64,9 +59,6 @@ namespace creaImageIO
        mUnreadableImage->SetScalarComponentFromFloat(i,i,0,0,255);
        mUnreadableImage->SetScalarComponentFromFloat(dim[0]-1-i,i,0,0,255);
       }
-
-
-    
   }
   //=====================================================================
 
@@ -120,10 +112,8 @@ namespace creaImageIO
                }
        }
        return ok;
-       
   }
 
-
   //=====================================================================
   // Returns true iff the file is readable
   bool ImageReader::CanRead( const std::string& filename ) 
@@ -149,7 +139,6 @@ namespace creaImageIO
                }
        }
        return ok;
-       
   }
   //=====================================================================
 

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index 4a343719f32c0a6d827918cc71a2a6cb0f0792de..5bc3cd7a38195423fc05319efbdc84d1a2d127b9 100644 (file)
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -1,12 +1,11 @@
 #include "creaImageIOWxSimpleDlg.h"
 #include "creaImageIOWxGimmickReaderDialog.h"
 
-
 namespace creaImageIO
 {
 
        ///Ctor
-        WxSimpleDlg::WxSimpleDlg(wxWindow *parent, wxString i_title)
+   WxSimpleDlg::WxSimpleDlg(wxWindow *parent, wxString i_title)
     : wxDialog(parent, -1,_T("DISPLAY IMAGES"), wxDefaultPosition, wxSize(230,150))
    {
           if(!i_title.empty())
@@ -25,13 +24,13 @@ namespace creaImageIO
           wxButton *gimmickBut = new wxButton(this, -1,_T("Select Gimmick"), wxPoint(10,70) );
           Connect( gimmickBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadGimmick ); 
 
-          //TO DO  Button to select Bruker directory
+          /// \TODO  Button to select Bruker directory
        
        Layout(); 
        
        }
 //////////////////////////////////////////////////////////////////////
-//                                                                                                                                     //
+//                                                                  //
 //////////////////////////////////////////////////////////////////////
          void WxSimpleDlg::OnReadFile(wxCommandEvent& event)
          {
@@ -68,7 +67,7 @@ namespace creaImageIO
          void WxSimpleDlg::OnReadDirectory(wxCommandEvent &event)
          {
             long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST;
-                wxDirDialog* FD = new wxDirDialog( 0, _T("Select the directory to display"), "", style);
+                wxDirDialog* FD = new wxDirDialog( 0, _T("Select the directory to display"), _T(""), style);
                 
                 if (FD->ShowModal()==wxID_OK)
                 {  
@@ -104,7 +103,6 @@ namespace creaImageIO
                 Close();
           }
 
-
  //////////////////////////////////////////////////////////////////////
 // Return the results vector                                                                           //
 //////////////////////////////////////////////////////////////////////

diff --git a/src/creaImageIOWxSimpleDlg.h b/src/creaImageIOWxSimpleDlg.h
index 135802bb8595566552cb7c3a6613243dc47f2237..00693dae7093e8e02744190627fad5f30eb4fc06 100644 (file)
--- a/src/creaImageIOWxSimpleDlg.h
+++ b/src/creaImageIOWxSimpleDlg.h
@@ -1,10 +1,9 @@
 #include "creaImageIOSimpleView.h"
 #include <creaWx.h>
 
-
 namespace creaImageIO
 {
-        /**
+ /**
    * \ingroup View
    */
 
@@ -13,12 +12,10 @@ namespace creaImageIO
        {
        public:
                 /// Ctor
-                 WxSimpleDlg( wxWindow *parent,  wxString i_title ="");
-
+                 WxSimpleDlg( wxWindow *parent,  wxString i_title =_T(""));
                  ///Dtor
                  ~WxSimpleDlg(){};
 
-
                  /// Callback to read file(s)
                  void OnReadFile(wxCommandEvent& event);
 
@@ -39,4 +36,4 @@ namespace creaImageIO
                /// vtkImageData vector
                std::vector<vtkImageData*> m_results;
        };
-}
\ No newline at end of file
+}