X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOWxTreeView.cpp;h=e644d5e1ba1420449c1d64564e440eb016b7216c;hb=9f8b288b5f8f56bc58fd01ddcb687833eb5ffa5b;hp=505bf80b21c02e22ac17d35c3315fa97b7856f8c;hpb=eb6dbb22921be6bf7061773b25205446619966c6;p=creaImageIO.git

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 505bf80..e644d5e 100644
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -5,10 +5,6 @@
 #include <wx/gdicmn.h>
 #include <boost/date_time/gregorian/gregorian.hpp>
 
-
-
-
-
 const std::string empty_string("");
 
 //=====================================================================
@@ -114,7 +110,7 @@ namespace creaImageIO
 			 wxWindow* parent,
 			 const wxWindowID id)
     : wxPanel(parent,id),
-      TreeView(handler,gimmick)
+      TreeView(handler, gimmick)
   {
     GimmickDebugMessage(1,"WxTreeView::WxTreeView"
 			<<std::endl);
@@ -163,12 +159,12 @@ namespace creaImageIO
 					  ctrl_style);
 	level.wxCtrl = ctrl;
 	level.wxSplitter->Initialize(ctrl);
-
-
+   
 	// Create the columns : one for each attribute of the level
 	int col = 0;
 	std::string title;
-	tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a;
+
+  	tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a;
 	for (a  = handler->GetTree().GetAttributeDescriptorList(i+1).begin();
 	     a != handler->GetTree().GetAttributeDescriptorList(i+1).end();
 	     ++a)
@@ -197,16 +193,13 @@ namespace creaImageIO
 		  std::string temp = a->GetKey();
 		  if (temp.compare("ID") != 0)
 		  {
+		
 		ctrl->InsertColumn(col, 
 				   crea::std2wx(title),
 				   col_style);
 		col++;
 		  }
 		level.key.push_back(a->GetKey());
-
-		//	    ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE );
-
-		
 	      }
 		
 	  }
@@ -343,6 +336,7 @@ namespace creaImageIO
 	      }
 	    if(erase)
 		  {
+            GetGimmickView()->modifyValidationSignal(false);
 		    bool needRefresh=false;
 		    std::vector<tree::Node*>::const_iterator i;
 		    for (i=sel.begin(); i!=sel.end(); ++i)
@@ -356,7 +350,10 @@ namespace creaImageIO
 			  {
 			    needRefresh=true;
 			  }
-			GetTreeHandler()->Remove(*i);
+			  tree::Node* n= (tree::Node*)(*i);
+			  GetTreeHandler()->LoadChildren((*i),4);
+			  GetGimmickView()->AddIgnoreFile(n);
+			  GetTreeHandler()->Remove(*i);
 		      }
 		    
 		    if(needRefresh && mLastLevel>1)
@@ -382,9 +379,6 @@ namespace creaImageIO
   }
   
   
-  //=====================================================================
-
- 
   //=====================================================================
   /// Updates a level of the view (adds or removes children, etc.)
   void WxTreeView::UpdateLevel( int level )
@@ -410,7 +404,7 @@ namespace creaImageIO
   }
   //=====================================================================
   
- //=====================================================================
+  //=====================================================================
   /// Recursive method called upon by UpdateLevel to refresh all windows
   void WxTreeView::RecursiveUpdateLevel( int level )
   {
@@ -420,11 +414,11 @@ namespace creaImageIO
 			<<level
 			<<")"<<std::endl);
     
-
+    
     const std::vector<tree::Node*>& sel(GetSelected(level));
-
+    
     int l = level - 1;
- 
+    
     // to speed up inserting we hide the control temporarily
     GetCtrl(l)->Hide();
     GetCtrl(l)->DeleteAllItems();
@@ -441,76 +435,89 @@ namespace creaImageIO
 	int _id=0;
 	
 	//Adds items and sets their attributes 
-
+	
 	GetTreeHandler()->LoadChildren(*i,1);
 	tree::Node::ChildrenListType::reverse_iterator j;
 	for (j = (*i)->GetChildrenList().rbegin(); 
 	     j!= (*i)->GetChildrenList().rend(); 
 	     ++j)
 	  {
-			GimmickDebugMessage(1,
-						"adding children "
-						<<(*j)->GetLabel()
-						<<"'"
-						<<std::endl);
-
-				wxListItem item;
-				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;
-				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)				
-				{
-					std::string val;
-					//  Temporary correction : it works but no explanation about the problem FCY
-					if(k==0 && level <3)
-						val = (*j)->GetAttribute("NumberOfChildren");
-					else
-						val = (*j)->GetAttribute(mLevelList[l].key[k]);
-					if(((*j)->GetAttributeDescriptor(mLevelList[l].key[k])).isDateEntry()) // Date
-					{
-						boost::gregorian::date d1(boost::gregorian::from_undelimited_string(val));
-						val = to_iso_extended_string(d1);
-					}
-					else if(((*j)->GetAttributeDescriptor(mLevelList[l].key[k])).isTimeEntry()) // Time
-					{
-						if (val != "" || val != " ")
-							val = val.substr(0,2) + " : " + val.substr(2,2) + " : " + val.substr(4,2);
-					}
-					else
-					{
-
-					}
-					if (val.size()==0) val = "?";
-					item.SetText( crea::std2wx(val));
-					item.SetColumn(k);
-					GetCtrl(l)->SetItem(item);
-				}	
-			    
-			}
+	    GimmickDebugMessage(1,
+				"adding children "
+				<<(*j)->GetLabel()
+				<<"'"
+				<<std::endl);
+	    
+	    wxListItem item;
+	    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;
+	    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)				
+	      {
+		std::string val;
+		//  Temporary correction : it works but no explanation about the problem FCY
+		if(k==0 && level <3)
+		  val = (*j)->GetAttribute("NumberOfChildren");
+		else
+		  val = (*j)->GetAttribute(mLevelList[l].key[k]);
+		if(((*j)->GetAttributeDescriptor(mLevelList[l].key[k])).isDateEntry()) // Date
+		  {
+		    //					  std::cout << "["<<val<< "]" << std::endl;
+		    std::string valtmp(val);
+		    try
+		      {
+			boost::gregorian::date d1(boost::gregorian::from_undelimited_string(val));				   
+			val = to_iso_extended_string(d1);
+		      }
+		    catch (...)
+		      {
+			val =  valtmp;
+		      }
+		    //					  std::cout << "["<<val<< "]" << std::endl;	
+		  }
+		else if(((*j)->GetAttributeDescriptor(mLevelList[l].key[k])).isTimeEntry()) // Time
+		  {
+		    if ((val.size()>6) && 
+			(val != "" || val != " "))
+		      val = val.substr(0,2) + " : " 
+			+ val.substr(2,2) + " : " 
+			+ val.substr(4,2);
+		  }
+		else
+		  {
+		    
+		  }
+		if (val.size()==0) val = "?";
+		item.SetText( crea::std2wx(val));
+		item.SetColumn(k);
+		GetCtrl(l)->SetItem(item);
+	      }	
+	    
+	  }
       }
-
+    
     SortLevel(l);
     GetCtrl(l)->Show();
- }
+  }
   //=====================================================================
-
-
+  
+  
   //================================================================
   void WxTreeView::OnItemDeSelected(wxListEvent& event)
   { 
@@ -525,9 +532,12 @@ namespace creaImageIO
 	if ( GetCtrl(level) == obj ) break;
       } 
     SetSelectedUpToDate(level,false);
+    // to allow a first selection in images TreeView
+    if (level==mLevelList.size()-1) 
+      OnItemSelected(event);
   }
   //================================================================
-
+  
   //================================================================
   void WxTreeView::OnItemSelected(wxListEvent& event)
   { 
@@ -711,7 +721,7 @@ namespace creaImageIO
       {
 	mLevelList[level].SortAscending = false;
       }
-    
+	  
     SortLevel(level);
   }
   //================================================================
@@ -897,8 +907,10 @@ namespace creaImageIO
   {
 	  if(event.GetKeyCode() == WXK_DELETE)
 	  {
-		    RemoveSelected();
-		//	ClearSelection();
+		   wxBusyCursor busy;
+		  
+		   RemoveSelected();
+		   GetGimmickView()->ClearSelection();
 	  }
 		  
   }