X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOGimmick.cpp;fp=src%2FcreaImageIOGimmick.cpp;h=898de344fb7d5ad09037b359f308cb11ed1d22a4;hb=79372affb878a3ffd7896b8ffbb06b564c0550ce;hp=7ba9b2a14f71b6f658f5522bec1f4e2b2e73ad16;hpb=f5a8c7765cb23e949c7fe124a4b8a3b87b2d35ad;p=creaImageIO.git diff --git a/src/creaImageIOGimmick.cpp b/src/creaImageIOGimmick.cpp index 7ba9b2a..898de34 100644 --- 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(); }