#3218 creaImageIO Feature New Normal - vtk8itk4wx3-mingw64

[creaImageIO.git] / src / creaImageIOGimmick.cpp

diff --git a/src/creaImageIOGimmick.cpp b/src/creaImageIOGimmick.cpp
index 6d296136060ffe020716d6b2c0ffbdd580d041b3..898de344fb7d5ad09037b359f308cb11ed1d22a4 100644 (file)
--- a/src/creaImageIOGimmick.cpp
+++ b/src/creaImageIOGimmick.cpp
@@ -52,10 +52,10 @@ namespace creaImageIO
     : mImageAdder(0)
   {    
   RegisterGimmickMessageTypes();
-       mSettings=0;
-       mSynchronizer=0;
+       mSettings               = NULL;
+       mSynchronizer   = NULL;
        mLocalDescpName = "localdatabase_Descriptor.dscp";
-       mLocalDBName = "Local database";
+       mLocalDBName    = "Local database";
   }
   //==============================================================
 
@@ -63,13 +63,12 @@ namespace creaImageIO
   //==============================================================
   Gimmick::~Gimmick()
   {
-
-        if(mSettings!=0)
+        if(mSettings!=NULL)
          {
                mSettings->writeSettingsFile();
                delete mSettings;
          }
-       if(mSynchronizer!=0)
+       if(mSynchronizer!=NULL)
          {
                delete mSynchronizer;
          }
@@ -79,8 +78,8 @@ namespace creaImageIO
   //==============================================================
   void Gimmick::Initialize(const std::string i_namedescp, const std::string i_namedb)
   {
-         mLocalDescpName = i_namedescp;
-         mLocalDBName = i_namedb;
+         mLocalDescpName       = i_namedescp;
+         mLocalDBName          = i_namedb;
          Initialize();
   }
 
@@ -92,22 +91,17 @@ namespace creaImageIO
     CreateUserSettingsDirectory();
     // Sets the current directory to the home dir
     mCurrentDirectory =  GetHomeDirectory();
-    mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"share/creaImageIO/");
-
+    mSynchronizer= new Synchronizer( GetUserSettingsDirectory()+"share/creaImageIO/" );
     mSettings  = new Settings(mCurrentDirectory);
-       
     std::string dbpath = GetLocalDatabasePath();
-
     // Create or open local database
     std::string dpath= mCurrentDirectory + "/.creaImageIO/share/creaImageIO/" + mLocalDescpName;
-       
     boost::algorithm::replace_all( dpath,
                                   INVALID_FILE_SEPARATOR , 
                                   VALID_FILE_SEPARATOR);
     mLocalDatabase = createDB(i_nameDB, dpath, dbpath);
     // Add it to the TreeHandlerMap
     mTreeHandlerMap[i_nameDB] = mLocalDatabase;
-    
     //Add additional DB from user Settings
     addDBSettings();   
   }
@@ -202,10 +196,10 @@ namespace creaImageIO
   {
     if (mHomeDirectory.size()==0) 
       {
-#if defined(__GNUC__)
-       mHomeDirectory = getenv("HOME");
-#elif defined(_WIN32)
+#if defined(_WIN32)
        mHomeDirectory = getenv("USERPROFILE");
+#elif defined(__GNUC__)
+       mHomeDirectory = getenv("HOME");
 #endif
       }
     return mHomeDirectory;
@@ -560,11 +554,13 @@ void Gimmick::fillVectInfos(std::vector<std::string> i_attr, OutputAttr &infos)
        {
                if( mImageAdder.isAttributeExist((*it)) != "" ) // in DB
                {
+printf("EED Gimmick::fillVectInfos inside %s\n",(*it).c_str());
                        infos.inside.push_back((*it));
                }
                else
                {
                                infos.outside.push_back((*it)); // Need to scan again the files
+printf("EED Gimmick::fillVectInfos outside %s\n",(*it).c_str());
                }
        }
 }
@@ -580,4 +576,4 @@ const std::string Gimmick::getSummary()
     return mess.str();
 }
 
-}
\ No newline at end of file
+}