memory leak tracking

[creaImageIO.git] / src2 / creaImageIOGimmick.cpp

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index 09a6fd00685fdd34328f9ef18ae91fd960039354..e168c3769baa12b10a85243a77011076f39a6e81 100644 (file)
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -1,3 +1,4 @@
+
 #include <creaImageIOGimmick.h>
 
 #include <creaImageIOSystem.h>
@@ -8,13 +9,17 @@
 #  define PATH_MAX 2048
 #endif
 
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
 namespace creaImageIO
 {
   //==============================================================
   Gimmick::Gimmick()
     : mImageAdder(0)
   {    
-    RegisterGimmickMessageTypes();
+  RegisterGimmickMessageTypes();
        mSettings=0;
        mSynchronizer=0;
   }
@@ -26,12 +31,12 @@ namespace creaImageIO
   {
         if(mSettings!=0)
          {
-         mSettings->writeSettingsFile();
-      delete mSettings;
+               mSettings->writeSettingsFile();
+               delete mSettings;
          }
-         if(mSynchronizer!=0)
+       if(mSynchronizer!=0)
          {
-         delete mSynchronizer;
+               delete mSynchronizer;
          }
   }
   //==============================================================
@@ -74,8 +79,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 +90,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 +113,7 @@ namespace creaImageIO
                 // CREATING DB STRUCTURE
          sqlTreeH->GetTree().GetDescriptor().createDescriptorfromFile(i_locDesc);
          if ( ! sqlTreeH->Create(true) )
-       {
+        {
                GimmickError("ERROR CREATING '"<<i_locDB<<"'");
          }
          sqlTreeH->SetAttribute(0,"Name",i_name);
@@ -131,7 +136,8 @@ namespace creaImageIO
         
          // delete SQLiteTreeHandler Object
           for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin();
-           it!= mTreeHandlerMap.end(); ++it)
+                                                   it!= mTreeHandlerMap.end(); 
+                                                  ++it)
           {
                   delete it->second;
           }
@@ -285,10 +291,9 @@ namespace creaImageIO
     GimmickMessage(2,"Adding files to '"<<d<<"'"<<std::endl);
  
        mImageAdder.SetCurrentDatabase(d);
-    mImageAdder.SetTreeHandler(GetTreeHandler(d));
+       mImageAdder.SetTreeHandler(GetTreeHandler(d));
        mImageAdder.SetSynchronizer(mSynchronizer);
-       mImageAdder.AddFiles(filenames);
-       
+       mImageAdder.AddFiles(filenames);        
   }
   //========================================================================
 
@@ -297,14 +302,14 @@ namespace creaImageIO
   void Gimmick::AddDir(const std::string& d, const std::string& f, 
                       bool recurse)
   {
-    GimmickMessage(2,"Adding dir '"<<f<<"' to '"<<d<<"' recurse:"
-                  <<recurse<<std::endl);
+       GimmickMessage(2,"Adding dir '"<<f<<"' to '"<<d<<"' recurse:"
+                        <<recurse<<std::endl);
 
        TreeHandler * handler=GetTreeHandler(d);
        mImageAdder.SetCurrentDatabase(d);
-    mImageAdder.SetTreeHandler(handler);
+       mImageAdder.SetTreeHandler(handler);
        mImageAdder.SetSynchronizer(mSynchronizer);
-    mImageAdder.AddDirectory(f,recurse);  
+       mImageAdder.AddDirectory(f,recurse);  
   }
 
   //========================================================================
@@ -351,16 +356,16 @@ namespace creaImageIO
 
   void Gimmick::GetSetting(const std::string& name, std::string& value)
   {
-         value = mSettings->getValue(name);
+    value = mSettings->getValue(name);
   }
   //========================================================================
 
   //========================================================================
 
   void Gimmick::GetAttributes(const std::string& d, 
-         const std::string& filename, 
-         const std::vector<std::string>& params, 
-         std::vector<std::string>& results)
+                       const std::string& filename, 
+                       const std::vector<std::string>& params, 
+                       std::vector<std::string>& results)
   {
          TreeHandler * handler=GetTreeHandler(d);
          mImageAdder.SetCurrentDatabase(d);
@@ -381,23 +386,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);
   }
   //========================================================================