X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxTreeView.cpp;h=18ced63630fae13fc05b87a03b46e45ed8587939;hb=cac026929f2431aa4a966bf9ae3c8ff263f5dd63;hp=5d77aadc95cd742af7e1885a005407aa65f65943;hpb=b2bd47502b2ed48d4001e26bae3a961a3310c60d;p=creaImageIO.git

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 5d77aad..18ced63 100644
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -1,25 +1,74 @@
 #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;
+#include <wx/gdicmn.h>
+///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);
@@ -62,29 +111,27 @@ namespace creaImageIO
 	level.wxCtrl = ctrl;
 	level.wxSplitter->Initialize(ctrl);
 
+	// Create the first column : number of children
+	if(i<handler->GetTree().GetNumberOfLevels()-1)
+	{
+	std::string title = "#";
+	if (i<handler->GetTree().GetNumberOfLevels()-1)
+	  {
+	    title += handler->GetTree().GetLevelDescriptor(i+1).GetName();
+	    if (title[title.size()-1]!='s')
+	      title += "s";
+	  }
+	ctrl->InsertColumn(0,crea::std2wx(title),col_style);
+	}
+
 	// Create the columns : one for each attribute of the level
-	int col = 0;
-			//ctrl->InsertItem(0, "1");
-	
+	int col = 1;
 	tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a;
 	for (a  = handler->GetTree().GetAttributeDescriptorList(i).begin();
 	     a != handler->GetTree().GetAttributeDescriptorList(i).end();
 	     ++a)
 	  {
-		  if(col==0)
-		  {
-		    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++;
-		  }
-		  
+	
 		GimmickDebugMessage(5,"Creating column "<<col<<" : "
 				<<a->GetName()
 				<<std::endl);
@@ -101,11 +148,31 @@ namespace creaImageIO
 	mLevelList.push_back(level);
       }
     
+#if wxUSE_MENUS
+
+    menu =new wxMenu;
+	wxMenuItem* m1=menu->Append(wxID_ANY, _T("&Sort ascending"));
+	wxMenuItem* m2=menu->Append(wxID_ANY, _T("&Sort descending"));
+	wxMenuItem* m3=menu->Append(wxID_ANY, _T("&Filter"));
+	mAscendingID=m1->GetId();
+	mDescendingID=m2->GetId();
+	mFilterID=m3->GetId();
+	Connect( mAscendingID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnPopupSort) );
+	Connect( mDescendingID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnPopupSort) );
+	Connect( mFilterID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnPopupFilter) );
+	
+#endif // wxUSE_MENUS
+
 
     /// Initialize the first level splitter
  
       sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW  ,0);
-
+	mColumnSelected=1;
+	mLastSelected=0;
+	mDirection=true;
+	mSelectionMade=false;
+	mProcess=true;
+	//CreateColorPalette();
     UpdateLevel(1);
 
     SetSizer( sizer );     
@@ -129,6 +196,7 @@ namespace creaImageIO
   struct ItemData
   {
     tree::Node* node;
+	int id;
   };
  
   //=====================================================================
@@ -151,11 +219,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 +272,7 @@ namespace creaImageIO
 
  
   //=====================================================================
-  /// 
+  /// Updates a level of the view (adds or removes children, proganizes, etc.)
   void WxTreeView::UpdateLevel( int level )
   {
     GimmickDebugMessage(1,
@@ -217,7 +294,7 @@ namespace creaImageIO
   }
   //=====================================================================
   
-  /// 
+  /// Recursive method called upon by UpdateLevel to refresh all windows
   void WxTreeView::RecursiveUpdateLevel( int level )
   {
 	  GimmickDebugMessage(2,
@@ -235,74 +312,92 @@ namespace creaImageIO
     GetCtrl(l)->DeleteAllItems();
     
     std::vector<tree::Node*>::iterator i;
-    for (i=sel.begin(); i!=sel.end(); ++i)
+	
+    //Adds the first item (filter)
+   
+	for (i=sel.begin(); i!=sel.end(); ++i)
       {
 	GimmickDebugMessage(2,
 			    "adding children of '"
 			    <<(*i)->GetLabel()
-			    <<"'"<<level
+			    <<"'"
 			    <<std::endl);
+	int _id=1;
 	
-	//Adds columns
+	//Adds items (other than the first) and sets their attributes 
+	   GetCtrl(l)->InsertItem(0, _T(""));
 	GetTreeHandler()->LoadChildren(*i,1);
 	tree::Node::ChildrenListType::reverse_iterator j;
 	for (j = (*i)->GetChildrenList().rbegin(); 
 	     j!= (*i)->GetChildrenList().rend(); 
 	     ++j)
 	  {
-	    wxListItem item;
-	    item.SetMask(wxLIST_MASK_STATE | 
+		  	 wxListItem* item= new wxListItem;
+	    item->SetMask(wxLIST_MASK_STATE | 
 			 wxLIST_MASK_TEXT |
 			 //			 wxLIST_MASK_IMAGE |
 			 wxLIST_MASK_DATA |
 			 //			 wxLIST_MASK_WIDTH |
 			 wxLIST_MASK_FORMAT
 			 );
-
+	   
 	    ItemData* data = new ItemData;
-	    data->node = *j;
-	    item.SetData(data);
 	    
-	  
-	    long id = GetCtrl(l)->InsertItem(item);
+		data->node = *j;
+		item->SetId(_id);
 
-	    std::ostringstream oss;
-	    int	n= GetTreeHandler()->GetNumberOfChildren(*j);
+		data->id = _id;
+	    item->SetData(data);
 	    
+		_id++;
+		
+		
+		//Setting first column (number of children)
+	    std::ostringstream oss;
+	    int	n= 0; //GetTreeHandler()->GetNumberOfChildren(*j);
 	    oss << n;
 	    std::string s(oss.str());
-	    
-	    item.SetText( crea::std2wx(s));
-	    //	    item.SetTextColour(*wxRED);
-	    //	    item.SetBackgroundColour(*wxBLACK); 
-	    item.SetColumn(0);
-	    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));
-		//		item.SetTextColour(*wxBLACK);
-		//		item.SetBackgroundColour(*wxWHITE); 
-		item.SetColumn(k);
-		GetCtrl(l)->SetItem(item);
+	    item->SetText( crea::std2wx(s));		
 
-		//		GetCtrl(l)->SetItem(id,k, crea::std2wx(val));
-		// GetCtrl(l)->SetColumnWidth(k, wxLIST_AUTOSIZE );
+	    item->SetColumn(0);
+		 GetCtrl(l)->InsertItem(*item);
+		//GetCtrl(l)->SetItem(item);
 		
-	      }
-	    
+		//Setting other attributes
+		if(level<mLevelList.size())
+		{ 
+		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));
+			item->SetColumn(k);
+			GetCtrl(l)->SetItem(*item);
+			// Unefficient
+			//			GetCtrl(l)->RefreshItem(*item);
+	      }	
+		}
+		else
+		{
+			for (int k=0; k<GetCtrl(l)->GetColumnCount(); k++)
+	      {
+			std::string val = (*j)->GetAttribute(mLevelList[l].key[k]);
+			if (val.size()==0) val = "?";
+			item->SetText( crea::std2wx(val));
+			item->SetColumn(k);
+			GetCtrl(l)->SetItem(*item);	
+			//			GetCtrl(l)->RefreshItem(*item);
+	      }	
+		}
+		  
 	  }
+	GetCtrl(l)->DeleteItem(0);
       }
     
     GetCtrl(l)->Show();
-
     
-    if (level<mLevelList.size()) UpdateLevel(level+1);
+    //  if (level<mLevelList.size()) UpdateLevel(level+1);
+	
  }
   //=====================================================================
 
@@ -314,11 +409,10 @@ namespace creaImageIO
 			GetTreeHandler()->GetTree().GetLabel()
 			<<" view : item selected "
 			<<std::endl);
-
+    
     wxListItem info;
     info.m_itemId = event.m_itemIndex;
-    
-
+    mLastSelected = event.m_itemIndex;
     // retrieve the level
     wxObject* obj = event.GetEventObject();   
     unsigned int level = 0;
@@ -329,352 +423,508 @@ namespace creaImageIO
     GimmickDebugMessage(1,
 			" Level "<<level+1
 			<<std::endl);
-    if (level<mLevelList.size()-1) UpdateLevel( level + 2 ); 
-	if (level==mLevelList.size()-1) ValidateSelectedImages ();
-
+    /*
+      if(event.m_itemIndex!=0)
+      {*/
+    
+    if(level<mLevelList.size()-1)
+      {
+	//mSelected=GetSelected(level+1); //2);
+      }
+    else if(mProcess)
+      {
+	//mLastLevelSelected=GetSelected(level+1); //2);
+      }
+    else
+      {
+	event.Veto();
+      }
+    
+    // Update the children level (if selection not at last level)
+    if (level<mLevelList.size()-1) 
+      {
+	UpdateLevel( level + 2 ); 
+	// Reset the viewer setting the default image
+	GetGimmickView()->ClearSelection();
+      }
+    // Select all images if the selection is at series level
+    if (level==mLevelList.size()-2) SelectLowerLevel();
+    // Validate selected images if the selection is at image level
+    if (level==(mLevelList.size()-1)&&mProcess) 
+      {
+	if(event.GetEventType()==10145)
+	  {
+	    ValidateSelectedImages (true);
+	  }
+	else
+	  {
+	    ValidateSelectedImages (false);
+	  }
+      }
+    //SetColor(level,event.m_itemIndex);
+    /*}
+      else
+      {
+      if(event.GetEventType()==10145)
+      {
+      
+      GetCtrl(level)->SetItemText(0,crea::std2wx(""));
+      GetCtrl(level)->EditLabel(event.m_itemIndex);
+      }
+      
+      }*/
+    
+    
   }
   //================================================================
 
-//================================================================
-  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
-			<<std::endl);
+  //================================================================
+  void WxTreeView::SelectLowerLevel()
+  {
+	long item = -1;
+	int level=mLevelList.size()-1;
+	
+    for ( ;; )
+    {
+		item = GetCtrl(level)->GetNextItem(item,
+                                     wxLIST_NEXT_ALL);
+        if ( item == -1 )
+            break;
+
+		if(item==(GetCtrl(level)->GetItemCount()-1))
+		{
+			mProcess=true;
+		}
+		else
+		{
+			mProcess=false;
+		}
+
+		/*if(item!=0)
+		{*/
+		GetCtrl(level)->SetItemState(item,wxLIST_STATE_SELECTED, wxLIST_MASK_STATE 
+		| wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT);
+		//}
+		
+    }
 
 	
-    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];
+  void WxTreeView::OnMouseClick(wxMouseEvent& event)
+  { 
+	   if (event.ButtonDown())
+	   {
+	   }
+	  std::cout<<"HELLO WORLD"<<std::endl;
+  }
+  //================================================================
+  //================================================================
 
-	  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;
+  void WxTreeView::OnColClick(wxListEvent& event)
+  { 
+	mColumnSelected=event.m_col;
+	wxPoint clientpt;
+	clientpt.x = wxGetMousePosition().x - this->GetScreenPosition().x;
+	clientpt.y = wxGetMousePosition().y - this->GetScreenPosition().y;
+	senderCtrl = event.GetEventObject(); 
+	unsigned int level = 0;
+	for (level = 0; level<mLevelList.size(); ++level)
+	{
+	if ( GetCtrl(level) == senderCtrl ) break;
+	}
+	/*for(int i=0;i<mColumnSelected;i++)
+	{
+		clientpt.x+=GetCtrl(level)->GetColumnWidth(i);
+	}
+	for(int i=0;i<level;i++)
+	{
+		clientpt.x+=GetSplitter(i)->GetSashPosition();
+	}
+	clientpt.y+=level*2;	*/
+	if(level==mLevelList.size()-1)
+	{
+		mColumnSelected+=1;
+		PopupMenu(menu, clientpt);
+	}
+	else if(mColumnSelected!=0)
+	{
+		PopupMenu(menu, clientpt);
+	}
+
+  }
+    //================================================================
+  void WxTreeView::OnPopupFilter(wxCommandEvent& event)
+  {
+		wxBusyCursor busy;
+		 GimmickDebugMessage(7,
+			"WxTreeView::OnEndLabelEdit" 
+			<<std::endl);
+	  wxObject* ctrl = event.GetEventObject(); 
+		unsigned int level = 0;
+		for (level = 0; level<mLevelList.size(); ++level)
+		{
+		if ( GetCtrl(level) == senderCtrl ) break;
+		}
+		std::string filter = crea::wx2std(wxGetTextFromUser(_T("Enter the filter to apply"), _T("Filter On Column")));
 		
-		for (j = (*i)->GetChildrenList().rbegin(); 
-			j!= (*i)->GetChildrenList().rend(); 
-			++j)
+		std::string att;
+		
+		long it = -1;
+		UpdateLevel(level+1);
+		
+		std::vector<long> items;
+		bool in=false;
+		int del=0;
+		for ( ;; )
+		{
+			it = GetCtrl(level)->GetNextItem(it,
+										wxLIST_NEXT_ALL);
+			if ( it == -1 )
+				break;
+			
+			long adr = GetCtrl(level)->GetItemData(it);
+			tree::Node* nod = ((ItemData*)adr)->node;
+			att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected-1]);
+			
+			
+			if(att.find(filter)>900)
 			{
-				nodes[num]=*j;
-				num++;
+				
+				if(!in)
+				{
+					in=true;
+				}
+				else
+				{
+					del+=1;
+				}
+				
+				items.push_back(it-del);
 			}
-      }
-	
-	  //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])))
+			
+		}
+		std::vector<long>::iterator iter;
+		for(iter=items.begin();iter!=items.end();++iter)
 		{
-		nodes[m] = nodes[m-1];
-		m = m - 1;
+			GetCtrl(level)->DeleteItem(*iter);
 		}
-		nodes[m] = index;
-	}
-
-	for (m=0; m<num; ++m)
-	{
-		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
-			 );
+		GetGimmickView()->ClearSelection();
+  }
+  //================================================================
 
-	    long id = GetCtrl(level)->InsertItem(item);
-		int n;
-		if ((node)->GetChildrenLoaded()) 
+  //================================================================
+  void WxTreeView::OnPopupSort(wxCommandEvent& event)
+  {
+		wxBusyCursor busy;
+		unsigned int level = 0;
+		for (level = 0; level<mLevelList.size(); ++level)
 		{
-			n=(node)->GetChildrenList().size();
+		if ( GetCtrl(level) == senderCtrl ) break;
 		}
-		else
+		if(event.GetId()==mAscendingID)
 		{
-			n= GetTreeHandler()->GetNumberOfChildren(node);
+			mDirection=true;
+		}
+		else if(event.GetId()==mDescendingID)
+		{
+			mDirection=false;
 		}
-		std::ostringstream oss;
-		
-		oss << n;
-		std::string s(oss.str());
-
-		GetCtrl(level)->SetItem(id,0, crea::std2wx(s));
-		GetCtrl(level)->SetColumnWidth(0, wxLIST_AUTOSIZE );
-		
-	  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 );
-		
-	      }
-	    
-	  }
 
-    
-    GetCtrl(level)->Show();
-*/
+        OnSort(level);
   }
   //================================================================
+  void WxTreeView::OnSort(int level)
+  { 	  
+	//Obtain the column name and the level that needs to be organized
 
-  void WxTreeView::ValidateSelectedImages()
-  {
-	int level=mLevelList.size();
-	std::vector<tree::Node*> sel=GetSelected(level+1);
-	bool valid=true;
-	std::string mess;
-	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)
+	if(level==mLevelList.size()-1||mColumnSelected!=0)
+	{	 
+		int l = level - 1;
+		//GetCtrl(level)->DeleteItem(0);
+		//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)
-					{
-						mess="The selected images are not compatible.";
-						valid=false;
-					}
+				GetCtrl(level)->SortItems(CompareFunctionStrings, 0);
+			}
+			
+		}
+		else
+		{
+			if(ty==1)
+			{
+				GetCtrl(level)->SortItems(CompareFunctionInts, 1);
+			}
+			else
+			{
+				GetCtrl(level)->SortItems(CompareFunctionStrings, 1);
 			}
 		}
 
-		//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) 
-				{
-					mess="Unknown image dimension : cannot select !";
-					valid= false;
-				}
-				else if (dim>GetMaxDimension())
-				{
-					mess="Selecting ";
-					mess+=dim;
-					mess+="D images is not allowed !";
-					valid= false;
-				}
-				if ( dim == GetMaxDimension() )
+		//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;
+			if(level<mLevelList.size()-1)
+			{
+				for(selection=mSelected.begin();selection!=mSelected.end();++selection)
 				{
-					mess="Cannot add this image to selection : would result in a ";
-					mess+=(dim+1);
-					mess+="D image!";
-					
-					valid= false;
+					if((*selection)->GetAttribute("ID").compare(n->GetAttribute("ID"))==0)
+					{
+						change.push_back(it);	
+					}
 				}
-				if ( dim < GetMinDimension() && sel.size()<2 )
+			}
+			else
+			{
+				for(selection=mLastLevelSelected.begin();selection!=mLastLevelSelected.end();++selection)
 				{
-					mess="Cannot build the selection as it would result in a ";
-					mess+=dim;
-					mess+="D image, and the minimum is ";
-					mess+=GetMinDimension();
-					mess+="D!";
-					valid= false;
+					if((*selection)->GetAttribute("ID").compare(n->GetAttribute("ID"))==0)
+					{
+						change.push_back(it);	
+					}
 				}
 			}
-	  }
-	else
-	{
-		mess="Cannot have 0 images selected";
-		GimmickMessage(1,"Cannot have 0 images selected"<< std::endl);
-		valid=false;
-	}
-	
-		//Send an event telling wether the selection is valid or not
-		wxCommandEvent event( 0, GetId() );
-		event.SetEventObject( this );
-		if(valid)
+			
+			
+		}
+		//Resets the selected items
+		std::vector<long>::iterator selectedIts;
+		for(selectedIts=change.begin();selectedIts!=change.end();++selectedIts)
 		{
-			mess="Selection OK !";
-			event.SetInt(0);
+			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);
+			
 		}
-		else
-		{event.SetInt(1);}
-		event.SetString(crea::std2wx(mess));
-		GetEventHandler()->ProcessEvent( event );
-	  
+		//GetCtrl(level)->InsertItem(0,_T("Filter:"));
+	}
 	
+   }
+ 
+  //================================================================
+  void WxTreeView::ValidateSelectedImages(bool isSelection)
+  {
+    GimmickDebugMessage(7,
+			"WxTreeView::ValidateSelectedImages" 
+			<<std::endl);
+    std::vector<tree::Node*> sel(GetSelected(mLevelList.size()+1));
+ 	GetGimmickView()->OnSelectionChange(sel,isSelection,(mLastSelected-1), mProcess);
+ 
   }
+  //================================================================
+
 
   //================================================================
+  void WxTreeView::GetNodes(std::vector<tree::Node*>& nodes, bool direction)
+  {
+	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 && item!=0)
+		{
+			adr = GetCtrl(level)->GetItemData(item);
+			nod = ((ItemData*)adr)->node;
+			nodes.push_back(nod);
+		}
+    }
 
+  }
 
-  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)
+	  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)
       {
-	TreeItemData *data = 
-	  (TreeItemData *)mTreeListCtrl->GetItemData(id[i]);
-	if ((data) && (data->IsDicomNode()))
-	  {
-	    if (data->GetDicomNode()->GetType()==DicomNode::Image)
-	      {
-		im.push_back ( data->GetDicomNode() );
+		  std::string filename=(*i)->GetAttribute("FullFileName");
+		  s.push_back(filename);
+	  }
+  }
 
-	      }
-	    else if (data->GetDicomNode()->GetType()==DicomNode::Series)
-	      {
-		DicomNode::ChildrenListType::iterator j;
-		for (j =data->GetDicomNode()->GetChildrenList().begin();
-		     j!=data->GetDicomNode()->GetChildrenList().end();
-		     j++) 
+   //================================================================
+  void WxTreeView::SetColor(int l, int item)
+  {
+	  int colorId=12;
+	  GetCtrl(l)->SetItemTextColour(item, wxColourDatabase().Find
+		   (crea::std2wx(mColorPalette[colorId])));
+	  GetCtrl(l)->SetItemState(item,wxLIST_STATE_SELECTED | wxLIST_STATE_FOCUSED, wxLIST_STATE_SELECTED);  /*
+	  int colorId=0;
+	  //Setting the color according to the parent
+		if(l==0)
+		{
+	        item.SetBackgroundColour
+		  (wxColourDatabase().Find
+		   (crea::std2wx(mColorPalette[colorId]))); 
+		mColorMap.insert
+		  (NodeColorPair
+		   (*j,wxColourDatabase().Find
+		    (crea::std2wx(mColorPalette[colorId]))));
+		if(colorId<64)
 		  {
-		    im.push_back ( *j );
+		    colorId++;
 		  }
-	      }
-	  }
-      }
-    // 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;
+		else
+			{
+			  colorId=0;
+			}
+		}
+		else if(l!=mLevelList.size()-1)
+		  {
+		    item.SetBackgroundColour(mColorMap[*i]); 
+			mColorMap.insert(NodeColorPair(*j,mColorMap[*i]));
+		}
+		else
+		{
+			item.SetBackgroundColour(mColorMap[*i]); 
+		}*/
   }
-
-  void WxTreeView::GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
+  //================================================================
+  void WxTreeView::CreateColorPalette()
   {
+  GimmickDebugMessage(6,"WxTreeView::CreateColorPalette");
+  mColorPalette.push_back("WHITE");
+  mColorPalette.push_back("LIGHT GREY");
+  mColorPalette.push_back("AQUAMARINE");
+  mColorPalette.push_back("MEDIUM FOREST GREEN");
+  mColorPalette.push_back("INDIAN RED");
+  mColorPalette.push_back("KHAKI");
+  mColorPalette.push_back("ORANGE");
+  mColorPalette.push_back("LIGHT BLUE");
+  mColorPalette.push_back("LIGHT STEEL BLUE");
+  mColorPalette.push_back("PINK");
+  mColorPalette.push_back("PLUM");
+  mColorPalette.push_back("PURPLE");
+  mColorPalette.push_back("RED");
+  mColorPalette.push_back("SEA GREEN");
+  mColorPalette.push_back("SIENNA");
+  mColorPalette.push_back("SKY BLUE");
+  mColorPalette.push_back("SLATE BLUE");
+  mColorPalette.push_back("SPRING GREEN");
+  mColorPalette.push_back("TAN");
+  mColorPalette.push_back("THISTLE");
+  mColorPalette.push_back("TURQUOISE");
+  mColorPalette.push_back("VIOLET");
+  mColorPalette.push_back("VIOLET RED");
+  mColorPalette.push_back("WHEAT");
+  mColorPalette.push_back("YELLOW");
+  mColorPalette.push_back("YELLOW GREEN");
+  mColorPalette.push_back("BLUE");
+  mColorPalette.push_back("BLUE VIOLET");
+  mColorPalette.push_back("BROWN");
+  mColorPalette.push_back("CADET BLUE");
+  mColorPalette.push_back("CORAL");
+  mColorPalette.push_back("CORNFLOWER BLUE");
+  mColorPalette.push_back("CYAN");
+  mColorPalette.push_back("DARK GREY");
+  mColorPalette.push_back("DARK GREEN");
+  mColorPalette.push_back("DARK OLIVE GREEN");
+  mColorPalette.push_back("DARK ORCHID");
+  mColorPalette.push_back("DARK SLATE BLUE");
+  mColorPalette.push_back("DARK SLATE GREY");
+  mColorPalette.push_back("DARK TURQUOISE");
+  mColorPalette.push_back("FIREBRICK");
+  mColorPalette.push_back("FOREST GREEN");
+  mColorPalette.push_back("GOLD");
+  mColorPalette.push_back("GOLDENROD");
+  mColorPalette.push_back("GREY");
+  mColorPalette.push_back("GREEN");
+  mColorPalette.push_back("GREEN YELLOW");
+  mColorPalette.push_back("LIME GREEN");
+  mColorPalette.push_back("MAGENTA");
+  mColorPalette.push_back("MAROON");
+  mColorPalette.push_back("MEDIUM AQUAMARINE");
+  mColorPalette.push_back("MEDIUM BLUE");
+  mColorPalette.push_back("MEDIUM GOLDENROD");
+  mColorPalette.push_back("MEDIUM ORCHID");
+  mColorPalette.push_back("MEDIUM SEA GREEN");
+  mColorPalette.push_back("MEDIUM SLATE BLUE");
+  mColorPalette.push_back("MEDIUM SPRING GREEN");
+  mColorPalette.push_back("MEDIUM TURQUOISE");
+  mColorPalette.push_back("MEDIUM VIOLET RED");
+  mColorPalette.push_back("MIDNIGHT BLUE");
+  mColorPalette.push_back("NAVY");
+  mColorPalette.push_back("ORANGE RED");
+  mColorPalette.push_back("ORCHID, PALE GREEN");
+  mColorPalette.push_back("STEEL BLUE");
+  mColorPalette.push_back("BLACK");
+
 
   }
-  BEGIN_EVENT_TABLE(WxTreeView, wxPanel)
+  //================================================================
+  BEGIN_EVENT_TABLE(WxTreeView, wxPanel)   
   /*
     EVT_SIZE(MyFrame::OnSize)
 
@@ -715,8 +965,10 @@ END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl)
     EVT_LIST_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnBeginDrag)
     EVT_LIST_BEGIN_RDRAG(LIST_CTRL, MyListCtrl::OnBeginRDrag)
-    EVT_LIST_BEGIN_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnBeginLabelEdit)
-    EVT_LIST_END_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnEndLabelEdit)
+	
+    EVT_LIST_BEGIN_LABEL_EDIT(-1, WxTreeView::OnBeginLabelEdit)
+    EVT_LIST_END_LABEL_EDIT(-1, WxTreeView::OnEndLabelEdit)
+	
     EVT_LIST_DELETE_ITEM(LIST_CTRL, MyListCtrl::OnDeleteItem)
     EVT_LIST_DELETE_ALL_ITEMS(LIST_CTRL, MyListCtrl::OnDeleteAllItems)
 #if WXWIN_COMPATIBILITY_2_4
@@ -731,10 +983,12 @@ BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl)
     EVT_LIST_KEY_DOWN(LIST_CTRL, MyListCtrl::OnListKeyDown)
     EVT_LIST_ITEM_ACTIVATED(LIST_CTRL, MyListCtrl::OnActivated)
     EVT_LIST_ITEM_FOCUSED(LIST_CTRL, MyListCtrl::OnFocused)
-
-    EVT_LIST_COL_RIGHT_CLICK(LIST_CTRL, MyListCtrl::OnColRightClick)
-	*/
+*/
+    EVT_LIST_COL_RIGHT_CLICK(-1, WxTreeView::OnColClick)
+	
     EVT_LIST_COL_CLICK(-1, WxTreeView::OnColClick)
+
+	//EVT_LEFT_DOWN(WxTreeView::OnMouseClick)
 	/*
     EVT_LIST_COL_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnColBeginDrag)
     EVT_LIST_COL_DRAGGING(LIST_CTRL, MyListCtrl::OnColDragging)
@@ -753,4 +1007,3 @@ END_EVENT_TABLE()
   
 } // EO namespace creaImageIO
 
-