X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=2d8785147b5754b69a9c2d69bc715f89acbd8f31;hb=fc165c73bc8482c01caeee7c67405962f846a9b6;hp=bdbb325620ed14a67901f5a4959136dc8317f368;hpb=b2aa225767df8c22bd10d4fa893c2327a1e19aa4;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index bdbb325..2d87851 100644
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -15,6 +15,7 @@ using namespace crea;
 
 namespace creaImageIO
 {
+   
   //======================================================================
   // The ids of the different tools
   enum
@@ -110,25 +111,30 @@ namespace creaImageIO
     // Bottom panel 
     mBottomPanel = new wxPanel(mSplitter,-1);
     
-    wxBoxSizer	*bottom_sizer = new wxBoxSizer(wxHORIZONTAL);
+	  wxBoxSizer	*bottom_sizer = new wxBoxSizer(wxVERTICAL); //HORIZONTAL);
     
-    mText = new wxStaticText(mBottomPanel, wxID_ANY, wxT("Status: Welcome to Gimmick!"));
-    bottom_sizer->Add(mText,1,wxGROW,0);
     
     // Previewer
     mViewer = new WxViewer(mBottomPanel, wxID_ANY, wxT("Gimmick! Viewer"),wxDefaultPosition, wxDefaultSize );
-	mViewer->SetMovieSize(1);
-	mViewer->SetImage(0,GetDefaultImage());
+	pointers.push_back(new ImagePointerHolder(GetDefaultImage()));
+	mViewer->SetImageVector(pointers);
+	mViewer->StartPlayer();
+
 
-    bottom_sizer->Add(mViewer,1,wxGROW,0);
+    bottom_sizer->Add(mViewer,1,wxGROW,1);
     //    mViewer->Show();
 
+	  mText = new wxStaticText(mBottomPanel, wxID_ANY, wxT("Welcome to Gimmick!"));
+	  bottom_sizer->Add(mText,0,wxGROW,0);
+
+	  
+	  
     mBottomPanel->SetSizer(bottom_sizer);
 
     // Splitting
     int hsize = size.GetHeight();
 
-    int top_minsize = 500;
+    int top_minsize = 450;
     int bottom_minsize = 50;
 
     mSplitter->SetMinimumPaneSize( bottom_minsize );
@@ -365,26 +371,60 @@ namespace creaImageIO
   //=================================================
 
   //=================================================
-  void WxGimmickView::OnSelectionChange(std::vector<tree::Node*>& sel)
+  void WxGimmickView::OnSelectionChange(std::vector<tree::Node*>& sel, bool isSelection, int selection, bool needProcess)
   {      
     GimmickDebugMessage(5,
 			"WxGimmickView::OnSelectionChange"
 			<<std::endl);
     wxBusyCursor busy;
-    bool valid = ValidateSelected(sel,
-				  mSelectionMinDimension,
-				  mSelectionMaxDimension );
-    mText->SetLabel(_T("Status: ")+crea::std2wx(GetMessage()));
-    if(valid)
+	bool valid=true;
+	
+	if(sel.size()==0)
+	{
+		
+		valid= ValidateSelected(NULL,
+				mSelectionMinDimension,
+				mSelectionMaxDimension );
+	}
+	else if(needProcess)
+	{
+		ClearStatus();
+		std::vector<tree::Node*>::iterator i;
+		for(i=sel.begin();i!=sel.end()&&valid;++i)
+		{
+			valid= ValidateSelected((*i),
+				mSelectionMinDimension,
+				mSelectionMaxDimension );
+		}
+	}
+	else if(isSelection)
+	{
+		valid= ValidateSelected(sel.front(),
+				mSelectionMinDimension,
+				mSelectionMaxDimension );
+	}
+	else
+	{
+		ClearStatus();
+		std::vector<tree::Node*>::iterator i;
+		for(i=sel.begin();i!=sel.end()&&valid;++i)
+		{
+			valid= ValidateSelected((*i),
+				mSelectionMinDimension,
+				mSelectionMaxDimension );
+		}
+	}
+	
+    mText->SetLabel(crea::std2wx(GetMessage()));
+    /*if(valid)
       {
 	ReadImageThreaded(sel);
       }
     else
       {
-	mViewer->SetMovieSize(1);
-	mViewer->SetImage(0,GetDefaultImage());
-	//	mViewer->Hide();
-      }
+		  ClearSelection();
+      }*/
+	ReadImageThreaded(sel);
 
     
    }
@@ -401,10 +441,11 @@ namespace creaImageIO
    int maxprio = GetMaximalPriority();
    int prio = maxprio + 2000;
 
-   mViewer->SetMovieSize(sel.size());//ClearImages();
-   
+   if(sel.size()>0)
+   {
    //First load the selected images
    mCurImageItemToShow = sel.front();
+   pointers.clear();
    int index = 0;
    std::vector<tree::Node*>::iterator selected;
    for(selected=sel.begin();selected!=sel.end();++selected)
@@ -413,12 +454,14 @@ namespace creaImageIO
 			   "Requesting image from selected "
 			   <<(*selected)->GetAttribute("FullFileName")
 			   <<std::endl);
-       RequestReading(*selected,prio,index);
+	   ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+	   pointers.push_back(ph);
+       RequestReading(*selected,prio,index,ph);
        //       AddEntryToMap(*selected);
        prio--;
        index++;
      }
-	
+	mViewer->SetImageVector(pointers);
 	//Going up
 	prio = maxprio + 20;
 	std::vector<tree::Node*> up;
@@ -430,7 +473,8 @@ namespace creaImageIO
 				"Requesting image from neighbors up "
 				<<(*iterUp)->GetAttribute("FullFileName")
 				<<std::endl);
-		RequestReading(*iterUp,prio,-1);
+		ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+		RequestReading(*iterUp,prio,-1,ph);
 		//		AddEntryToMap(*iterUp);
 		prio--;
 		if (prio == maxprio) break;
@@ -447,82 +491,53 @@ namespace creaImageIO
 				"Requesting image from neighbors down "
 				<<(*iterDown)->GetAttribute("FullFileName")
 				<<std::endl);
-		RequestReading(*iterDown,prio,-1);
+		ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+		RequestReading(*iterDown,prio,-1,ph);
 		//		AddEntryToMap(*iterDown);
 		prio--;
 		if (prio == maxprio) break;
-	}	
+	}
+   }
+   else
+   {
+	   pointers.clear();
+	   ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+	   pointers.push_back(ph);
+	   mViewer->SetImageVector(pointers);
+   }
   }
 
   //==================================================
 
-  //==================================================
-  /// Processes the queue of image events 
-  void WxGimmickView::ProcessImageEvents()
-  {
-    if (!mConstructed) return;
-
-    //    int level=GetTreeViewMap()["Local database"]->GetNumberOfLevels();
-    //    std::vector<tree::Node*> sel=GetTreeViewMap()["Local database"]->GetSelected(level+1);
-    /*
-    GimmickDebugMessage(5,
-			"Processing Images. Lock Started"
-			<<std::endl);
-    */
-    MultiThreadImageReaderEventLock();
-    
-
-    while (!IsQueueEmpty())
-      {
-	GimmickDebugMessage(5,
-			    "Queue not empty"
-			    <<std::endl);
-	
-	vtkImageData* image = GetNextImageQueued();
-	if( image!=0 ) 
-	  {
-	    int index =  GetNextSelectionIndexQueued();
-	    if (index>=0) 
-	      {
-		mViewer->SetImage(index,image);
-	      }
-	    
-	  }
-	UnqueueNext();
-      }
-    
-    ClearQueue();
-	
-
-    MultiThreadImageReaderEventUnlock();
-    /*
-	GimmickDebugMessage(5,
-				"Processing Images. Lock Ended"
-				<<std::endl);
-    */
-  }
- 
   //==================================================
 
   //==================================================
    void  WxGimmickView::OnInternalIdle()
   {
    if (!mConstructed) return;
-   ProcessImageEvents();
    static bool first_time = true;
    if (false)
-     {
-    	mViewer->SetMovieSize(1);
-	mViewer->SetImage(0,GetDefaultImage());
-	first_time = false;
+   {
+  	first_time = false;
      }
    //   GimmickMessage(1,"WxGimmickView : Refresh viewer"<<std::endl);
+	//  mViewer->StartPlayer();
+   if(mViewer)
+   {
+	   mViewer->RefreshIfNecessary();
+   }
+  }
 
-   if (mViewer->RefreshIfNecessary())
-     {
-       // mViewer->Refresh();
-       //       mViewer->SetFocus();
-     }
+   //==================================================
+
+  //==================================================
+   void  WxGimmickView::ClearSelection()
+  {
+	pointers.clear();
+	pointers.push_back(new ImagePointerHolder(GetDefaultImage()));
+	mViewer->SetImageVector(pointers);
+	mViewer->RefreshIfNecessary();
+	ClearStatus();
   }
   
   //=================================================
@@ -533,6 +548,7 @@ namespace creaImageIO
 	//TODO Select current tree handler       
     wxBusyCursor busy;
     GetTreeViewMap()["Local database"]->RemoveSelected(1);
+	ClearSelection();
   }
   //=================================================