X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOGimmick.cpp;h=5b01f748f41d2b3f0ee747cccb7292c368806508;hb=0d75ab3cb25deacda0547d4156ebef481396c62e;hp=3ee74200b5422fecc40150d582903add50253e21;hpb=3389d962d93ac6547944fb52a53acbb73be74706;p=creaImageIO.git

diff --git a/src/creaImageIOGimmick.cpp b/src/creaImageIOGimmick.cpp
index 3ee7420..5b01f74 100644
--- a/src/creaImageIOGimmick.cpp
+++ b/src/creaImageIOGimmick.cpp
@@ -1,6 +1,32 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------
+*/
 
 #include <creaImageIOGimmick.h>
-#include <creaImageIOSystem.h>
+
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 
@@ -10,6 +36,10 @@
 #endif
 #include <creaImageIOGimmick.h>
 
+#if defined(_WIN32)
+#pragma warning(disable: 4996)
+#endif
+
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #endif
@@ -62,14 +92,14 @@ namespace creaImageIO
     CreateUserSettingsDirectory();
     // Sets the current directory to the home dir
     mCurrentDirectory =  GetHomeDirectory();
-    mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"share/gimmick/");
+    mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"share/creaImageIO/");
 
     mSettings  = new Settings(mCurrentDirectory);
 	
     std::string dbpath = GetLocalDatabasePath();
 
     // Create or open local database
-    std::string dpath= mCurrentDirectory + "/.gimmick/share/gimmick/" + mLocalDescpName;
+    std::string dpath= mCurrentDirectory + "/.creaImageIO/share/creaImageIO/" + mLocalDescpName;
 	
     boost::algorithm::replace_all( dpath,
 				   INVALID_FILE_SEPARATOR , 
@@ -186,7 +216,7 @@ namespace creaImageIO
     if (mUserSettingsDirectory.size()==0) 
       {
 	mUserSettingsDirectory = GetHomeDirectory();
-	mUserSettingsDirectory += "/.gimmick/";
+	mUserSettingsDirectory += "/.creaImageIO/";
 	boost::algorithm::replace_all( mUserSettingsDirectory, 
 				       INVALID_FILE_SEPARATOR , 
 				       VALID_FILE_SEPARATOR);
@@ -202,7 +232,7 @@ namespace creaImageIO
     if (mLocalDatabasePath.size()==0) 
       {
 	mLocalDatabasePath = GetUserSettingsDirectory();
-	mLocalDatabasePath += "share/gimmick/";
+	mLocalDatabasePath += "share/creaImageIO/";
 	mLocalDatabasePath += mLocalDBName;
 	mLocalDatabasePath +=".sqlite3";
 	boost::algorithm::replace_all( mLocalDatabasePath,
@@ -259,7 +289,7 @@ namespace creaImageIO
 				       VALID_FILE_SEPARATOR);
 	setDir+="share/";
 	boost::filesystem::create_directory( setDir );
-	setDir+="gimmick/";
+	setDir+="creaImageIO/";
 	boost::filesystem::create_directory( setDir );
 	setDir+=mLocalDescpName;
 
@@ -277,14 +307,14 @@ namespace creaImageIO
 // The following stuff works on Linux, NOT CHECKED on Windows // JPR
 		
 #if defined(_WIN32)		
-		path+="/bin/share/gimmick/";
+		path+="/bin/share/creaImageIO/";
 #endif
 
 #if defined (LINUX)
-		path+="/../share/gimmick/";
+		path+="/../share/creaImageIO/";
 #endif	
 #if defined(__APPLE__)
-		path+="/../../../../share/gimmick/";
+		path+="/../../../../share/creaImageIO/";
 #endif 
 
 
@@ -443,12 +473,10 @@ path+= mLocalDescpName;
 		   else
 		   {
 			    std::vector<std::string>::iterator it = i_attr.inside.begin();
-			   for(; it != i_attr.inside.end(); it++)
+			    for(; it != i_attr.inside.end(); it++)
 				   i_res[(*it)] = map_attr[(*it)];
 		   }
 	   }
-	   
-
   }
 
 
@@ -532,13 +560,26 @@ void Gimmick::fillVectInfos(std::vector<std::string> i_attr, OutputAttr &infos)
 	{
 		if( mImageAdder.isAttributeExist((*it)) != "" ) // in DB
 		{
+printf("EED Gimmick::fillVectInfos inside %s\n",(*it).c_str());
 			infos.inside.push_back((*it));
 		}
 		else
 		{
 				infos.outside.push_back((*it)); // Need to scan again the files
+printf("EED Gimmick::fillVectInfos outside %s\n",(*it).c_str());
 		}
 	}
 }
 
-}
\ No newline at end of file
+const std::string Gimmick::getSummary()
+{
+      const AddProgress& p = GetAddProgress();
+    std::stringstream mess;
+    mess << "Dirs \tscanned\t: " << p.GetNumberScannedDirs()  << "\n";
+    mess << "Files\tscanned\t: " << p.GetNumberScannedFiles() << "\n";
+    mess << "Files\thandled\t: " << p.GetNumberHandledFiles() << "\n\n";
+    mess << "Files\tadded  \t: " << p.GetNumberAddedFiles()   << "\n\n";
+    return mess.str();
+}
+
+}