X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=7e018a0c2bd62fec02e5de2ae0fac03559197021;hb=b0bee282f8a6c60d5d86495b9bdbc0b89309bf1f;hp=572658b4f91752e9c8ff166ab7bed9d9e828e143;hpb=7c5180e6b19690ba9a264f2a66c04bc0a03c53ef;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 572658b..7e018a0 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
@@ -97,29 +98,49 @@ namespace creaImageIO
     mNotebook = new wxNotebook(mSplitter,
 			       -1,wxDefaultPosition, wxDefaultSize, 0);
 
-	//Gimmick
-	mGimmick=gimmick;
-	mViewer=new WxViewer(this, wxID_ANY, wxT("Gimmick! Viewer"),wxDefaultPosition, wxDefaultSize );
-
-	
-	mSelectionMaxDimension= max_dim;
-	mSelectionMinDimension= min_dim;
+    //Gimmick
+    mGimmick=gimmick;
 
+      
+    mSelectionMaxDimension= max_dim;
+    mSelectionMinDimension= min_dim;
+    
     // Create the views
     CreateTreeViews();
 
     // Bottom panel 
     mBottomPanel = new wxPanel(mSplitter,-1);
-	mText = new wxStaticText(mBottomPanel, wxID_ANY, wxT("Status: Welcome to Gimmick!"));
-	
+    
+	  wxBoxSizer	*bottom_sizer = new wxBoxSizer(wxVERTICAL); //HORIZONTAL);
+    
+    
+    // Previewer
+    mViewer = new WxViewer(mBottomPanel, wxID_ANY, wxT("Gimmick! Viewer"),wxDefaultPosition, wxDefaultSize );
+	pointers.push_back(new ImagePointerHolder(GetDefaultImage()));
+	mViewer->SetImageVector(pointers);
+	mViewer->StartPlayer();
+
+
+    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 bottom_minsize = 15;
+
+    int top_minsize = 450;
+    int bottom_minsize = 50;
 
     mSplitter->SetMinimumPaneSize( bottom_minsize );
     mSplitter->SplitHorizontally( mNotebook, mBottomPanel, 
-				   hsize - bottom_minsize);
-  
+				  top_minsize);
+
     sizer->Add( mSplitter,1,wxGROW  ,0);
 
 
@@ -198,13 +219,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)
@@ -357,24 +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)
+	{
+		ResetExtent();
+		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
+	{
+		ResetExtent();
+		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->Hide();
-      }
+		  ClearSelection();
+      }*/
+	ReadImageThreaded(sel);
 
     
    }
@@ -390,23 +440,30 @@ namespace creaImageIO
 		       <<std::endl);
    int maxprio = GetMaximalPriority();
    int prio = maxprio + 2000;
-   
+
+   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)
-	{
-		GimmickDebugMessage(5,
-				"Requesting image from selected "
-				<<(*selected)->GetAttribute("FullFileName")
-				<<std::endl);
-		RequestReading(*selected,prio);
-		AddEntryToMap(*selected);
-		prio--;
-	}
-	
+     {
+       GimmickDebugMessage(5,
+			   "Requesting image from selected "
+			   <<(*selected)->GetAttribute("FullFileName")
+			   <<std::endl);
+	   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 + 1000;
+	prio = maxprio + 20;
 	std::vector<tree::Node*> up;
 	GetTreeViewMap()["Local database"]->GetNodes(up,true);
 	std::vector<tree::Node*>::iterator iterUp;
@@ -416,13 +473,15 @@ namespace creaImageIO
 				"Requesting image from neighbors up "
 				<<(*iterUp)->GetAttribute("FullFileName")
 				<<std::endl);
-		RequestReading(*iterUp,prio);
-		AddEntryToMap(*iterUp);
+		ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+		RequestReading(*iterUp,prio,-1,ph);
+		//		AddEntryToMap(*iterUp);
 		prio--;
+		if (prio == maxprio) break;
 	}
 
 	//Going down
-	prio = maxprio + 999;
+	prio = maxprio + 19;
 	std::vector<tree::Node*> down;
 	GetTreeViewMap()["Local database"]->GetNodes(down,false);
 	std::vector<tree::Node*>::iterator iterDown;
@@ -432,75 +491,53 @@ namespace creaImageIO
 				"Requesting image from neighbors down "
 				<<(*iterDown)->GetAttribute("FullFileName")
 				<<std::endl);
-		RequestReading(*iterDown,prio);
-		AddEntryToMap(*iterDown);
+		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();
-    
-    mViewer->ClearImages();
-    while (!IsQueueEmpty())
-      {
-	GimmickDebugMessage(5,
-			    "Queue not empty"
-			    <<std::endl);
-	
-	vtkImageData* image=GetNextImageQueued();
-	if( image!=0 ) 
-	  {
-	    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();
-	
 
-    MultiThreadImageReaderEventUnlock();
-	GimmickDebugMessage(5,
-				"Processing Images. Lock Ended"
-				<<std::endl);
-  }
- 
   //==================================================
+   void  WxGimmickView::OnInternalIdle()
+  {
+   if (!mConstructed) return;
+   static bool first_time = true;
+   if (false)
+   {
+  	first_time = false;
+     }
+   //   GimmickMessage(1,"WxGimmickView : Refresh viewer"<<std::endl);
+	//  mViewer->StartPlayer();
+   if(mViewer)
+   {
+	   mViewer->RefreshIfNecessary();
+   }
+  }
+
+   //==================================================
 
   //==================================================
-   void  WxGimmickView::OnInternalIdle()
+   void  WxGimmickView::ClearSelection()
   {
-    ProcessImageEvents();
+	pointers.clear();
+	pointers.push_back(new ImagePointerHolder(GetDefaultImage()));
+	mViewer->SetImageVector(pointers);
+	mViewer->RefreshIfNecessary();
+	ResetExtent();
   }
   
   //=================================================
@@ -511,6 +548,7 @@ namespace creaImageIO
 	//TODO Select current tree handler       
     wxBusyCursor busy;
     GetTreeViewMap()["Local database"]->RemoveSelected(1);
+	ClearSelection();
   }
   //=================================================