X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxTreeView.cpp;h=4aca9f841bb524e9657ded94c9797e43875cb9df;hb=45e8123561479c77ffffbcd3a6453f9dd4d12169;hp=829549a2212feca51e2c8847897be80b15bde201;hpb=10480b68ab85e5e7a4ddcf56ebfc83f5870061b5;p=creaImageIO.git

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 829549a..4aca9f8 100644
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -1,25 +1,73 @@
 #include <creaImageIOWxTreeView.h>
+#include <creaImageIOGimmickView.h>
 #include <creaImageIOSystem.h>
 #include <wx/splitter.h>
-int wxCALLBACK MyCompareFunction(long item1, long item2, long WXUNUSED(sortData))
-{
-    // inverse the order
-    if (item1 < item2)
-        return -1;
-    if (item1 > item2)
-        return 1;
+///Comparing function for ordering algorithm. Takes parameters as strings.
+int wxCALLBACK CompareFunctionStrings(long item1, long item2, long sortData)
+{	
+	std::string s1((char*)((long*)item1)[1]);
+	std::string s2((char*)((long*)item2)[1]);
+	if(sortData==1)
+	{
+		// inverse the order
+		if (s1 < s2)
+			return 1;
+		if (s1 > s2)
+			return -1;
+
+		return 0;
+	}
+	else
+	{
+		if (s1 < s2)
+			return -1;
+		if (s1 > s2)
+			return 1;
+
+		return 0;
 
-    return 0;
+	}
+	
 }
+
+///Comparing function for ordering algorithm. Takes parameters as ints.
+int wxCALLBACK CompareFunctionInts(long item1, long item2, long sortData)
+{	
+	int val1=atoi((char*)((long*)item1)[1]);
+	int val2=atoi((char*)((long*)item2)[1]);
+	if(sortData==1)
+	{
+		// inverse the order
+		if (val1 < val2)
+			return 1;
+		if (val1 > val2)
+			return -1;
+
+		return 0;
+	}
+	else
+	{
+		if (val1 < val2)
+			return -1;
+		if (val1 > val2)
+			return 1;
+
+		return 0;
+
+	}
+	
+}
+
 namespace creaImageIO
 {
   //=====================================================================
   // CTor
   WxTreeView::WxTreeView(TreeHandler* handler,
+			 GimmickView* gimmick,
 			 wxWindow* parent,
 			 const wxWindowID id)
     : wxPanel(parent,id),
-      TreeView(handler)
+      TreeView(handler,gimmick)
   {
     GimmickDebugMessage(1,"WxTreeView::WxTreeView"
 			<<std::endl);
@@ -64,7 +112,6 @@ namespace creaImageIO
 
 	// Create the columns : one for each attribute of the level
 	int col = 0;
-			//ctrl->InsertItem(0, "1");
 	
 	tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a;
 	for (a  = handler->GetTree().GetAttributeDescriptorList(i).begin();
@@ -76,12 +123,8 @@ namespace creaImageIO
 		    wxListItem it;
 		    it.SetTextColour(*wxRED);
 		    it.SetText(_T("#C"));
-		    it.SetColumn(col);
-		    //		    ctrl->InsertColumn(col, _("Children"), col_style);
+		
 		    ctrl->InsertColumn(col,it);
-		    //ctrl->InsertItem(0, "1");
-		    //level.key.push_back(_("Children"));
-		    //level.key.push_back(handler->GetTree().GetChildrenList().size());
 		    col++;
 		  }
 		  
@@ -105,7 +148,9 @@ namespace creaImageIO
     /// Initialize the first level splitter
  
       sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW  ,0);
-
+	mColumnSelected=1;
+	mLastSelected=0;
+	mDirection=true;
     UpdateLevel(1);
 
     SetSizer( sizer );     
@@ -129,6 +174,7 @@ namespace creaImageIO
   struct ItemData
   {
     tree::Node* node;
+	int id;
   };
  
   //=====================================================================
@@ -151,11 +197,20 @@ namespace creaImageIO
 	      {
 		long adr = GetCtrl(l-1)->GetItemData(i);
 		tree::Node* n = ((ItemData*)adr)->node;
-		sel.push_back(n);
+			if(mLastSelected==i)
+			{
+				std::vector<tree::Node*>::iterator it;
+				it = sel.begin();
+				it = sel.insert ( it , n );
+			}
+			else
+			{
+				sel.push_back(n);
+			}
 	      }
 	  }	
       }
-	
+	 
 	  return sel;
   }
 
@@ -195,7 +250,7 @@ namespace creaImageIO
 
  
   //=====================================================================
-  /// 
+  /// Updates a level of the view (adds or removes children, proganizes, etc.)
   void WxTreeView::UpdateLevel( int level )
   {
     GimmickDebugMessage(1,
@@ -217,7 +272,7 @@ namespace creaImageIO
   }
   //=====================================================================
   
-  /// 
+  /// Recursive method called upon by UpdateLevel to refresh all windows
   void WxTreeView::RecursiveUpdateLevel( int level )
   {
 	  GimmickDebugMessage(2,
@@ -242,7 +297,10 @@ namespace creaImageIO
 			    <<(*i)->GetLabel()
 			    <<"'"<<level
 			    <<std::endl);
-	
+	int _id=0;
+	int r=100;
+	int g=100;
+	int b=100;
 	//Adds columns
 	GetTreeHandler()->LoadChildren(*i,1);
 	tree::Node::ChildrenListType::reverse_iterator j;
@@ -260,29 +318,59 @@ namespace creaImageIO
 			 );
 
 	    ItemData* data = new ItemData;
-	    data->node = *j;
-	    item.SetData(data);
 	    
-	  
-	    long id = GetCtrl(l)->InsertItem(item);
+		data->node = *j;
+		item.SetId(_id);
 
+		data->id = _id;
+	    item.SetData(data);
+	    
+		_id++;
+	    long id=GetCtrl(l)->InsertItem(item);
+		
 	    std::ostringstream oss;
 	    int	n= GetTreeHandler()->GetNumberOfChildren(*j);
 	    
 	    oss << n;
 	    std::string s(oss.str());
 	    
+		
 	    item.SetText( crea::std2wx(s));
 	    //	    item.SetTextColour(*wxRED);
-	    //	    item.SetBackgroundColour(*wxBLACK); 
+
+		//Setting the color according to the parent
+		/*
+		if(l==0)
+		{
+	        item.SetBackgroundColour(wxColour(r,g,b)); 
+			mColorMap.insert(NodeColorPair(*j,wxColour(r,g,b)));
+		}
+		else if(l!=mLevelList.size()-1)
+		{
+			item.SetBackgroundColour(mColorMap[*i]); 
+			mColorMap.insert(NodeColorPair(*j,mColorMap[*i]));
+		}
+		else
+		{
+			item.SetBackgroundColour(mColorMap[*i]); 
+		}
+			r+=20;
+			g+=20;
+			b+=20;*/
+
 	    item.SetColumn(0);
+
+		//Sets the last level as selected....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));
@@ -317,8 +405,8 @@ namespace creaImageIO
 
     wxListItem info;
     info.m_itemId = event.m_itemIndex;
-    
-
+    mLastSelected=event.m_itemIndex;
+	
     // retrieve the level
     wxObject* obj = event.GetEventObject();   
     unsigned int level = 0;
@@ -329,349 +417,203 @@ namespace creaImageIO
     GimmickDebugMessage(1,
 			" Level "<<level+1
 			<<std::endl);
+
+	
+	mSelected=GetSelected(level+2);
+	
     if (level<mLevelList.size()-1) UpdateLevel( level + 2 ); 
-	if (level==mLevelList.size()-1) ValidateSelectedImages ();
+
+    if (level==mLevelList.size()-1) ValidateSelectedImages ();
 
   }
   //================================================================
 
 //================================================================
   void WxTreeView::OnColClick(wxListEvent& event)
-  { 
-	  /*
+  { 	  
 	//Obtain the column name and the level that needs to be organized
-	int colNum=event.m_col;
-    GimmickMessage(1,
-			" Column " <<event.m_col
+	mColumnSelected=event.m_col;
+    GimmickDebugMessage(1,
+		" Column selected: " <<event.m_col
 			<<std::endl);
 
-	
-    wxObject* ctrl = event.GetEventObject(); 
-	unsigned int level = 0;
-    for (level = 0; level<mLevelList.size(); ++level)
-      {
-	if ( GetCtrl(level) == ctrl ) break;
-      }
-
-	  wxBusyCursor busy;
-    std::vector<tree::Node*> sel=GetSelected(level+1);
-
-	tree::Node* nodes[20];
-
-	  int l = level - 1;
- 
-    // to speed up inserting we hide the control temporarily
-    GetCtrl(level)->Hide();
-    GetCtrl(level)->DeleteAllItems();
-    
-    std::vector<tree::Node*>::iterator i;
-	int num=0;
-    for (i=sel.begin(); i!=sel.end(); ++i)
-      {
-	
-		//Adds columns
-		GetTreeHandler()->LoadChildren(*i,1);
-		tree::Node::ChildrenListType::reverse_iterator j;
-		
-		for (j = (*i)->GetChildrenList().rbegin(); 
-			j!= (*i)->GetChildrenList().rend(); 
-			++j)
-			{
-				nodes[num]=*j;
-				num++;
-			}
-      }
-	
-	  //Sorting elements
-	  int k, m; 
-	  tree::Node* index;
-	  
-	
-	for (k=1; k<num; ++k)
-	{
-		index = nodes[k];
-		m = k;
-		GimmickMessage(1,
-			"Comparison Key 1: "
-			    <<(nodes[m-1])->GetAttribute(mLevelList[level].key[colNum-1])
-				<<"Comparison Key 2: "<<(index)->GetAttribute(mLevelList[level].key[colNum-1])
-			    <<std::endl);
-		while ((m > 0) && ((nodes[m-1])->GetAttribute(mLevelList[level].key[colNum-1]) > 
-						   (index)->GetAttribute(mLevelList[level].key[colNum-1])))
-		{
-		nodes[m] = nodes[m-1];
-		m = m - 1;
-		}
-		nodes[m] = index;
-	}
-
-	for (m=0; m<num; ++m)
+	if(mColumnSelected!=0)
 	{
-		tree::Node* node=nodes[m];
-	    wxListItem item;
-	    item.SetMask(wxLIST_MASK_STATE | 
-			 wxLIST_MASK_TEXT |
-			 //			 wxLIST_MASK_IMAGE |
-			 wxLIST_MASK_DATA |
-			 //			 wxLIST_MASK_WIDTH |
-			 wxLIST_MASK_FORMAT
-			 );
-
-	    long id = GetCtrl(level)->InsertItem(item);
-		int n;
-		if ((node)->GetChildrenLoaded()) 
-		{
-			n=(node)->GetChildrenList().size();
-		}
-		else
+		wxObject* ctrl = event.GetEventObject(); 
+		unsigned int level = 0;
+		for (level = 0; level<mLevelList.size(); ++level)
 		{
-			n= GetTreeHandler()->GetNumberOfChildren(node);
+		if ( GetCtrl(level) == ctrl ) break;
 		}
-		std::ostringstream oss;
 		
-		oss << n;
-		std::string s(oss.str());
-
-		GetCtrl(level)->SetItem(id,0, crea::std2wx(s));
-		GetCtrl(level)->SetColumnWidth(0, wxLIST_AUTOSIZE );
+		UpdateLevel(level+1);
 		
-	  for (int k=1; k<GetCtrl(level)->GetColumnCount(); k++)
-	      {
-		std::string val = (node)->GetAttribute(mLevelList[level].key[k-1]);
-		if (val.size()==0) val = "?";
-		GetCtrl(level)->SetItem(id,k, crea::std2wx(val));
-		GetCtrl(level)->SetColumnWidth(k, wxLIST_AUTOSIZE );
+		wxBusyCursor busy;
+	 
+		int l = level - 1;
 		
-	      }
-	    
-	  }
-
-    
-    GetCtrl(level)->Show();
-*/
-  }
-  //================================================================
-
-  void WxTreeView::ValidateSelectedImages()
-  {
-	int level=mLevelList.size();
-	std::vector<tree::Node*> sel=GetSelected(level+1);
-	bool valid=true;
-	if(sel.size()>0)
-	{
-		std::vector<tree::Node*>::iterator i;
-		std::string row;
-		std::string col;
-		std::string plane;
-		
-		//Validation between image sizes
-		for (i=sel.begin(); i!=sel.end() && valid; ++i)
+		//Sets the data for the items to be sorted
+		std::string att;
+		unsigned int ty=0;
+		int n = GetCtrl(level)->GetItemCount();
+		for (int i = 0; i < n; i++)
+		{
+			  
+			//Gets current item data
+			long adr = GetCtrl(level)->GetItemData(i);
+			//Extracts the node and the type of attribute
+			tree::Node* nod = ((ItemData*)adr)->node;
+			if(i==0)
+			{
+				(*nod).GetAttributeDescriptor(mLevelList[level].key[mColumnSelected-1]).DecodeType(ty);
+			}
+			//Obtains the organizing attribute
+			att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected-1]);
+			
+			char* d= new char [att.size()+1];
+			strcpy (d, att.c_str());
+
+			//Creates array
+			long* lp= new long[2];
+			lp[0]=adr;
+			lp[1]=(long)d;
+			 
+			//Sets it as the data
+			GetCtrl(level)->SetItemData(i,(long)lp);
+		}	
+		  
+		if(mDirection)
 		{
-			if(i==sel.begin())
+			if(ty==1)
 			{
-				row=(*i)->GetAttribute(mLevelList[level-1].key[1]);
-				col=(*i)->GetAttribute(mLevelList[level-1].key[2]);
-				plane=(*i)->GetAttribute(mLevelList[level-1].key[3]);
+				GetCtrl(level)->SortItems(CompareFunctionInts, 0);
 			}
 			else
 			{
-				if(((*i)->GetAttribute(mLevelList[level-1].key[1]))!=row ||
-					((*i)->GetAttribute(mLevelList[level-1].key[2]))!=col ||
-					((*i)->GetAttribute(mLevelList[level-1].key[3]))!=plane)
-					{
-						valid=false;
-					}
+				GetCtrl(level)->SortItems(CompareFunctionStrings, 0);
 			}
+			
+			mDirection=false;
+		}
+		else
+		{
+			if(ty==1)
+			{
+				GetCtrl(level)->SortItems(CompareFunctionInts, 1);
+			}
+			else
+			{
+				GetCtrl(level)->SortItems(CompareFunctionStrings, 1);
+			}
+			mDirection=true;
 		}
 
-		GimmickMessage(1,
-			"State check: Planes:" 
-			<<plane<<" Cols: "
-			<<col<<" Rows:"
-				<<row<<" "
-				<< std::endl);
-		//Dimention validation
-		//Compatibility with maximum 
-			if(valid)
-			{	
-				int rows;
-				int cols;
-				int planes;
-				std::string s;
-				std::istringstream t(s);
-				s=row;
-				t >> rows;
-				if(row==""){rows=1;}
-				s=col;
-				t >> cols;
-				if(col==""){cols=1;}
-				s=plane;
-				t >> planes;
-				if(plane==""){planes=1;}
-
-				int dim = 0;
-				if (planes>1) dim=3;
-				else if (cols>1) dim=2;
-				else if (rows>1) dim=1;
-			    
-				if (dim == 0) 
-				{
-				GimmickMessage(1,
-					"Unknown image dimension : cannot select !" 
-					<<dim<<" "
-					<<plane<<" "
-					<<col<<" "
-					<<row<<" "
-					<< std::endl);
-					valid= false;
-				}
-				else if (dim>GetMaxDimension())
-				{
-					GimmickMessage(1,"Selecting "<<dim<<"D images is not allowed !" 
-					<< std::endl);
-					valid= false;
-				}
-				if ( dim == GetMaxDimension() )
-				{
-					GimmickMessage(1,"Cannot add this image to selection : would result in a "
-									<<dim+1<<"D image !" << std::endl);
-					valid= false;
-				}
-				if ( dim < GetMinDimension() && sel.size()<2 )
+		//Resets original data
+		std::vector<tree::Node*>::iterator selection;
+		std::vector<long> change;
+		long it = -1;
+		for ( ;; )
+		{
+			it = GetCtrl(level)->GetNextItem(it,
+										wxLIST_NEXT_ALL);
+			if ( it == -1 )
+				break;
+			//Gets current item data, extracts the node and resets it
+			long item = GetCtrl(level)->GetItemData(it);
+			GetCtrl(level)->SetItemData(it,((long*)item)[0]);
+			tree::Node* n= ((ItemData*)((long*)item)[0])->node;
+			for(selection=mSelected.begin();selection!=mSelected.end();++selection)
+			{
+				if((*selection)->GetAttribute("ID").compare(n->GetAttribute("ID"))==0)
 				{
-					GimmickMessage(1,"Cannot build the selection as it would result in a "
-									<<dim<<"D image, and the minimum is"<<GetMinDimension()<<"D!" << std::endl);
-					valid= false;
+					change.push_back(it);	
 				}
 			}
-	  }
-	else
-	{
-		GimmickMessage(1,"Cannot have 0 images selected"<< std::endl);
-		valid=false;
+			
+		}
+		std::vector<long>::iterator selectedIts;
+		for(selectedIts=change.begin();selectedIts!=change.end();++selectedIts)
+		{
+			GetCtrl(level)->SetItemState(*selectedIts,wxLIST_STATE_SELECTED, wxLIST_MASK_STATE 
+		| wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT);
+			
+		}
 	}
 	
-		//Send an event telling wether the selection is valid or not
-		wxCommandEvent event( 0, GetId() );
-		event.SetEventObject( this );
-		if(valid)
-		{event.SetInt(0);}
-		else
-		{event.SetInt(1);}
-		GetEventHandler()->ProcessEvent( event );
-	  
-	
-  }
+   }
+  //================================================================
+
 
+  //================================================================
+  void WxTreeView::ValidateSelectedImages()
+  {
+    GimmickDebugMessage(7,
+			"WxTreeView::ValidateSelectedImages" 
+			<<std::endl);
+    std::vector<tree::Node*> sel(GetSelected(mLevelList.size()+1));
+    GetGimmickView()->OnSelectionChange(sel);
+    /*
+    //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::GetNodes(std::vector<tree::Node*>& nodes, bool direction)
   {
-	  /*
-		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() );
+	long item = mLastSelected;
+	int level=mLevelList.size()-1;
+	//Gets current item data
+	long adr = GetCtrl(level)->GetItemData(item);
+	//Extracts the node
+	tree::Node* nod = ((ItemData*)adr)->node;
+    for ( ;; )
+    {
+		if(direction)
+		{
+			item = GetCtrl(level)->GetNextItem(item,
+                                     wxLIST_NEXT_ABOVE);
+		}
+		else
+		{
+			item = GetCtrl(level)->GetNextItem(item,
+                                     wxLIST_NEXT_BELOW);
+		}
+        if ( item == -1 )
+		{
+            break;
+		}
+		if(GetCtrl(level)->GetItemState(item, wxLIST_STATE_SELECTED)==0)
+		{
+			adr = GetCtrl(level)->GetItemData(item);
+			nod = ((ItemData*)adr)->node;
+			nodes.push_back(nod);
+		}
+    }
 
-	      }
-	    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)
-      {
-	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);
-	  }
-	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)
+  //================================================================
+  void WxTreeView::GetSelectedAsString(std::vector<std::string>&s)
   {
-
+	  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)
+      {
+		  std::string filename=(*i)->GetAttribute("FullFileName");
+		  s.push_back(filename);
+	  }
   }
+  //================================================================
   BEGIN_EVENT_TABLE(WxTreeView, wxPanel)
   /*
     EVT_SIZE(MyFrame::OnSize)
@@ -751,4 +693,3 @@ END_EVENT_TABLE()
   
 } // EO namespace creaImageIO
 
-