X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmick.cpp;h=e168c3769baa12b10a85243a77011076f39a6e81;hb=a67d921cdc10d438852b48c2985f14d91320e016;hp=de6b11dd169ea626d5255a2a64b5f2813607ad10;hpb=5970066f11bb2288cc7dc9fe173051c2a343789d;p=creaImageIO.git diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp index de6b11d..e168c37 100644 --- a/src2/creaImageIOGimmick.cpp +++ b/src2/creaImageIOGimmick.cpp @@ -1,3 +1,4 @@ + #include #include @@ -8,33 +9,34 @@ # define PATH_MAX 2048 #endif +#ifdef _DEBUG +#define new DEBUG_NEW +#endif + namespace creaImageIO { - - //============================================================== Gimmick::Gimmick() : mImageAdder(0) { - RegisterGimmickMessageTypes(); + RegisterGimmickMessageTypes(); mSettings=0; mSynchronizer=0; } //============================================================== - //============================================================== Gimmick::~Gimmick() { if(mSettings!=0) { - mSettings->writeSettingsFile(); - delete mSettings; + mSettings->writeSettingsFile(); + delete mSettings; } - if(mSynchronizer!=0) + if(mSynchronizer!=0) { - delete mSynchronizer; + delete mSynchronizer; } } //============================================================== @@ -53,35 +55,32 @@ namespace creaImageIO CreateUserSettingsDirectory(); // Sets the current directory to the home dir mCurrentDirectory = GetHomeDirectory(); - mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"Shared/gimmick/"); + mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"Shared/gimmick/"); - mSettings = new Settings(mCurrentDirectory); + mSettings = new Settings(mCurrentDirectory); - - std::string dbpath = GetLocalDatabasePath(); + std::string dbpath = GetLocalDatabasePath(); // Create or open local database - std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/localdatabase_Descriptor.txt"; - boost::algorithm::replace_all( dpath, - INVALID_FILE_SEPARATOR , - VALID_FILE_SEPARATOR); - mLocalDatabase = createDB(i_nameDB, dpath, dbpath); + std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/localdatabase_Descriptor.dscp"; + 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(); - - + //Add additional DB from user Settings + addDBSettings(); } /////////////////////////////////////////////////////////////////////// - // add DB to TreeHandler Map // - // @param i_name : DB name // - // @param i_location : DB location // - // return : - // - /////////////////////////////////////////////////////////////////////// - void Gimmick::addDB(const std::string &i_name, - const std::string &i_location) + // add DB to TreeHandler Map // + // @param i_name : DB name // + // @param i_location : DB location // + // return : - // + //////////////////////////////////////////////////////////////////////// + void Gimmick::addDB(const std::string &i_name, + const std::string &i_location) { if(mTreeHandlerMap.find(i_name) == mTreeHandlerMap.end()) { @@ -91,7 +90,6 @@ namespace creaImageIO } } - /////////////////////////////////////////////////////////////////////////// // create a DB from a attributes descriptor file for medical images // // @param i_name : DB name // @@ -99,11 +97,11 @@ namespace creaImageIO // @param i_locDB : location of DB // // return : the SQLiteTreeHandler object on DB // ///////////////////////////////////////////////////////////////////////// - SQLiteTreeHandler *Gimmick::createDB(const std::string &i_name, + SQLiteTreeHandler* Gimmick::createDB(const std::string &i_name, const std::string &i_locDesc, const std::string &i_locDB) { - SQLiteTreeHandler *sqlTreeH = new SQLiteTreeHandler(i_locDB); + SQLiteTreeHandler* sqlTreeH( new SQLiteTreeHandler(i_locDB) ); // Create or open local database if (! boost::filesystem::exists(i_locDB) ) { @@ -115,8 +113,8 @@ namespace creaImageIO // CREATING DB STRUCTURE sqlTreeH->GetTree().GetDescriptor().createDescriptorfromFile(i_locDesc); if ( ! sqlTreeH->Create(true) ) - { - GimmickError("ERROR CREATING '"<SetAttribute(0,"Name",i_name); } @@ -124,22 +122,22 @@ namespace creaImageIO { /// Open and test it GimmickMessage(1,"Opening local database '" <Open(true) ) + if ( !sqlTreeH->Open(true) ) { GimmickError("ERROR OPENING '"<second; } @@ -200,7 +198,6 @@ namespace creaImageIO return mLocalDatabasePath; } - //======================================================================== //======================================================================== @@ -225,7 +222,7 @@ namespace creaImageIO boost::filesystem::create_directory( setDir ); setDir+="gimmick/"; boost::filesystem::create_directory( setDir ); - setDir+="localdatabase_Descriptor.txt"; + setDir+="localdatabase_Descriptor.dscp"; if(!boost::filesystem::is_regular(setDir)) { @@ -238,10 +235,17 @@ namespace creaImageIO path=path.substr(0,path.size()-1); path=path.substr(0,path.find_last_of("/")); //Creating directories - path+="/bin/Shared/gimmick/localdatabase_Descriptor.txt"; - std::cout<<"From: "<second; } - - //======================================================================== /// Add the files to the tree handler void Gimmick::AddFiles(const std::string& d, @@ -289,10 +291,9 @@ namespace creaImageIO GimmickMessage(2,"Adding files to '"<getValue(name); + value = mSettings->getValue(name); } //======================================================================== //======================================================================== void Gimmick::GetAttributes(const std::string& d, - const std::string& filename, - const std::vector& params, - std::vector& results) + const std::string& filename, + const std::vector& params, + std::vector& results) { TreeHandler * handler=GetTreeHandler(d); mImageAdder.SetCurrentDatabase(d); @@ -385,32 +386,32 @@ namespace creaImageIO void Gimmick::DeleteDrive(const std::string& drive) { - for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin(); - it!= mTreeHandlerMap.end(); ++it) + for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin(); + it!= mTreeHandlerMap.end(); + ++it) { mImageAdder.SetTreeHandler(it->second); mImageAdder.DeleteDriveFromMainDB(drive); } - mImageAdder.SetSynchronizer(mSynchronizer); - mImageAdder.DeleteDriveFromOtherDB(drive); + mImageAdder.SetSynchronizer(mSynchronizer); + mImageAdder.DeleteDriveFromOtherDB(drive); } //======================================================================== void Gimmick::EditField(tree::Node* node, const std::string& d, const std::string& name, const std::string& key, const std::string& val) { - TreeHandler * handler=GetTreeHandler(d); - mImageAdder.SetCurrentDatabase(d); - mImageAdder.SetTreeHandler(handler); - mImageAdder.EditField(node,name,key,val); + TreeHandler * handler=GetTreeHandler(d); + mImageAdder.SetCurrentDatabase(d); + mImageAdder.SetTreeHandler(handler); + mImageAdder.EditField(node,name,key,val); } //======================================================================== - - ///////////////////////////////////////////////////////////////////////// - // add DB from Settings file // - // @param : - // - // return : - // - ///////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////// + // add DB from Settings file // + // @param : - // + // return : - // + //////////////////////////////////////////////////////////////////////// void Gimmick::addDBSettings() { @@ -437,7 +438,5 @@ namespace creaImageIO std::string name = it_path->substr(pos +1, last_pos -pos-1 ); addDB(name, it_path->c_str()); } - - } - + } }