// std::cout << "user="<<p->GetUser() <<std::endl;
if ( p->GetUser() == this )
+ {
GetMultiThreadImageReaderUserMutex().Unlock();
+ }
p->GetUser()->MultiThreadImageReaderSendEvent
(p->GetFilename(),
// 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);
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);