#2500 creaImageIO Bug New Normal - Boost signals deprecated -> signals2 (cleanning...

[creaImageIO.git] / src / creaImageIOTreeHandlerImageAdder.h

diff --git a/src/creaImageIOTreeHandlerImageAdder.h b/src/creaImageIOTreeHandlerImageAdder.h
index 252e78833e295f7345065751b26834a15309af6f..79c855e986b5f44d786104685399603bb7b29064 100644 (file)
--- a/src/creaImageIOTreeHandlerImageAdder.h
+++ b/src/creaImageIOTreeHandlerImageAdder.h
@@ -1,3 +1,30 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------
+*/
+
 #ifndef __creaImageIOTreeHandlerImageAdder_h_INCLUDED__
 #define __creaImageIOTreeHandlerImageAdder_h_INCLUDED__
 
@@ -7,7 +34,7 @@
 //#include <creaImageIOImageWriter.h>
 
 // Signal/slot mechanism for progress events
-#include <boost/signal.hpp>
+#include <boost/signals2/signal.hpp>
 #include <boost/bind.hpp>
 #if defined(USE_GDCM2)
 #include "creaImageIODicomScanner.h"
@@ -85,7 +112,7 @@ namespace creaImageIO
     //=============================================
 
     //=============================================
-    typedef boost::signal<void (Progress&)>  ProgressSignalType;
+    typedef boost::signals2::signal<void (Progress&)>  ProgressSignalType;
     typedef ProgressSignalType::slot_function_type ProgressCallbackType;
     //=============================================
 
@@ -119,6 +146,9 @@ namespace creaImageIO
        void RemoveFile(tree::Node* node);
        /// Removes files from the databases
        void RemoveFiles(const std::vector<tree::Node*>& nodes);
+
+    void remove( tree::Node* i_node);
+
        /// Synchronizes the DB and disk by repeating the operations the user has done and returns a report
        std::string Synchronize(bool repair, bool checkAttributes);
        ///Recursively checks if the directory is synchronized and optionally the state of the attributes
@@ -155,7 +185,9 @@ namespace creaImageIO
        void GetAttributes(const std::vector<std::string>& params, 
          const std::string& filename, 
          std::vector<std::string>& results);
-  
+
+       /// Test if an attribute is referenced for a given treeHandler
+       const std::string isAttributeExist(const std::string i_attr);