X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOWxTreeView.cpp;h=d34741cc9eaf3da4507746f85a60813822046001;hb=b2e15b58dfa9d444764952a94e37164f2cea58c2;hp=1b3d20d7d0ff829db0b92e30b4ae12ab1aca9add;hpb=633701590bade8ba6d0f8c7b37c033596b4b2c2a;p=creaImageIO.git

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 1b3d20d..d34741c 100644
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -276,13 +276,18 @@ namespace creaImageIO
 	    //	    item.SetTextColour(*wxRED);
 	    //	    item.SetBackgroundColour(*wxBLACK); 
 	    item.SetColumn(0);
+
+		//Sets the last level as selecte....How to make it select only the first time?
+		//if (level==mLevelList.size()) item.SetState(wxLIST_STATE_SELECTED);
+
 	    GetCtrl(l)->SetItem(item);
+		
 	    //	    GetCtrl(l)->SetItem(id,0, crea::std2wx(s));
 	    //	    GetCtrl(l)->SetColumnWidth(0, wxLIST_AUTOSIZE );
 
 	  for (int k=1; k<GetCtrl(l)->GetColumnCount(); k++)
 	      {
-
+  
 		std::string val = (*j)->GetAttribute(mLevelList[l].key[k-1]);
 		if (val.size()==0) val = "?";
 		item.SetText( crea::std2wx(val));
@@ -308,7 +313,7 @@ namespace creaImageIO
 
 
   //================================================================
-  void WxTreeView::OnSelected(wxListEvent& event)
+  void WxTreeView::OnSelectedChanged(wxListEvent& event)
   { 
     GimmickDebugMessage(1,
 			GetTreeHandler()->GetTree().GetLabel()
@@ -454,127 +459,27 @@ namespace creaImageIO
 
   void WxTreeView::ValidateSelectedImages()
   {
-	  GimmickMessage(1,
-			"Hello World Validate"
-			    <<std::endl);
-	  /*
-	MyEvent event( MyCommandEvent, 0 );
-	wxString bar( wxT("This is a Foo_DoFirstThing event") );
-	event.SetText( bar );
-	wxPostEvent( this, event );
-	*/
-	
+		//Send an event telling wether the selection is valid or not
+		wxCommandEvent event( 0, GetId() );
+		event.SetEventObject( this );
+		std::vector<tree::Node*> sel=GetSelected((mLevelList.size()+1));
+		event.SetClientData(&sel);
+		GetEventHandler()->ProcessEvent( event );
   }
-
   //================================================================
-
-
-  vtkImageData* WxTreeView::GetSelectedImage(int dim)
+  void WxTreeView::GetSelectedAsString(std::vector<std::string>&s)
   {
-	  /*
-		wxArrayTreeItemIds id;
-    // TO DO : TEST THAT STYLE IS MULTIPLE 
-    unsigned int nb = mTreeListCtrl->GetSelections(id);
-    f.clear();
-
-    // Collect the brute vector of Image nodes
-    std::vector<DicomNode*> im;
-    for (unsigned int i=0; i<nb; ++i)
-      {
-	TreeItemData *data = 
-	  (TreeItemData *)mTreeListCtrl->GetItemData(id[i]);
-	if ((data) && (data->IsDicomNode()))
-	  {
-	    if (data->GetDicomNode()->GetType()==DicomNode::Image)
-	      {
-		im.push_back ( data->GetDicomNode() );
-
-	      }
-	    else if (data->GetDicomNode()->GetType()==DicomNode::Series)
-	      {
-		DicomNode::ChildrenListType::iterator j;
-		for (j =data->GetDicomNode()->GetChildrenList().begin();
-		     j!=data->GetDicomNode()->GetChildrenList().end();
-		     j++) 
-		  {
-		    im.push_back ( *j );
-		  }
-	      }
-	  }
-      }
-    // Create the output data
-    if (im.size()==1) 
-      {
-	// Only one image : give it
-	vtkImageData* out = vtkImageData::New();
-	out->ShallowCopy(mReader.GetImage(im.front()->ImageGetFullFileName()));
-	f.push_back( out );
-      }
-    else if (im.size()>1)
+	  int level=mLevelList.size();
+	std::vector<tree::Node*> sel=GetSelected(level+1);
+	std::vector<tree::Node*>::iterator i;
+	
+    for (i=sel.begin(); i!=sel.end(); ++i)
       {
-	vtkImageData* first = mReader.GetImage( im.front()->ImageGetFullFileName() );
-	if (first->GetDataDimension()==2) 
-	  {   	
-	    // n2D to 3D
-	    vtkImageData* out = vtkImageData::New();
-	    out->CopyStructure(first);	
-	    out->SetScalarType(first->GetScalarType());
-	    int ext[6];
-	    first->GetExtent(ext);
-	    ext[5] = im.size();
-	    out->SetExtent(ext);
-	    // LG : TODO : Z Spacing  ?
-	    
-	    out->AllocateScalars();
-	    
-	    //first->Print(std::cout);
-	    //	    out->Print(std::cout);
-	    
-	    int dim[3];
-	    first->GetDimensions(dim);
-	    unsigned long imsize = 
-	      ( (unsigned long)first->GetScalarPointer(0,1,0)
-		- (unsigned long)first->GetScalarPointer(0,0,0))
-	      *dim[1];
-
-	    int slice = 0;
-	    std::vector<DicomNode*>::iterator it;
-	    for (it=im.begin(); it!=im.end(); ++it) 
-	      {
-		//std::cout << "copying slice "<<slice <<std::endl;
-		vtkImageData* cur = mReader.GetImage( (*it)->ImageGetFullFileName() );
-		
-		void* src = cur->GetScalarPointer(0,0,0);
-		void* dst = out->GetScalarPointer(0,0,slice);
-		//		std::cout << "src="<<src<<std::endl;
-		//		std::cout << "dst="<<dst<<std::endl;
-		//		std::cout << "siz="<<imsize<<std::endl;
-		memcpy(dst,src,imsize);
-
-		slice++;
-	      }
-	    f.push_back(out);
+		  std::string filename=(*i)->GetAttribute("FullFileName");
+		  s.push_back(filename);
 	  }
-	else 
-	  {
-	    // n3D
-	    std::vector<DicomNode*>::iterator it;
-	    for (it=im.begin(); it!=im.end(); ++it) 
-	      {
-		vtkImageData* out = vtkImageData::New();
-		out->ShallowCopy(mReader.GetImage((*it)->ImageGetFullFileName()));
-		f.push_back(out);
-	      }
-	  }
-      }
-	  */
-	return NULL;
-  }
-
-  void WxTreeView::GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
-  {
-
   }
+  //================================================================
   BEGIN_EVENT_TABLE(WxTreeView, wxPanel)
   /*
     EVT_SIZE(MyFrame::OnSize)
@@ -625,9 +530,10 @@ BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl)
     EVT_LIST_SET_INFO(LIST_CTRL, MyListCtrl::OnSetInfo)
 #endif
   */
-    EVT_LIST_ITEM_SELECTED(-1, WxTreeView::OnSelected)
-  /*
-    EVT_LIST_ITEM_DESELECTED(LIST_CTRL, MyListCtrl::OnDeselected)
+    EVT_LIST_ITEM_SELECTED(-1, WxTreeView::OnSelectedChanged)
+  
+    EVT_LIST_ITEM_DESELECTED(-1, WxTreeView::OnSelectedChanged)
+	/*
     EVT_LIST_KEY_DOWN(LIST_CTRL, MyListCtrl::OnListKeyDown)
     EVT_LIST_ITEM_ACTIVATED(LIST_CTRL, MyListCtrl::OnActivated)
     EVT_LIST_ITEM_FOCUSED(LIST_CTRL, MyListCtrl::OnFocused)