]> Creatis software - creaImageIO.git/commitdiff
no message
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Thu, 11 Mar 2010 10:11:07 +0000 (10:11 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Thu, 11 Mar 2010 10:11:07 +0000 (10:11 +0000)
src2/creaImageIODicomImageReader.cpp
src2/creaImageIOGimmick.cpp
src2/creaImageIOImageReader.cpp

index 9390d1704a55acc790762864ef78eb34b4bcdcbe..e12fd0ab2931697555ca48dba4606b4232230291 100644 (file)
@@ -17,6 +17,7 @@ namespace creaImageIO
   DicomImageReader::DicomImageReader()
   {
     mReader = vtkGdcmReader::New();
+//EED  mReader->SetFlipY(false);
     SetName ( "Dicom" );
   };
   //=====================================================================
index aa05e4cf7520ad3845992144c9b63efdcfc9b020..eb1a91e2e4c391e506496451320b028c9f84d6ba 100644 (file)
@@ -56,15 +56,21 @@ namespace creaImageIO
   //==============================================================
   void Gimmick::Initialize()
   {
+printf("EED Gimmick::Initialize 1\n");   
        std::string i_nameDB = mLocalDBName;
     // Create the UserSettings dir if does not exist
+printf("EED Gimmick::Initialize 1 A\n");         
     CreateUserSettingsDirectory();
+printf("EED Gimmick::Initialize 1 B\n");         
     // Sets the current directory to the home dir
     mCurrentDirectory =  GetHomeDirectory();
+         printf("EED Gimmick::Initialize 1 C\n");        
     mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"Shared/gimmick/");
+         printf("EED Gimmick::Initialize 1 D\n");        
 
     mSettings  = new Settings(mCurrentDirectory);
        
+         printf("EED Gimmick::Initialize 1.1\n");        
     std::string dbpath = GetLocalDatabasePath();
 
     // Create or open local database
@@ -73,12 +79,15 @@ namespace creaImageIO
     boost::algorithm::replace_all( dpath,
                                   INVALID_FILE_SEPARATOR , 
                                   VALID_FILE_SEPARATOR);
+         printf("EED Gimmick::Initialize 1.2\n");        
     mLocalDatabase = createDB(i_nameDB, dpath, dbpath);
+         printf("EED Gimmick::Initialize 1.3\n");        
     // Add it to the TreeHandlerMap
     mTreeHandlerMap[i_nameDB] = mLocalDatabase;
     
     //Add additional DB from user Settings
     addDBSettings();   
+         printf("EED Gimmick::Initialize 2\n");          
   }
 
    ///////////////////////////////////////////////////////////////////////
@@ -216,6 +225,8 @@ namespace creaImageIO
   //========================================================================
   void Gimmick::CreateUserSettingsDirectory()
   {
+         
+printf("EED Gimmick::CreateUserSettingsDirectory 1\n");
         // std::string st("C:/Documents and Settings/cervenansky/.gimmick/");
         //     boost::algorithm::replace_all( st, 
                //                     INVALID_FILE_SEPARATOR , 
@@ -245,11 +256,13 @@ namespace creaImageIO
        GimmickMessage(1,"Directory '"<<GetUserSettingsDirectory()<<"' "
                       << "does not exist : creating it"<<std::endl);
        
+printf("EED Gimmick::CreateUserSettingsDirectory 2\n");
        if ( ! boost::filesystem::create_directory( GetUserSettingsDirectory() ) )
          {
            GimmickError("ERROR CREATING '"<<GetUserSettingsDirectory()<<"'");
          }
       }
+printf("EED Gimmick::CreateUserSettingsDirectory 3\n");
 
        std::string setDir=GetUserSettingsDirectory();
        boost::algorithm::replace_all( setDir,
@@ -260,11 +273,11 @@ namespace creaImageIO
        setDir+="gimmick/";
        boost::filesystem::create_directory( setDir );
        setDir+=mLocalDescpName;
+printf("EED Gimmick::CreateUserSettingsDirectory 5\n");
 
        if(!boost::filesystem::is_regular(setDir))
        {
                char name[PATH_MAX];
-//EED          int err = GetBinaryDirectory(name, PATH_MAX);
                crea::System::GetAppPath(name,PATH_MAX);
                std::cout<<name<<std::endl;
                
@@ -276,24 +289,34 @@ namespace creaImageIO
 // The following stuff works on Linux, NOT CHECKED on Windows // JPR
                
 #if defined(_WIN32)            
-               path+="/bin/shared/gimmick/";
+               path+="/bin/share/gimmick/";
+               printf("EED Gimmick::CreateUserSettingsDirectory 01xxx\n");             
 #endif
 
+#if defined (LINUX)
+               path+="/../share/gimmick/";
+               printf("EED Gimmick::CreateUserSettingsDirectory 03xxx\n");             
+#endif 
 #if defined(__APPLE__)
-               path+="../../../../shared/gimmick/";
+               path+="/../../../../share/gimmick/";
+               printf("EED Gimmick::CreateUserSettingsDirectory 02xxx\n");             
 #endif 
 
-#if defined (LINUX)
-               path+="../shared/gimmick/";
-#endif 
-               path+= mLocalDescpName;
+
+path+= mLocalDescpName;
+               
                std::cout <<"From: " << path   <<std::endl;
                std::cout <<"To: "   << setDir <<std::endl;
                boost::algorithm::replace_all(  path,
                                                INVALID_FILE_SEPARATOR , 
                                                VALID_FILE_SEPARATOR);
+printf("EED Gimmick::CreateUserSettingsDirectory 5.1 %s >>>  %s \n", path.c_str(), setDir.c_str() );
+printf("EED Gimmick::CreateUserSettingsDirectory 5.1.1 %s \n", mLocalDescpName.c_str() );
                boost::filesystem::copy_file(path,setDir);
+printf("EED Gimmick::CreateUserSettingsDirectory 5.2\n");
        }
+printf("EED Gimmick::CreateUserSettingsDirectory 6\n");
+         
   }
   //========================================================================
 
index 1ef6ce428a84d1c61fd7f9d6fb5b166e9995c6ab..9fda22674db7677e06378a37f9d10e8fe1c5f617 100644 (file)
@@ -118,7 +118,7 @@ namespace creaImageIO
   // Reads the file (CanRead must be called before : no test here)
   vtkImageData*  ImageReader::ReadImage( const std::string& filename)
   {
-    if (mLastFilename!=filename)
+         if (mLastFilename!=filename)
       {
        if (!CanRead(filename))  
          {