X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxTreeView.cpp;h=8dbc4af1f7026217ce38404fea55efce57b46edd;hb=refs%2Fheads%2Fvtk9itk5wx3-macos;hp=c324fab08cb941739990890d0ee73e22a7609bd3;hpb=a017698656cb78088a9ecbf2c8fe238327474995;p=creaImageIO.git

diff --git a/src/creaImageIOWxTreeView.cpp b/src/creaImageIOWxTreeView.cpp
index c324fab..8dbc4af 100644
--- a/src/creaImageIOWxTreeView.cpp
+++ b/src/creaImageIOWxTreeView.cpp
@@ -44,34 +44,24 @@ namespace creaImageIO
 
 //=====================================================================
 ///Comparing function for ordering algorithm. Takes parameters as strings.
-int wxCALLBACK CompareFunctionStrings(long item1, long item2, long sortData)
+//int wxCALLBACK CompareFunctionStrings(long item1, long item2, long sortData)
+int wxCALLBACK CompareFunctionStrings(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData)
 {	
   creaImageIO::ItemData* data1 = (creaImageIO::ItemData*)item1;
   creaImageIO::ItemData* data2 = (creaImageIO::ItemData*)item2;
-
   const std::string& s1(*(data1->attr));
-  const std::string& s2(*(data2->attr));
-  
+  const std::string& s2(*(data2->attr));  
   if(sortData==1)
     {
       // inverse the order
-      if (s1 < s2)
-	return 1;
-      if (s1 > s2)
-	return -1;
-      
+      if (s1 < s2)  return 1;
+      if (s1 > s2)  return -1;
       return 0;
-    }
-  else
-    {
-      if (s1 < s2)
-	return -1;
-      if (s1 > s2)
-	return 1;
-      
+    }  else  {
+      if (s1 < s2)	return -1;
+      if (s1 > s2)	return 1;
       return 0;
-      
-    }
+    } // if sortData	
 }
 //=====================================================================
 
@@ -473,17 +463,12 @@ namespace creaImageIO
 			<<"WxTreeView::RecursiveUpdateLevel(level "
 			<<level
 			<<")"<<std::endl);
-    
     int l = level - 1;	
     const std::vector<tree::Node*>& sel(GetSelected(level));
-    
-    
     // to speed up inserting we hide the control temporarily
     GetCtrl(l)->Hide();
     GetCtrl(l)->DeleteAllItems();
-    
     std::vector<tree::Node*>::const_iterator i;
-    
     for (i=sel.begin(); i!=sel.end(); ++i)
     {
 	GimmickDebugMessage(1,
@@ -492,9 +477,7 @@ namespace creaImageIO
 			    <<"'"
 			    <<std::endl);
 	int _id=0;
-	
-	//Adds items and sets their attributes 
-	
+	//Adds items and sets their attributes
 	GetTreeHandler()->LoadChildren(*i,1);
 	tree::Node::ChildrenListType::reverse_iterator j;
 	for (j = (*i)->GetChildrenList().rbegin(); 
@@ -506,7 +489,6 @@ namespace creaImageIO
 				<<(*j)->GetLabel()
 				<<"'"
 				<<std::endl);
-	    
 	    wxListItem item;
 	    item.SetMask(wxLIST_MASK_STATE | 
 			 wxLIST_MASK_TEXT |
@@ -519,13 +501,10 @@ namespace creaImageIO
 		ItemData* data 	= new ItemData();
 	    data->node 		= *j;
 	    data->id 		= _id;
-		
 	    item.SetId(_id);
 	    item.SetData(data);
-
 	    _id++;
 	    GetCtrl(l)->InsertItem(item);
-	    
 	    //Setting attributes
 	    for (int k=0; k<GetCtrl(l)->GetColumnCount(); ++k)				
 	    {
@@ -543,7 +522,7 @@ namespace creaImageIO
 				std::string valtmp(val);
 				try
 				{
-					boost::gregorian::date d1(boost::gregorian::from_undelimited_string(val));				   
+					boost::gregorian::date d1(boost::gregorian::from_undelimited_string(val));
 					val = to_iso_extended_string(d1);
 				} catch (...) {
 					val =  valtmp;
@@ -567,14 +546,12 @@ namespace creaImageIO
 			}
 			item.SetText( crea::std2wx(val));
 			item.SetColumn(k);
-		  
 			GetCtrl(l)->SetItem(item);
 		} // for k
 		item.Clear();
-	    
-	  } // for j
-      }  // for i
-    
+  	  } // for j
+
+    }  // for i
     SortLevel(l);
     GetCtrl(l)->Show();
   }
@@ -794,7 +771,6 @@ namespace creaImageIO
       {
 	mLevelList[level].SortAscending = false;
       }
-	  
     SortLevel(level);
   }
   //================================================================
@@ -960,13 +936,11 @@ namespace creaImageIO
 			data->selected = true;
 			nbselected++;
 		} // if
-    }// for
-	
+    }// for	
     GimmickDebugMessage(1,
 			"WxTreeView::OnSort : " 
 			<<nbselected<<" selected before sorting"
 			<<std::endl);  
-
     mIgnoreSelectedChanged = true; 
     // 
     if (mLevelList[level].SortAscending)