X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOWxTreeView.cpp;h=e80697ab9491ac84d47ab1cf6ea36e327b5ee785;hb=00e4672c3c43da02dbbab0f23bf076c2c36532ea;hp=d34741cc9eaf3da4507746f85a60813822046001;hpb=403cc3cf787a717b7a9cdf2d148758a66dbdce27;p=creaImageIO.git

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index d34741c..e80697a 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,7 +197,16 @@ 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);
+			}
 	      }
 	  }	
       }
@@ -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,7 @@ namespace creaImageIO
 			    <<(*i)->GetLabel()
 			    <<"'"<<level
 			    <<std::endl);
-	
+	int _id=0;
 	//Adds columns
 	GetTreeHandler()->LoadChildren(*i,1);
 	tree::Node::ChildrenListType::reverse_iterator j;
@@ -260,9 +315,20 @@ namespace creaImageIO
 			 );
 
 	    ItemData* data = new ItemData;
-	    data->node = *j;
+	    
+		data->node = *j;
+		item.SetId(_id);
+		/*
+		std::string a=(*j)->GetAttribute(mLevelList[l].key[mColumnSelected-1]);
+		GimmickMessage(1,
+			"State Check: Att VAL"
+			    <<a
+			    <<std::endl);
+	*/
+		data->id = _id;
 	    item.SetData(data);
 	    
+		_id++;
 	  
 	    long id = GetCtrl(l)->InsertItem(item);
 
@@ -272,6 +338,7 @@ namespace creaImageIO
 	    oss << n;
 	    std::string s(oss.str());
 	    
+		
 	    item.SetText( crea::std2wx(s));
 	    //	    item.SetTextColour(*wxRED);
 	    //	    item.SetBackgroundColour(*wxBLACK); 
@@ -322,7 +389,7 @@ namespace creaImageIO
 
     wxListItem info;
     info.m_itemId = event.m_itemIndex;
-    
+    mLastSelected=event.m_itemIndex;
 
     // retrieve the level
     wxObject* obj = event.GetEventObject();   
@@ -335,137 +402,165 @@ namespace creaImageIO
 			" Level "<<level+1
 			<<std::endl);
     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)
+	if(mColumnSelected!=0)
 	{
-		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])))
+		wxObject* ctrl = event.GetEventObject(); 
+		unsigned int level = 0;
+		for (level = 0; level<mLevelList.size(); ++level)
 		{
-		nodes[m] = nodes[m-1];
-		m = m - 1;
+		if ( GetCtrl(level) == ctrl ) break;
 		}
-		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
-			 );
-
-	    long id = GetCtrl(level)->InsertItem(item);
-		int n;
-		if ((node)->GetChildrenLoaded()) 
+		UpdateLevel(level+1);
+		wxBusyCursor busy;
+	 
+		int l = level - 1;
+
+		//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++)
 		{
-			n=(node)->GetChildrenList().size();
+			  
+			//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(ty==1)
+			{
+				GetCtrl(level)->SortItems(CompareFunctionInts, 0);
+			}
+			else
+			{
+				GetCtrl(level)->SortItems(CompareFunctionStrings, 0);
+			}
+			
+			mDirection=false;
 		}
 		else
 		{
-			n= GetTreeHandler()->GetNumberOfChildren(node);
+			if(ty==1)
+			{
+				GetCtrl(level)->SortItems(CompareFunctionInts, 1);
+			}
+			else
+			{
+				GetCtrl(level)->SortItems(CompareFunctionStrings, 1);
+			}
+			mDirection=true;
 		}
-		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 );
-		
-	      }
-	    
-	  }
+		//Resets original data
+			
+		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]);
+			
+		}
+	}
+	
+   }
+  //================================================================
 
-    
-    GetCtrl(level)->Show();
-*/
+
+  //================================================================
+  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 );
+    */
+    // 
   }
   //================================================================
 
-  void WxTreeView::ValidateSelectedImages()
+
+  //================================================================
+  void WxTreeView::GetNodes(std::vector<tree::Node*>& nodes, bool direction)
   {
-		//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 );
+	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);
+		}
+    }
+
   }
+
   //================================================================
   void WxTreeView::GetSelectedAsString(std::vector<std::string>&s)
   {
@@ -559,4 +654,3 @@ END_EVENT_TABLE()
   
 } // EO namespace creaImageIO
 
-