X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmick.cpp;h=09a6fd00685fdd34328f9ef18ae91fd960039354;hb=75778b43c0c928b88c6dc93f2c8b2c1ac6af59e5;hp=f5d21100df39391a3be34cd7251915189e6cc4d2;hpb=e13ea6551e8721b11998dc33ddccf3f89458f173;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index f5d2110..09a6fd0 100644
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -10,8 +10,6 @@
 
 namespace creaImageIO
 {
-
-
   //==============================================================
   Gimmick::Gimmick()
     : mImageAdder(0)
@@ -23,7 +21,6 @@ namespace creaImageIO
   //==============================================================
 
 
-
   //==============================================================
   Gimmick::~Gimmick()
   {
@@ -53,33 +50,30 @@ 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 : -														//
-  ///////////////////////////////////////////////////////////////////////
+   // 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)
 	{
@@ -91,14 +85,13 @@ 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						   //
-	/////////////////////////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////////////////////////
+  // 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)
@@ -115,8 +108,8 @@ namespace creaImageIO
 		 // CREATING DB STRUCTURE
          sqlTreeH->GetTree().GetDescriptor().createDescriptorfromFile(i_locDesc);
          if ( ! sqlTreeH->Create(true) )
-		 {
-			GimmickError("ERROR CREATING '"<<i_locDB<<"'");
+	{
+		GimmickError("ERROR CREATING '"<<i_locDB<<"'");
          }
          sqlTreeH->SetAttribute(0,"Name",i_name);
 	 }
@@ -124,15 +117,14 @@ namespace creaImageIO
 	 {
 		/// Open and test it
 		GimmickMessage(1,"Opening local database '" <<i_locDB<< "' " << std::endl);
-        if ( !sqlTreeH->Open(true) )
+        	if ( !sqlTreeH->Open(true) )
 		{
 			GimmickError("ERROR OPENING '"<<i_locDB<<"'");
 		}
-      }
-	 return sqlTreeH;
+	}
+	return sqlTreeH;
   }
 
-
   //==============================================================
   void Gimmick::Finalize()
   {
@@ -200,7 +192,6 @@ namespace creaImageIO
     return mLocalDatabasePath;    
   }
 
-
   //========================================================================
 
   //========================================================================
@@ -225,7 +216,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 +229,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: "<<path<<std::endl;
-		std::cout<<"To: "<<setDir<<std::endl;
-		boost::algorithm::replace_all( path,
+
+// The following stuff works on Linux, NOT CHECKED on Windows // JPR
+		
+#if defined(_WIN32)		
+		path+="/bin/Shared/gimmick/localdatabase_Descriptor.dscp";
+#else		
+		path+="/Shared/gimmick/localdatabase_Descriptor.dscp";
+#endif		
+		std::cout <<"From: " << path   <<std::endl;
+		std::cout <<"To: "   << setDir <<std::endl;
+		boost::algorithm::replace_all(	path,
 						INVALID_FILE_SEPARATOR , 
 						VALID_FILE_SEPARATOR);
 		boost::filesystem::copy_file(path,setDir);
@@ -279,8 +277,6 @@ namespace creaImageIO
     return i->second;
   }
 
-
-
   //========================================================================
   /// Add the files to the tree handler
   void Gimmick::AddFiles(const std::string& d, 
@@ -291,7 +287,7 @@ namespace creaImageIO
 	mImageAdder.SetCurrentDatabase(d);
     mImageAdder.SetTreeHandler(GetTreeHandler(d));
 	mImageAdder.SetSynchronizer(mSynchronizer);
-    mImageAdder.AddFiles(filenames);
+	mImageAdder.AddFiles(filenames);
 	
   }
   //========================================================================
@@ -405,12 +401,11 @@ namespace creaImageIO
   }
   //========================================================================
 
-
-  /////////////////////////////////////////////////////////////////////////
-  // add DB from Settings file										     //
-  // @param : -															 //
-  // return : -															 //
-  /////////////////////////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////////////////////////
+  // add DB from Settings file						//
+  // @param : -								//
+  // return : -								//
+  ////////////////////////////////////////////////////////////////////////
   void Gimmick::addDBSettings()
   {
 
@@ -437,7 +432,5 @@ namespace creaImageIO
 		 std::string name = it_path->substr(pos +1, last_pos -pos-1 );
 		 addDB(name, it_path->c_str());
 	 }
-
-  }
-	
+  }	
 }