vtkImageData* image)
{
wxMutexLocker lock(mMultiThreadImageReaderUserMutex);
-
this->OnMultiThreadImageReaderEvent(filename,type,image);
}
//=====================================================================
ThreadedImageReader(MultiThreadImageReader* tir) :
mMultiThreadImageReader(tir)
{}
-
void* Entry();
void OnExit();
-
vtkImageData* Read(const std::string& filename);
-
struct deleter
{
void operator()(ThreadedImageReader* p)
};
friend struct deleter;
-
private:
ImageReader mReader;
MultiThreadImageReader* mMultiThreadImageReader;
-
};
//=====================================================================
mDone = false;
// Create the threads
+
+printf("EED MultiThreadImageReader::MultiThreadImageReader %d \n", number_of_threads);
+
for (int i=0; i<number_of_threads; i++)
{
//ThreadedImageReader* t = new ThreadedImageReader(this);
//=====================================================================
bool MultiThreadImageReader::Start()
{
-
+printf("EED MultiThreadImageReader::Start Start\n");
// std::cout << "#### MultiThreadImageReader::Start()"
// <<std::endl;
if (mNumberOfThreadedReadersRunning > 0) return true;
for (i =mThreadedImageReaderList.begin();
i!=mThreadedImageReaderList.end();
i++)
- {
- (*i)->Create();
- if ( (*i)->Run() != wxTHREAD_NO_ERROR )
- {
- std::cout << "ERROR starting a thread"<< std::endl;
- return false;
- }
- else
- {
- std::cout << " ===> Thread "<<(*i)->GetCurrentId()
- <<" successfully created"<< std::endl;
-
- }
- }
- wxMutexLocker locker(GetMultiThreadImageReaderUserMutex());
- // std::cout << "EO Start : #Threads running = "
- // << mNumberOfThreadedReadersRunning<<std::endl;
-
+ {
+ (*i)->Create();
+ if ( (*i)->Run() != wxTHREAD_NO_ERROR )
+ {
+ std::cout << "ERROR starting a thread"<< std::endl;
+ return false;
+ } else {
+ std::cout << " ===> Thread "<<(*i)->GetCurrentId()
+ <<" successfully created"<< std::endl;
+ } // if
+ } // for
+ wxMutexLocker locker(GetMultiThreadImageReaderUserMutex());
+ // std::cout << "EO Start : #Threads running = "
+ // << mNumberOfThreadedReadersRunning<<std::endl;
+printf("EED MultiThreadImageReader::Start Start\n");
return true;
}
//=====================================================================
//=====================================================================
void MultiThreadImageReader::Stop()
{
+printf("EED MultiThreadImageReader::Stop Start\n");
// std::cout << "#### MultiThreadImageReader::Stop()"
// <<std::endl;
// std::cout << "Sending stop order to the threads..."<<std::endl;
+
if (mDone) return;
ThreadedImageReaderListType::iterator i;
for (i =mThreadedImageReaderList.begin();
i!=mThreadedImageReaderList.end();
i++)
- { std::cout << " ===> Thread "<<(*i)->GetCurrentId()
+ {
+ std::cout << " ===> Thread "<<(*i)->GetCurrentId()
<<" successfully stopped"<< std::endl;
if((*i)->IsAlive())
- {(*i)->Pause();
+ {
+ (*i)->Pause();
(*i).reset();
- // (*i)->Delete();
- }
- }
+// (*i)->Delete();
+ } // if i
+ } // for
mThreadedImageReaderList.clear();
// Wait a little to be sure that all threads have stopped
// A better way to do this ?
// std::cout << "All threads stopped : OK "<<std::endl;
ImageMapType::iterator j;
- for (j =mImages.begin();
- j!=mImages.end();
- ++j)
-
- {
- delete j->first;
- }
+ for (j =mImages.begin(); j!=mImages.end(); ++j)
+ {
+ delete j->first;
+ } //for
mImages.clear();
mDone = true;
+printf("EED MultiThreadImageReader::Stop End\n");
}
//=====================================================================
//=====================================================================
MultiThreadImageReader::~MultiThreadImageReader()
{
+printf("EED MultiThreadImageReader::~MultiThreadImageReader Start\n");
// std::cout << "#### MultiThreadImageReader::~MultiThreadImageReader()"
// <<std::endl;
Stop();
if (mReader) delete mReader;
mThreadedImageReaderList.clear();
+printf("EED MultiThreadImageReader::~MultiThreadImageReader End\n");
}
//=====================================================================
// 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);
// std::cout << "### Thread "<<GetCurrentId()<<" : reading '"
// << i->GetFilename() << "' : DONE" << std::endl;
- }
- else
- {
+ } else {
mMultiThreadImageReader->MultiThreadImageReaderEventUnlock();
//mMutex.Unlock();
// Wait a little to avoid blocking