X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxTreeView.cpp;h=c5eab8f3f8a553a9a834bc6e7079eb94d50c9129;hb=6cab96fd8ca99341053a1a6f8a9286940c535313;hp=7a948f5194c8218dd472dae123d0fb0c0b4a1ffa;hpb=71fb12908befc37ecb6021743cfc0704049db6e8;p=creaImageIO.git

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 7a948f5..c5eab8f 100644
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -82,7 +82,7 @@ namespace creaImageIO
     // Global sizer
     wxBoxSizer	*sizer = new wxBoxSizer(wxHORIZONTAL);
     
-    int ctrl_style = wxLC_REPORT | /*wxLC_VRULES |*/ wxLC_EDIT_LABELS;
+    int ctrl_style = wxLC_REPORT | wxLC_VRULES;
     int col_style = wxLIST_FORMAT_LEFT;
 
     // Creating the ListCtrl for the levels > 0 (not for Root level)
@@ -111,39 +111,63 @@ namespace creaImageIO
 	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;
 	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"));
-		
-		    ctrl->InsertColumn(col,it);
-		    col++;
-		  }
-		  
+	
 		GimmickDebugMessage(5,"Creating column "<<col<<" : "
 				<<a->GetName()
 				<<std::endl);
+
+		if(a->GetFlags()!=creaImageIO::tree::AttributeDescriptor::PRIVATE)
+		{
+
+		if(a->GetName()=="UNKNOWN")
+		{
+           title = "#";
+		   title += handler->GetTree().GetLevelDescriptor(i+1).GetName();
+		if (title[title.size()-1]!='s')
+	      title += "s";
+
+		}
+		else
+		{
+			title=a->GetName();
+		}
 		ctrl->InsertColumn(col, 
-				crea::std2wx(a->GetName()),
+				crea::std2wx(title),
 				col_style);
 		level.key.push_back(a->GetKey());
 		//	    ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE );
 		col++;
-		
+		}
 		
 	  }
 	  
 	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
  
@@ -152,7 +176,8 @@ namespace creaImageIO
 	mLastSelected=0;
 	mDirection=true;
 	mSelectionMade=false;
-	CreateColorPalette();
+	mProcess=true;
+	//CreateColorPalette();
     UpdateLevel(1);
 
     SetSizer( sizer );     
@@ -292,105 +317,61 @@ namespace creaImageIO
     GetCtrl(l)->DeleteAllItems();
     
     std::vector<tree::Node*>::iterator i;
-    //Adds the first item (filter)
-    GetCtrl(l)->InsertItem(0, _T("Filter:"));
-    for (i=sel.begin(); i!=sel.end(); ++i)
+	
+ 	for (i=sel.begin(); i!=sel.end(); ++i)
       {
 	GimmickDebugMessage(2,
 			    "adding children of '"
 			    <<(*i)->GetLabel()
-			    <<"'"<<level
+			    <<"'"
 			    <<std::endl);
 	int _id=1;
-	int colorId=0;
-
 	
-
-	//Adds items (other than the first) and sets their attributes 
+	//Adds items 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.SetId(_id);
+		item->SetId(_id);
 
 		data->id = _id;
-	    item.SetData(data);
+	    item->SetData(data);
 	    
 		_id++;
-	    long id=GetCtrl(l)->InsertItem(item);
-		
-		//Setting first column (number of children)
-	    std::ostringstream oss;
-	    int	n= GetTreeHandler()->GetNumberOfChildren(*j);
-	    oss << n;
-	    std::string s(oss.str());
-	    item.SetText( crea::std2wx(s));
-	
-		//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)
-		  {
-		    colorId++;
-		  }
-		else
-			{
-			  colorId=0;
-			}
-		}
-		else if(l!=mLevelList.size()-1)
-		  {
-		    item.SetBackgroundColour(mColorMap[*i]); 
-			mColorMap.insert(NodeColorPair(*j,mColorMap[*i]));
-		}
-		else
-		{
-			item.SetBackgroundColour(mColorMap[*i]); 
-		}
+		GetCtrl(l)->InsertItem(*item);
 		
+		//Setting attributes
 
-	    item.SetColumn(0);
-	    GetCtrl(l)->SetItem(item);
-		
-		//Setting other attributes
-	  for (int k=1; k<GetCtrl(l)->GetColumnCount(); k++)
+		for (int k=0; 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);	
-	      }	    
+			  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)->DeleteItem(0);
       }
     
     GetCtrl(l)->Show();
-	
-    
-    if (level<mLevelList.size()) UpdateLevel(level+1);
-	
+    	
  }
   //=====================================================================
 
@@ -402,51 +383,43 @@ 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;
-	for (level = 0; level<mLevelList.size(); ++level)
-	{
+    mLastSelected = event.m_itemIndex;
+    // retrieve the level
+    wxObject* obj = event.GetEventObject();   
+    unsigned int level = 0;
+    for (level = 0; level<mLevelList.size(); ++level)
+      {
 	if ( GetCtrl(level) == obj ) break;
-	}
-	GimmickDebugMessage(1,
+      }
+    GimmickDebugMessage(1,
 			" Level "<<level+1
 			<<std::endl);
-
-	if(event.m_itemIndex!=0)
-	{
-		if(level<mLevelList.size()-1)
-		{
-		mSelected=GetSelected(level+2);
-		}
-		else
-		{
-		mLastLevelSelected=GetSelected(level+2);
-		}
-		
-		if (level<mLevelList.size()-1) 
-		{
-			UpdateLevel( level + 2 ); 
-			GetGimmickView()->ClearSelection();
-		}
-		if (level==mLevelList.size()-2) SelectLowerLevel();
-		if (level==mLevelList.size()-1) ValidateSelectedImages ();
-	}
+    
+    // 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
-	{
-		if(event.GetEventType()==10145)
-		{
-		
-		GetCtrl(level)->SetItemText(0,crea::std2wx(""));
-		GetCtrl(level)->EditLabel(event.m_itemIndex);
-		}
-		
-	}
-	
+	  {
+	    ValidateSelectedImages (false);
+	  }
+      }
+    
   }
   //================================================================
 
@@ -461,40 +434,127 @@ namespace creaImageIO
                                      wxLIST_NEXT_ALL);
         if ( item == -1 )
             break;
-		if(item!=0)
+
+		if(item==(GetCtrl(level)->GetItemCount()-1))
+		{
+			mProcess=true;
+		}
+		else
 		{
+			mProcess=false;
+		}
 		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);
-		}
     }
-
-	
   }
 
   //================================================================
-
   //================================================================
+
   void WxTreeView::OnColClick(wxListEvent& event)
-  { 	  
-	//Obtain the column name and the level that needs to be organized
+  { 
 	mColumnSelected=event.m_col;
-    GimmickDebugMessage(1,
-		" Column selected: " <<event.m_col
-			<<std::endl);
-
-	if(mColumnSelected!=0)
+	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)
 	{
-		wxObject* ctrl = event.GetEventObject(); 
+	if ( GetCtrl(level) == senderCtrl ) break;
+	}
+	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) == ctrl ) break;
+		if ( GetCtrl(level) == senderCtrl ) break;
 		}
+		std::string filter = crea::wx2std(wxGetTextFromUser(_T("Enter the filter to apply"), _T("Filter On Column")));
+		
+		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]);
+			
+			
+			if(att.find(filter)>900)
+			{
+				
+				if(!in)
+				{
+					in=true;
+				}
+				else
+				{
+					del+=1;
+				}
+				
+				items.push_back(it-del);
+			}
+			
+		}
+		std::vector<long>::iterator iter;
+		for(iter=items.begin();iter!=items.end();++iter)
+		{
+			GetCtrl(level)->DeleteItem(*iter);
+		}
+		GetGimmickView()->ClearSelection();
+  }
+  //================================================================
+
+  //================================================================
+  void WxTreeView::OnPopupSort(wxCommandEvent& event)
+  {
 		wxBusyCursor busy;
-	 
+		unsigned int level = 0;
+		for (level = 0; level<mLevelList.size(); ++level)
+		{
+		if ( GetCtrl(level) == senderCtrl ) break;
+		}
+		if(event.GetId()==mAscendingID)
+		{
+			mDirection=true;
+		}
+		else if(event.GetId()==mDescendingID)
+		{
+			mDirection=false;
+		}
+
+        OnSort(level);
+  }
+  //================================================================
+  void WxTreeView::OnSort(int level)
+  { 	  
+	//Obtain the column name and the level that needs to be organized
+
 		int l = level - 1;
-		GetCtrl(level)->DeleteItem(0);
 		//Sets the data for the items to be sorted
 		std::string att;
 		unsigned int ty=0;
@@ -504,14 +564,15 @@ namespace creaImageIO
 			  
 			//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);
+				(*nod).GetAttributeDescriptor(mLevelList[level].key[mColumnSelected]).DecodeType(ty);
 			}
 			//Obtains the organizing attribute
-			att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected-1]);
+			att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected]);
 			
 			char* d= new char [att.size()+1];
 			strcpy (d, att.c_str());
@@ -536,7 +597,6 @@ namespace creaImageIO
 				GetCtrl(level)->SortItems(CompareFunctionStrings, 0);
 			}
 			
-			mDirection=false;
 		}
 		else
 		{
@@ -548,10 +608,10 @@ namespace creaImageIO
 			{
 				GetCtrl(level)->SortItems(CompareFunctionStrings, 1);
 			}
-			mDirection=true;
 		}
 
 		//Resets original data
+		
 		std::vector<tree::Node*>::iterator selection;
 		std::vector<long> change;
 		long it = -1;
@@ -565,112 +625,20 @@ namespace creaImageIO
 			//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)
-				{
-					if((*selection)->GetAttribute("ID").compare(n->GetAttribute("ID"))==0)
-					{
-						change.push_back(it);	
-					}
-				}
-			}
-			else
-			{
-				for(selection=mLastLevelSelected.begin();selection!=mLastLevelSelected.end();++selection)
-				{
-					if((*selection)->GetAttribute("ID").compare(n->GetAttribute("ID"))==0)
-					{
-						change.push_back(it);	
-					}
-				}
-			}
-			
+			tree::Node* n= ((ItemData*)((long*)item)[0])->node;			
 			
 		}
-		//Resets the selected items
-		std::vector<long>::iterator selectedIts;
-		for(selectedIts=change.begin();selectedIts!=change.end();++selectedIts)
-		{
-			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);
-			
-		}
-		GetCtrl(level)->InsertItem(0,_T("Filter:"));
-	}
 	
    }
+ 
   //================================================================
-  void WxTreeView::OnBeginLabelEdit(wxListEvent& event)
-  {
-	GimmickDebugMessage(7,
-			"WxTreeView::OnBeginLabelEdit" 
-			<<std::endl);
-	if(event.m_itemIndex!=0)
-	{
-		event.Veto();
-	}
-
-  }
-
-  //================================================================
-  void WxTreeView::OnEndLabelEdit(wxListEvent& event)
-  {
-	  GimmickDebugMessage(7,
-			"WxTreeView::OnEndLabelEdit" 
-			<<std::endl);
-	  wxObject* ctrl = event.GetEventObject(); 
-		unsigned int level = 0;
-		for (level = 0; level<mLevelList.size(); ++level)
-		{
-		if ( GetCtrl(level) == ctrl ) break;
-		}
-		std::string filter = crea::wx2std(event.m_item.m_text.c_str());
-		
-		std::string att;
-		
-		long it = -1;
-		UpdateLevel(level+1);
-		
-		for ( ;; )
-		{
-			bool contains=false;
-			it = GetCtrl(level)->GetNextItem(it,
-										wxLIST_NEXT_ALL);
-			if ( it == -1 )
-				break;
-			if(it!=0)
-			{
-				long adr = GetCtrl(level)->GetItemData(it);
-				for (int j=1;j<GetCtrl(level)->GetColumnCount()-1&&!contains;j++)
-				{
-				tree::Node* nod = ((ItemData*)adr)->node;
-				att=(*nod).GetAttribute(mLevelList[level].key[j-1]);
-			
-				if(att.find(filter)<900)
-				{
-					contains=true;
-				}
-				}
-				if(!contains)
-				{
-					GetCtrl(level)->DeleteItem(it);
-				}
-			}
-		}
-		GetGimmickView()->ClearSelection();
-		//GetCtrl(level)->DeleteAllItems();
-
-  }
-  //================================================================
-  void WxTreeView::ValidateSelectedImages()
+  void WxTreeView::ValidateSelectedImages(bool isSelection)
   {
     GimmickDebugMessage(7,
 			"WxTreeView::ValidateSelectedImages" 
 			<<std::endl);
     std::vector<tree::Node*> sel(GetSelected(mLevelList.size()+1));
- 	GetGimmickView()->OnSelectionChange(sel);
+ 	GetGimmickView()->OnSelectionChange(sel,isSelection,(mLastSelected-1), mProcess);
  
   }
   //================================================================
@@ -701,7 +669,7 @@ namespace creaImageIO
 		{
             break;
 		}
-		if(GetCtrl(level)->GetItemState(item, wxLIST_STATE_SELECTED)==0 && item!=0)
+		if(GetCtrl(level)->GetItemState(item, wxLIST_STATE_SELECTED)==0 /*&& item!=0*/)
 		{
 			adr = GetCtrl(level)->GetItemData(item);
 			nod = ((ItemData*)adr)->node;
@@ -725,6 +693,43 @@ namespace creaImageIO
 	  }
   }
 
+   //================================================================
+  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)
+		  {
+		    colorId++;
+		  }
+		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::CreateColorPalette()
   {
@@ -798,7 +803,7 @@ namespace creaImageIO
 
   }
   //================================================================
-  BEGIN_EVENT_TABLE(WxTreeView, wxPanel)
+  BEGIN_EVENT_TABLE(WxTreeView, wxPanel)   
   /*
     EVT_SIZE(MyFrame::OnSize)
 
@@ -839,10 +844,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(-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
@@ -857,10 +862,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)