Debugged the thread and added a deletion on exit

diff --git a/src2/creaImageIOGimmickView.h b/src2/creaImageIOGimmickView.h
index 2a977bf88b9cdeb7e9a25730713a6bb64e325899..57faaa73d161399dbafabaa530f3f05e21f6d20a 100644 (file)
--- a/src2/creaImageIOGimmickView.h
+++ b/src2/creaImageIOGimmickView.h
@@ -60,8 +60,6 @@ namespace creaImageIO
          //Returns the maximal priority
          int GetMaximalPriority(){return mReader.GetMaximalPriority();}
 
-         ///Returns the selected Images and validates to see if they comply with the given parameter(<4D)
-         vtkImageData* GetSelectedImage(int dim);
       ///Adds the selected Images to the given vector and validates to see if they comply with the given parameter (4D)
       virtual void GetSelectedImages(std::vector<vtkImageData*>& s, int dim) 
          { GimmickError("INTERNAL ERROR : GetSelectedImages not implemented"); }

diff --git a/src2/creaImageIOWxGimmickReaderDialog.h b/src2/creaImageIOWxGimmickReaderDialog.h
index 8b597dfe533be6657b12cc3ced78de24b9863a2f..38341c5fd59ffba37f5338b6df882c13e2dd1f22 100644 (file)
--- a/src2/creaImageIOWxGimmickReaderDialog.h
+++ b/src2/creaImageIOWxGimmickReaderDialog.h
@@ -38,8 +38,7 @@ namespace creaImageIO
        //===============================================================================================
        //Image Selection
        //===============================================================================================
-    vtkImageData* GetSelectedImage(int dim) 
-       { return mView->GetSelectedImage(dim); }
+   
     void GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
     { mView->GetSelectedImages(s, dim); }
 

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 7992b56a699ea13f6217243fe45ec45c84efe252..2bd904bbf15977a0a863083221aa0aacc1b1c535 100644 (file)
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -212,13 +212,6 @@ namespace creaImageIO
     mNotebook->AddPage( view, crea::std2wx(name) );
 
   }
-  //======================================================================
-  /// Returns the selected Image so that it complies with the given parameter(<4D)
-  vtkImageData* WxGimmickView::GetSelectedImage(int dim)
-  {
-         return NULL;
-                 //GetTreeViewMap()["Local database"]->GetSelectedImage(dim);
-  }
 
   //======================================================================
   /// Returns the selected Images so that they comply with the given parameter(4D)
@@ -227,6 +220,7 @@ namespace creaImageIO
        int level=GetTreeViewMap()["Local database"]->GetNumberOfLevels();
        std::vector<tree::Node*> im=GetTreeViewMap()["Local database"]->GetSelected(level+1);
        ReadImagesNotThreaded(s,im,dim);
+       mViewer->StopPlayer();
   }
   //======================================================================
   /// Returns the selected Images so that they comply with the given parameter(4D)
@@ -492,35 +486,11 @@ namespace creaImageIO
              {
                mViewer->SetImage(index,image);
              }
-           /*
-           tree::Node* node=GetNextNodeQueued();
-           
-
-           bool found=false;
-           std::vector<tree::Node*>::iterator i;
-           for(i=sel.begin();i!=sel.end()&&!found;++i)
-             {
-               if((*i)==node)
-                 {
-                   mViewer->AddImage(image);
-                   found=true;
-                 }
-             }
-           */
            
          }
        UnqueueNext();
       }
-    /*
-    if(!(mViewer->ImagesEmpty()))
-      {
-       GimmickDebugMessage(5,
-                           "Showing images"
-                           <<std::endl);
-       //      mViewer->ShowImages();
-       //      mViewer->Show();
-      }
-    */
+    
     ClearQueue();
        
 

diff --git a/src2/creaImageIOWxGimmickView.h b/src2/creaImageIOWxGimmickView.h
index fa2b3abcca4790b4d1d5664e6f305bb8b62350c8..6a4f5b69776a8c562d13dd64dfe6e1e98c675009 100644 (file)
--- a/src2/creaImageIOWxGimmickView.h
+++ b/src2/creaImageIOWxGimmickView.h
@@ -37,9 +37,6 @@ namespace creaImageIO
       /// Virtual destructor
       virtual ~WxGimmickView();
       
-      /// Returns the selected Images so that they comply with the given parameter(<4D)
-      ///(overloaded from GimmickView)
-      vtkImageData* GetSelectedImage(int dim);
       /// Returns the selected files
       ///(overloaded from GimmickView)
       void GetSelectedFiles(std::vector<std::string>& s);

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index b2998c7b7901460886cd2ae91d78b5c0bf8551f3..64d395af23c38bf60c4ee69bf5a3c75c9755f1d1 100644 (file)
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -318,20 +318,13 @@ namespace creaImageIO
            
                data->node = *j;
                item.SetId(_id);
-               /*
-               std::string a=(*j)->GetAttribute(mLevelList[l].key[mColumnSelected-1]);
-               GimmickMessage(1,
-                       "State Check: Att VAL"
-                           <<a
-                           <<std::endl);
-       */
+
                data->id = _id;
            item.SetData(data);
            
                _id++;
-         
-           long id = GetCtrl(l)->InsertItem(item);
-
+           long id=GetCtrl(l)->InsertItem(item);
+               
            std::ostringstream oss;
            int n= GetTreeHandler()->GetNumberOfChildren(*j);
            

diff --git a/src2/creaImageIOWxViewer.cpp b/src2/creaImageIOWxViewer.cpp
index e9f0bdd73d1dfb24fc758c2a988cec87d304ba7a..a566189298693f8103cbfd9a490b3b7e8b0e71c2 100644 (file)
--- a/src2/creaImageIOWxViewer.cpp
+++ b/src2/creaImageIOWxViewer.cpp
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include <time.h>
 
-
 using namespace crea;
 
 namespace creaImageIO
@@ -31,7 +30,7 @@ namespace creaImageIO
     //    void ShowImage(vtkImageData* v);
     //   void StartIterator();
     void  OnExit();
-
+       
   private:
     //std::vector<vtkImageData*> mImagesToPlay;
     //vtkImageViewer2* mViewer;
@@ -79,7 +78,8 @@ namespace creaImageIO
     
     mCurrent = 0;
 
-    mPlayer = new WxViewerPlayer(this); //images, mViewer, mInteractor, this); 
+    mPlayer = new WxViewerPlayer(this); //images, mViewer, mInteractor, this);
+       
        mPlayer->Create();
        mPlayer->Run();
        
@@ -259,9 +259,9 @@ namespace creaImageIO
     
     //  mInteractor->Refresh();
     //mInteractor->Render();
-    //    mViewer->Render();   
-
-   ::wxWakeUpIdle();
+    //    mViewer->Render();
+  
+   //::wxWakeUpIdle();
   } 
   //================================================================
   
@@ -271,12 +271,19 @@ namespace creaImageIO
     //    mInteractor->Refresh();
        if(images.size()>0)
        {
-        mInteractor->Render();
+//      mInteractor->Render();
        }
     //mViewer->Render();      
   }
+
+   //================================================================
+  
+  //==================================================
+  void WxViewer::StopPlayer()
+  {
+    mPlayer->Delete();  
+  }
   
-  //=================================================
  
 
   //  BEGIN_EVENT_TABLE(WxGimmickFrame, wxDialog)
@@ -298,11 +305,19 @@ namespace creaImageIO
     GimmickMessage(1,"WxViewerPlayer::Entry()"<<std::endl);
                        
     while(true)
-      {                
-       mWxViewer->ShowNextImage();
-       clock_t endwait;
-       endwait = clock () + 0.2 * CLOCKS_PER_SEC ;
-       while (clock() < endwait) {}
+      { 
+               if(!TestDestroy())
+           { 
+                       mWxViewer->ShowNextImage();
+                       mWxViewer->Refresh();
+                       clock_t endwait;
+                       endwait = clock () + 0.2 * CLOCKS_PER_SEC ;
+                       while (clock() < endwait) {}
+               }
+               else
+               {
+                       break;
+               }
        /*
        for(i=mImagesToPlay.begin();i!=mImagesToPlay.end();++i)
          {
@@ -315,7 +330,7 @@ namespace creaImageIO
                mParent->Refresh();
                endwait = clock () + 0.2 * CLOCKS_PER_SEC ;
                while (clock() < endwait) {}
-             }
+             
            
          }
        */
@@ -331,8 +346,6 @@ namespace creaImageIO
     GimmickMessage(1,"WxViewerPlayer::OnExit() "<<std::endl);
   }
 
-   //=====================================================================
-
  
 } // EO namespace creaImageIO
 

diff --git a/src2/creaImageIOWxViewer.h b/src2/creaImageIOWxViewer.h
index 92fcb64eea6b3da49fe7e5c57c2738ae8a1bfee2..f416cfc6b59fabc244d48bf491da70ba82ba385a 100644 (file)
--- a/src2/creaImageIOWxViewer.h
+++ b/src2/creaImageIOWxViewer.h
@@ -50,6 +50,7 @@ namespace creaImageIO
     
     void OnInternalIdle();
 
+       void StopPlayer();
 
   private:
    ///Shows the image passed as parameter