X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxTreeView.cpp;h=0f2363227ffda5ecaa3f036c153a7045f4f05a7d;hb=67ba001e49dd897529b15024108831bdd4621edf;hp=2050e53eb036adee2b39bde5d3141be49ba56757;hpb=42f7c93a6f8fc2beeb8709be1b3616ec40f4699e;p=creaImageIO.git

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 2050e53..0f23632 100644
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -106,12 +106,11 @@ namespace creaImageIO
   //=====================================================================
   // CTor
   WxTreeView::WxTreeView(TreeHandler* handler,
-			 TimestampDatabaseHandler* tdh,
 			 GimmickView* gimmick,
 			 wxWindow* parent,
 			 const wxWindowID id)
     : wxPanel(parent,id),
-      TreeView(handler, tdh, gimmick)
+      TreeView(handler, gimmick)
   {
     GimmickDebugMessage(1,"WxTreeView::WxTreeView"
 			<<std::endl);
@@ -210,6 +209,7 @@ namespace creaImageIO
     
 #if wxUSE_MENUS
 
+	 // Column Menu
     menu =new wxMenu;
 	wxMenuItem* m1=menu->Append(wxID_ANY, _T("&Sort ascending"));
 	wxMenuItem* m2=menu->Append(wxID_ANY, _T("&Sort descending"));
@@ -220,6 +220,19 @@ namespace creaImageIO
 	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) );
+
+
+
+	//ItemMenu
+	menuItem =new wxMenu;
+	wxMenuItem* m1Item=menuItem->Append(wxID_ANY, _T("&Anonymize"));
+	wxMenuItem* m2Item=menuItem->Append(wxID_ANY, _T("&Local Copy"));
+	
+	mAnonymizingID=m1Item->GetId();
+	mLocalCopyID=m2Item->GetId();
+	//Connect( mAnonymizingID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnAnonymize) );
+	//Connect( mLocalCopyID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnLocalCopy) );
+	
 	
 #endif // wxUSE_MENUS
 
@@ -264,16 +277,39 @@ namespace creaImageIO
     // the selection of upper level
     std::vector<tree::Node*>& sel(mLevelList[level-1].Selected);
     sel.clear();
-
-    if (level == 1) 
+	  if (level == 1) 
       {
 	sel.push_back(GetTreeHandler()->GetTree().GetTree());
       }
     else if (level < 5) 
     {
-		int n = GetCtrl(l-1)->GetItemCount();
-		for (int i = 0; i < n; i++)
+		long item = -1;
+		for ( ;; )
+		{
+			item = GetCtrl(l-1)->GetNextItem(item,
+										 wxLIST_NEXT_ALL,
+										 wxLIST_STATE_SELECTED);
+			if ( item == -1 )
+				break;
+			long adr = GetCtrl(l-1)->GetItemData(item);
+			tree::Node* n = ((ItemData*)adr)->node;
+			if(mLastSelected==item)
+			{
+				std::vector<tree::Node*>::iterator it;
+				it = sel.begin();
+				it = sel.insert ( it , n );
+			}
+			else
+			{
+				
+				sel.push_back(n);
+			}			
+			
+		}
+		/*int n = GetCtrl(l-1)->GetItemCount();
+		for (int i = 0; i<n; i++)
 		{
+			std::cout<<GetCtrl(l-1)->GetItemState(i,wxLIST_STATE_SELECTED)<<std::endl;
 			if ( GetCtrl(l-1)->GetItemState(i,wxLIST_STATE_SELECTED))
 			{
 				long adr = GetCtrl(l-1)->GetItemData(i);
@@ -286,17 +322,16 @@ namespace creaImageIO
 				}
 				else
 				{
+					
 					sel.push_back(n);
 				}
 			}
-	      }
+	      }*/
 	  }
 	else
 	{
 		// NOTHING
-	}
-
-     
+	}   
 	 
     //    return mLevelList[level-1].Selected;
     return sel;
@@ -351,8 +386,10 @@ namespace creaImageIO
 			  {
 			    needRefresh=true;
 			  }
-			 GetTimestampDatabaseHandler()->RemoveNode("PATH",(*i));
-			GetTreeHandler()->Remove(*i);
+			  tree::Node* n= (tree::Node*)(*i);
+			  GetTreeHandler()->LoadChildren((*i),4);
+			  GetGimmickView()->AddIgnoreFile(n);
+			  GetTreeHandler()->Remove(*i);
 		      }
 		    
 		    if(needRefresh && mLastLevel>1)
@@ -403,7 +440,7 @@ namespace creaImageIO
   }
   //=====================================================================
   
- //=====================================================================
+  //=====================================================================
   /// Recursive method called upon by UpdateLevel to refresh all windows
   void WxTreeView::RecursiveUpdateLevel( int level )
   {
@@ -413,11 +450,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();
@@ -434,76 +471,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)
   { 
@@ -518,15 +568,16 @@ 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);
+    // to allow a first selection in images TreeView
+    if (level==mLevelList.size()-1) 
+      OnItemSelected(event);
   }
   //================================================================
-
+  
   //================================================================
   void WxTreeView::OnItemSelected(wxListEvent& event)
   { 
+	  
     GimmickDebugMessage(1,
 			GetTreeHandler()->GetTree().GetLabel()
 			<<" WxTreeView::OnItemSelected"<<std::endl);
@@ -569,13 +620,13 @@ namespace creaImageIO
     // Validate selected images if the selection is at image level
     if (level==(mLevelList.size()-1)) //&&mProcess) 
       {
-	if(event.GetEventType()==10145)
+	if(event.GetEventType()==wxEVT_COMMAND_LIST_ITEM_SELECTED)
 	  {
-	    ValidateSelectedImages (true);
+		  ValidateSelectedImages (true);
 	  }
 	else
 	  {
-	    ValidateSelectedImages (false);
+		  ValidateSelectedImages (false);
 	  }
       }
     
@@ -625,7 +676,22 @@ namespace creaImageIO
     PopupMenu(menu, clientpt);
     
   }
+
+  void WxTreeView::OnItemMenu(wxListEvent &event)
+  {
+	 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;
+      }
+    PopupMenu(menuItem, clientpt);
     
+  }
+  
   //================================================================
   //================================================================
 
@@ -635,7 +701,6 @@ namespace creaImageIO
     GimmickDebugMessage(7,
 			"WxTreeView::OnEndLabelEdit" 
 			<<std::endl);
-    wxObject* ctrl = event.GetEventObject(); 
     unsigned int level = 0;
     for (level = 0; level<mLevelList.size(); ++level)
       {
@@ -1081,7 +1146,7 @@ BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl)
   */
     EVT_LIST_KEY_DOWN(-1, WxTreeView::OnKeyDown)
     EVT_LIST_ITEM_SELECTED(-1, WxTreeView::OnItemSelected)
-  
+	EVT_LIST_ITEM_RIGHT_CLICK(-1, WxTreeView::OnItemMenu)
     EVT_LIST_ITEM_DESELECTED(-1, WxTreeView::OnItemDeSelected)
 	/*
     EVT_LIST_KEY_DOWN(LIST_CTRL, MyListCtrl::OnListKeyDown)