correctios to use gdcm2

[creaImageIO.git] / src2 / creaImageIOGimmick.cpp

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index 04e8c689f0c40c5397be670448cdb5113a29ea20..b72b477446621dfd71e56bb50635cd3820a8c702 100644 (file)
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -8,7 +8,10 @@
 #ifndef PATH_MAX // If not defined yet : do it 
 #  define PATH_MAX 2048
 #endif
-
+#include <creaImageIOGimmick.h>
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 
 
 namespace creaImageIO
@@ -29,6 +32,7 @@ namespace creaImageIO
   //==============================================================
   Gimmick::~Gimmick()
   {
+
         if(mSettings!=0)
          {
                mSettings->writeSettingsFile();
@@ -62,8 +66,10 @@ namespace creaImageIO
     mSettings  = new Settings(mCurrentDirectory);
        
     std::string dbpath = GetLocalDatabasePath();
+
     // Create or open local database
     std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/" + mLocalDescpName;
+       
     boost::algorithm::replace_all( dpath,
                                   INVALID_FILE_SEPARATOR , 
                                   VALID_FILE_SEPARATOR);
@@ -210,6 +216,7 @@ namespace creaImageIO
   //========================================================================
   void Gimmick::CreateUserSettingsDirectory()
   {
+         
         // std::string st("C:/Documents and Settings/cervenansky/.gimmick/");
         //     boost::algorithm::replace_all( st, 
                //                     INVALID_FILE_SEPARATOR , 
@@ -258,7 +265,6 @@ namespace creaImageIO
        if(!boost::filesystem::is_regular(setDir))
        {
                char name[PATH_MAX];
-//EED          int err = GetBinaryDirectory(name, PATH_MAX);
                crea::System::GetAppPath(name,PATH_MAX);
                std::cout<<name<<std::endl;
                
@@ -271,11 +277,18 @@ namespace creaImageIO
                
 #if defined(_WIN32)            
                path+="/bin/Shared/gimmick/";
-               path+=mLocalDescpName;
-#else          
-               path+="/Shared/gimmick/";
-               path+= mLocalDescpName;
-#endif         
+#endif
+
+#if defined (LINUX)
+               path+="/../share/gimmick/";
+#endif 
+#if defined(__APPLE__)
+               path+="/../../../../share/gimmick/";
+#endif 
+
+
+path+= mLocalDescpName;
+               
                std::cout <<"From: " << path   <<std::endl;
                std::cout <<"To: "   << setDir <<std::endl;
                boost::algorithm::replace_all(  path,
@@ -283,6 +296,7 @@ namespace creaImageIO
                                                VALID_FILE_SEPARATOR);
                boost::filesystem::copy_file(path,setDir);
        }
+         
   }
   //========================================================================