From: Frederic Cervenansky Date: Tue, 28 Apr 2009 09:54:49 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: EED.02Oct2009~90 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=cc5a912f64e8de1f90d9ef0956633515a46d31ae;p=creaImageIO.git *** empty log message *** --- diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp index 2d759d0..90dc2c8 100644 --- a/src2/creaImageIOGimmick.cpp +++ b/src2/creaImageIOGimmick.cpp @@ -39,7 +39,7 @@ namespace creaImageIO std::string dbpath = GetLocalDatabasePath(); // Create or open local database - mLocalDatabase = createDB( mCurrentDirectory + "\\.gimmick\\localdatabase_Descriptor.txt", dbpath); + mLocalDatabase = createDB(i_nameDB, mCurrentDirectory + "\\.gimmick\\localdatabase_Descriptor.txt", dbpath); // Add it to the TreeHandlerMap mTreeHandlerMap[i_nameDB] = mLocalDatabase; @@ -88,11 +88,12 @@ 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(std::string &i_locDesc, std::string &i_locDB) + SQLiteTreeHandler *Gimmick::createDB(std::string &i_name, std::string &i_locDesc, std::string &i_locDB) { SQLiteTreeHandler *sqlTreeH = new SQLiteTreeHandler(i_locDB); // Create or open local database @@ -109,7 +110,7 @@ namespace creaImageIO { GimmickError("ERROR CREATING '"<SetAttribute(0,"Name","i_name"); + sqlTreeH->SetAttribute(0,"Name",i_name); } else { @@ -127,6 +128,7 @@ namespace creaImageIO //============================================================== void Gimmick::Finalize() { + // delete SQLiteTreeHandler Object for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin(); it!= mTreeHandlerMap.end(); ++it) diff --git a/src2/creaImageIOGimmick.h b/src2/creaImageIOGimmick.h index b7fd647..fa39035 100644 --- a/src2/creaImageIOGimmick.h +++ b/src2/creaImageIOGimmick.h @@ -99,7 +99,7 @@ namespace creaImageIO void Print(const std::string& handler); ///create a DB from a given descriptor file and for a specific location - SQLiteTreeHandler *createDB(std::string &i_locDesc, std::string &i_locDB); + SQLiteTreeHandler *createDB(std::string &i_name, std::string &i_locDesc, std::string &i_locDB); // add an existent DB void addDB(std::string &i_nameDB, std::string &i_locationDB); diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index 70c845c..9c3ab83 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -660,8 +660,9 @@ namespace creaImageIO FD->GetPaths(files); for(int i = 0; i< files.size(); i++) { - // gimmick->addDB("remote_" + i.c_str(),files[i]); - // AddTreeHandler(gimmick->getTreeHandlerMap("remote_" + i.c_str())); + std::string snb = "remote_1"; + mGimmick->addDB(snb, crea::wx2std(files[i])); + // UpdateTreeViewLevel("remote_1",1); } }