X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmick.cpp;h=615f1f041f90b50a41886121d516a11c8df72dea;hb=14cf4a18b7517a3f7e86ee3e756043a3431b87db;hp=09a6fd00685fdd34328f9ef18ae91fd960039354;hpb=75778b43c0c928b88c6dc93f2c8b2c1ac6af59e5;p=creaImageIO.git diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp index 09a6fd0..615f1f0 100644 --- a/src2/creaImageIOGimmick.cpp +++ b/src2/creaImageIOGimmick.cpp @@ -1,3 +1,4 @@ + #include #include @@ -7,6 +8,11 @@ #ifndef PATH_MAX // If not defined yet : do it # define PATH_MAX 2048 #endif +#include +#ifdef _DEBUG +#define new DEBUG_NEW +#endif + namespace creaImageIO { @@ -14,9 +20,11 @@ namespace creaImageIO Gimmick::Gimmick() : mImageAdder(0) { - RegisterGimmickMessageTypes(); + RegisterGimmickMessageTypes(); mSettings=0; mSynchronizer=0; + mLocalDescpName = "localdatabase_Descriptor.dscp"; + mLocalDBName = "Local database"; } //============================================================== @@ -24,28 +32,31 @@ namespace creaImageIO //============================================================== Gimmick::~Gimmick() { + if(mSettings!=0) { - mSettings->writeSettingsFile(); - delete mSettings; + mSettings->writeSettingsFile(); + delete mSettings; } - if(mSynchronizer!=0) + if(mSynchronizer!=0) { - delete mSynchronizer; + delete mSynchronizer; } } //============================================================== //============================================================== - void Gimmick::Initialize(const std::string& path) + void Gimmick::Initialize(const std::string i_namedescp, const std::string i_namedb) { + mLocalDescpName = i_namedescp; + mLocalDBName = i_namedb; Initialize(); } //============================================================== void Gimmick::Initialize() { - std::string i_nameDB = "Local database"; + std::string i_nameDB = mLocalDBName; // Create the UserSettings dir if does not exist CreateUserSettingsDirectory(); // Sets the current directory to the home dir @@ -56,7 +67,7 @@ namespace creaImageIO std::string dbpath = GetLocalDatabasePath(); // Create or open local database - std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/localdatabase_Descriptor.dscp"; + std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/" + mLocalDescpName; boost::algorithm::replace_all( dpath, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR); @@ -74,8 +85,8 @@ namespace creaImageIO // @param i_location : DB location // // return : - // //////////////////////////////////////////////////////////////////////// - void Gimmick::addDB(const std::string &i_name, - const std::string &i_location) + void Gimmick::addDB(const std::string &i_name, + const std::string &i_location) { if(mTreeHandlerMap.find(i_name) == mTreeHandlerMap.end()) { @@ -85,18 +96,18 @@ namespace creaImageIO } } - //////////////////////////////////////////////////////////////////////// - // create a DB from a attributes descriptor file for medical images // - // @param i_name : DB name // - // @param i_locDesc : location of descriptor file // - // @param i_locDB : location of DB // - // return : the SQLiteTreeHandler object on DB // - ////////////////////////////////////////////////////////////////// - SQLiteTreeHandler *Gimmick::createDB(const std::string &i_name, + /////////////////////////////////////////////////////////////////////////// + // create a DB from a attributes descriptor file for medical images // + // @param i_name : DB name // + // @param i_locDesc : location of descriptor file // + // @param i_locDB : location of DB // + // return : the SQLiteTreeHandler object on DB // + ///////////////////////////////////////////////////////////////////////// + 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) ) { @@ -108,7 +119,7 @@ namespace creaImageIO // CREATING DB STRUCTURE sqlTreeH->GetTree().GetDescriptor().createDescriptorfromFile(i_locDesc); if ( ! sqlTreeH->Create(true) ) - { + { GimmickError("ERROR CREATING '"<SetAttribute(0,"Name",i_name); @@ -116,7 +127,8 @@ namespace creaImageIO else { /// Open and test it - GimmickMessage(1,"Opening local database '" <Open(true) ) { GimmickError("ERROR OPENING '"<second; - } + if(mTreeHandlerMap.size() >0) + { + // delete SQLiteTreeHandler Object + for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin(); + it!= mTreeHandlerMap.end(); + ++it) + { + delete it->second; + } + } } //============================================================== @@ -184,7 +199,9 @@ namespace creaImageIO if (mLocalDatabasePath.size()==0) { mLocalDatabasePath = GetUserSettingsDirectory(); - mLocalDatabasePath += "Shared/gimmick/local_database.sqlite3"; + mLocalDatabasePath += "Shared/gimmick/"; + mLocalDatabasePath += mLocalDBName; + mLocalDatabasePath +=".sqlite3"; boost::algorithm::replace_all( mLocalDatabasePath, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR); @@ -197,10 +214,34 @@ namespace creaImageIO //======================================================================== void Gimmick::CreateUserSettingsDirectory() { - if (! boost::filesystem::is_directory( GetUserSettingsDirectory() ) ) + // std::string st("C:/Documents and Settings/cervenansky/.gimmick/"); + // boost::algorithm::replace_all( st, + // INVALID_FILE_SEPARATOR , + // VALID_FILE_SEPARATOR); + //const boost::filesystem::path mpath(st); +//C:\Documents and Settings\cervenansky\.gimmick"); + //if ( !boost::filesystem::exists( path ) ) return ; + // boost::filesystem::directory_iterator end_itr; // default construction yields past-the-end + // for ( boost::filesystem::directory_iterator itr( path ); itr != end_itr; ++itr ) + // { + //// If is directory & recurse : do recurse + // if ( boost::filesystem::is_directory(itr->status()) ) + // return; + // } + + //JCP settings dir 02/10/2009 + const std::string settingsdirectory = GetUserSettingsDirectory(); + //boost::algorithm::replace_all( mUserSettingsDirectory, + // INVALID_FILE_SEPARATOR , + // VALID_FILE_SEPARATOR); +;//("E:\frederic"); + //("C:\\Documents and Settings\\cervenansky\\.gimmick\\"); // settingsdirectory ); + bool isdir = false; + isdir = boost::filesystem::is_directory(settingsdirectory); // settingsdirectory ); + if (! isdir ) { GimmickMessage(1,"Directory '"<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); @@ -381,23 +423,24 @@ 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); } //========================================================================