#3208 creaImageIO Feature New Normal - branch mingw64

[creaImageIO.git] / src / creaImageIOMultiThreadImageReader.cpp

diff --git a/src/creaImageIOMultiThreadImageReader.cpp b/src/creaImageIOMultiThreadImageReader.cpp
index 3ee50de9a2e558912cfe0d8ac0e489e2cc1cd209..1679136d3c239fdd7573e51f4d194b942aae21f6 100644 (file)
--- a/src/creaImageIOMultiThreadImageReader.cpp
+++ b/src/creaImageIOMultiThreadImageReader.cpp
@@ -1,3 +1,31 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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 <creaImageIOMultiThreadImageReader.h>
 #include <creaImageIOImageReader.h>
 #include <wx/utils.h>
@@ -91,7 +119,6 @@ namespace creaImageIO
   //=====================================================================
   bool MultiThreadImageReader::Start()
   {
-
     //    std::cout << "#### MultiThreadImageReader::Start()"
     //               <<std::endl;
          if (mNumberOfThreadedReadersRunning > 0) return true;
@@ -211,6 +238,12 @@ namespace creaImageIO
      }
   }
   //=====================================================================
+  // function to read attributes for a file
+  void MultiThreadImageReader::getAttributes(const std::string filename, 
+         std::map <std::string , std::string> &infos,std::vector<std::string> i_attr)
+  {
+         mReader->getAttributes(filename, infos, i_attr);
+  }
 
   //=====================================================================
   void MultiThreadImageReader::Request( MultiThreadImageReaderUser* user,
@@ -429,7 +462,9 @@ namespace creaImageIO
     //    std::cout << "user="<<p->GetUser() <<std::endl;
 
     if ( p->GetUser() == this ) 
+       {
       GetMultiThreadImageReaderUserMutex().Unlock();
+       }
 
     p->GetUser()->MultiThreadImageReaderSendEvent
       (p->GetFilename(),
@@ -446,9 +481,22 @@ namespace creaImageIO
     //    wxMutexLocker lock(GetMultiThreadImageReaderUserMutex());
           
     mUnloadQueue.insert(p);
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     p->GetImage()->UpdateInformation();
     p->GetImage()->PropagateUpdateExtent();
     long ImMem = p->GetImage()->GetEstimatedMemorySize();
+#else
+       int ext[6];
+       int dim[3];
+       p->GetImage()->GetExtent(ext);
+       dim[0]          = ext[1]-ext[0]+1;
+       dim[1]          = ext[3]-ext[2]+1;
+       dim[2]          = ext[5]-ext[4]+1;
+    long ImMem         = dim[0]*dim[1]*dim[2]*p->GetImage()->GetScalarSize();;
+#endif
     mTotalMem += ImMem;
 
     GimmickMessage(5,"==> Image in memory = "<<mUnloadQueue.size()<<std::endl);
@@ -483,7 +531,19 @@ namespace creaImageIO
        std::string filename = unload->GetFilename();
 
        GimmickMessage(5,"'" << filename << "'" << std::endl);
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        mTotalMem -= unload->GetImage()->GetEstimatedMemorySize();
+#else
+       int ext[6];
+       int dim[3];
+       unload->GetImage()->GetExtent(ext);
+       dim[0]          = ext[1]-ext[0]+1;
+       dim[1]          = ext[3]-ext[2]+1;
+       dim[2]          = ext[5]-ext[4]+1;
+       mTotalMem -= dim[0]*dim[1]*dim[2]*unload->GetImage()->GetScalarSize();
+#endif
 
        GimmickMessage(5," ==> Total mem = "<<mTotalMem<<" Ko "<<std::endl);