X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOGimmick.h;h=0a880875e5280727c533608da706f958c901e203;hb=2a666dd833520248172d1158171cbb995b7e8ec2;hp=8085f69ac86a5567eb9114390d6735e9d5f202e5;hpb=e13ea6551e8721b11998dc33ddccf3f89458f173;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmick.h b/src2/creaImageIOGimmick.h
index 8085f69..0a88087 100644
--- a/src2/creaImageIOGimmick.h
+++ b/src2/creaImageIOGimmick.h
@@ -6,6 +6,39 @@
 #include <creaImageIOSynchron.h>
 #include <creaImageIOSettings.h>
 
+
+
+#ifdef _DEBUG
+#include <crtdbg.h>
+#define DEBUG_NEW new(_NORMAL_BLOCK ,__FILE__, __LINE__)
+#else
+#define DEBUG_NEW new
+#endif
+// Only when asked
+/*
+#ifdef TRACKING_MEMORY_LEAKS
+#ifdef WIN32
+#pragma warning(disable : 4291)
+#endif
+
+void * operator new( size_t size, int line, const char *file );
+void * operator new[]( size_t size, int line, const char *file );
+void operator delete( void *p );
+void operator delete[]( void *p );
+
+#ifdef OMISCID_NEW
+#undef OMISCID_NEW
+#endif
+
+#define OMISCID_NEW new( __LINE__, __FILE__ )
+
+#else // TRACKING_MEMORY_LEAKS is not defined
+
+#define OMISCID_NEW new
+
+#endif*/
+
+
 namespace creaImageIO
 {
 	/**
@@ -58,7 +91,6 @@ namespace creaImageIO
      void ConnectAddProgressObserver( AddProgressCallbackType callback )
     { mImageAdder.ConnectProgressObserver(callback); }
     
-
     ///
     const AddProgress& GetAddProgress() const { return mImageAdder.GetProgress(); }
 
@@ -66,7 +98,7 @@ namespace creaImageIO
     void Initialize();
 
 	/// Initializes with the local database descriptor in the path given (read/creates databases, etc.)
-    void Initialize(const std::string& path);
+	void Initialize(const std::string namedescp, const std::string namedb = "Local Database");
     
     /// Finalize (closes databases, etc.)
     void Finalize();
@@ -77,14 +109,13 @@ namespace creaImageIO
     static void SetDebugMessageLevel(int level);
     
     /// Type of map from TreeHandler name to TreeHandler*
-    typedef std::map<std::string, TreeHandler*> TreeHandlerMapType;
+	typedef std::map<std::string, TreeHandler*> TreeHandlerMapType;
 
     /// Returns the TreeHandlerMap (ref)
     TreeHandlerMapType& GetTreeHandlerMap() { return mTreeHandlerMap; }
     /// Returns the TreeHandlerMap (const ref)
     const TreeHandlerMapType& GetTreeHandlerMap() const
-    { return mTreeHandlerMap; }
-    
+    { return mTreeHandlerMap; }    
 
     /// Add the files to the given TreeHandler
     void AddFiles(const std::string& handler,
@@ -114,7 +145,7 @@ namespace creaImageIO
     void Print(const std::string& handler);
 	
     ///create a DB from a given descriptor file and for a specific location
-    SQLiteTreeHandler *createDB(const std::string &i_name, 
+	SQLiteTreeHandler* createDB(const std::string &i_name, 
 				const std::string &i_locDesc, 
 				const std::string &i_locDB);
 
@@ -125,10 +156,9 @@ namespace creaImageIO
     TreeHandler* GetTreeHandler(const std::string& name) const;
 
 	/// 
-    SQLiteTreeHandler* GetLocalDatabase() { return mLocalDatabase; }
+	SQLiteTreeHandler* GetLocalDatabase() { return mLocalDatabase; }
 
-    const SQLiteTreeHandler* GetLocalDatabase() const 
-    { return mLocalDatabase; }
+    const SQLiteTreeHandler* GetLocalDatabase() const     { return mLocalDatabase; }
 
 	///Returns the given setting value for the given setting parameter
 	void GetSetting(const std::string& name, std::string& value);
@@ -158,7 +188,7 @@ namespace creaImageIO
 
     //=============================================
   private:
-    SQLiteTreeHandler* mLocalDatabase;
+	SQLiteTreeHandler* mLocalDatabase;
 	TreeHandlerMapType mTreeHandlerMap;
 	Synchronizer* mSynchronizer;
 
@@ -168,6 +198,8 @@ namespace creaImageIO
     std::string mLocalDatabasePath;
 	Settings	*mSettings;
     TreeHandlerImageAdder mImageAdder;
+	std::string mLocalDBName;
+	std::string mLocalDescpName;
   };
   // EO class Gimmick
   //=======================================================================