X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOWxTreeView.cpp;h=e7a004214a3a6614301162d506401c1fc8bc0edb;hb=d650256e38052b06baf671b027b855a1ad27f578;hp=4b1e5cd0b097cf4e87b5bff40606c27949c54cbe;hpb=f4171ab3f5bff76f21258d8b2cb7a7da5c94a591;p=creaImageIO.git

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 4b1e5cd..e7a0042 100644
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -101,6 +101,10 @@ namespace creaImageIO
 	if (i>1) sparent = mLevelList[i-2].wxSplitter;
 
 	level.wxSplitter = new wxSplitterWindow( sparent , -1);
+	if(i!=1)
+	{
+	level.wxSplitter->Show(false);
+	}
 	//	    level.wxSplitter->SetMinimumPaneSize(100);
 	
 	wxListCtrl* ctrl = new wxListCtrl(level.wxSplitter,
@@ -111,21 +115,10 @@ namespace creaImageIO
 	level.wxCtrl = ctrl;
 	level.wxSplitter->Initialize(ctrl);
 
-	// Create the first column : number of children
-	if(i<handler->GetTree().GetNumberOfLevels()-1)
-	{
-	std::string title = "#";
-	if (i<handler->GetTree().GetNumberOfLevels()-1)
-	  {
-	    title += handler->GetTree().GetLevelDescriptor(i+1).GetName();
-	    if (title[title.size()-1]!='s')
-	      title += "s";
-	  }
-	ctrl->InsertColumn(0,crea::std2wx(title),col_style);
-	}
 
 	// Create the columns : one for each attribute of the level
-	int col = 1;
+	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();
@@ -135,13 +128,29 @@ namespace creaImageIO
 		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++;
-		
+		}
 		
 	  }
 	  
@@ -169,6 +178,7 @@ namespace creaImageIO
       sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW  ,0);
 	mColumnSelected=1;
 	mLastSelected=0;
+	mLastLevel=0;
 	mDirection=true;
 	mSelectionMade=false;
 	mProcess=true;
@@ -238,12 +248,26 @@ namespace creaImageIO
 
   //=====================================================================
   
-  ///Removes selected nodes on given level
-  void WxTreeView::RemoveSelected( int level )
+  ///Removes selected nodes on last selected level
+  void WxTreeView::RemoveSelected()
   {
-	  std::vector<tree::Node*> sel=GetSelected(level+1);
+	  mLastLevel+=1;
+	  std::vector<tree::Node*> sel=GetSelected(mLastLevel+1);
 	  bool erase=false;
-	  if (wxMessageBox(_T("Delete file(s) ?"),
+	  std::stringstream out;
+	  std::string levelName=GetTreeHandler()->GetTree().GetLevelDescriptor(mLastLevel).GetName();
+	  out<<"Delete ";
+	  out<<sel.size();
+	  if(sel.size()>1&&levelName.at(levelName.size()-1)!='s')
+	  {
+	  out<<" "<<levelName;
+	  out<<"s?";
+	  }
+	  else
+	  {
+      out<<" "<<GetTreeHandler()->GetTree().GetLevelDescriptor(mLastLevel).GetName()<<"?";
+	  }
+	  if (wxMessageBox(crea::std2wx(out.str()),
 			 _T("Remove Files"),
 			 wxYES_NO,this ) == wxYES)
 	  {
@@ -251,18 +275,34 @@ namespace creaImageIO
 	  }
 	  if(erase)
 	  {
+		bool needRefresh=false;
 		std::vector<tree::Node*>::iterator i;
 		for (i=sel.begin(); i!=sel.end(); ++i)
 		{
-			GimmickDebugMessage(2,
+			GimmickMessage(1,
 					"deleting '"
 					<<(*i)->GetLabel()
-					<<"'"<<level
+					<<"'"<<mLastLevel
 					<<std::endl);
+			if((*i)->GetParent()->GetNumberOfChildren()<2)
+			{
+				needRefresh=true;
+			}
 				GetTreeHandler()->Remove(*i);
 		}
 
-		UpdateLevel(level);
+		if(needRefresh && mLastLevel>1)
+		{
+		UpdateLevel(mLastLevel-2);
+		}
+		else if(mLastLevel>1)
+		{
+		UpdateLevel(mLastLevel-1);
+		}
+		else
+		{
+		UpdateLevel(mLastLevel);
+		}
 	  }
 	  
   }
@@ -313,9 +353,7 @@ namespace creaImageIO
     
     std::vector<tree::Node*>::iterator i;
 	
-    //Adds the first item (filter)
-   
-	for (i=sel.begin(); i!=sel.end(); ++i)
+ 	for (i=sel.begin(); i!=sel.end(); ++i)
       {
 	GimmickDebugMessage(2,
 			    "adding children of '"
@@ -324,8 +362,8 @@ namespace creaImageIO
 			    <<std::endl);
 	int _id=1;
 	
-	//Adds items (other than the first) and sets their attributes 
-	   GetCtrl(l)->InsertItem(0, _T(""));
+	//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(); 
@@ -350,53 +388,25 @@ namespace creaImageIO
 	    item->SetData(data);
 	    
 		_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));		
-
-	    item->SetColumn(0);
-		 GetCtrl(l)->InsertItem(*item);
-		//GetCtrl(l)->SetItem(item);
-		
-		//Setting other attributes
-		if(level<mLevelList.size())
-		{ 
-		for (int k=1; 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);	
-			GetCtrl(l)->RefreshItem(*item);
-	      }	
-		}
-		else
-		{
-			for (int k=0; k<GetCtrl(l)->GetColumnCount(); k++)
+		//Setting attributes
+
+		for (int k=0; k<GetCtrl(l)->GetColumnCount(); k++)
 	      {
-			std::string val = (*j)->GetAttribute(mLevelList[l].key[k]);
+			  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)->RefreshItem(*item);
+			GetCtrl(l)->SetItem(*item);
 	      }	
-		}
 		  
 	  }
 	GetCtrl(l)->DeleteItem(0);
       }
     
     GetCtrl(l)->Show();
-    
-    if (level<mLevelList.size()) UpdateLevel(level+1);
-	
+    	
  }
   //=====================================================================
 
@@ -408,67 +418,45 @@ 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,
+      }
+	mLastLevel=level;
+    GimmickDebugMessage(1,
 			" Level "<<level+1
 			<<std::endl);
-	/*
-	if(event.m_itemIndex!=0)
-	{*/
-		if(level<mLevelList.size()-1)
-		{
-		mSelected=GetSelected(level+2);
-		}
-		else if(mProcess)
-		{
-		mLastLevelSelected=GetSelected(level+2);
-		}
-		else
-		{
-			event.Veto();
-		}
+    
+    // Update the children level (if selection not at last level)
+    if (level<mLevelList.size()-1) 
+      {
 		
-		if (level<mLevelList.size()-1) 
-		{
-			UpdateLevel( level + 2 ); 
-			GetGimmickView()->ClearSelection();
-		}
-		if (level==mLevelList.size()-2) SelectLowerLevel();
-		if (level==(mLevelList.size()-1)&&mProcess) 
-		{
-			if(event.GetEventType()==10145)
-			{
-			ValidateSelectedImages (true);
-			}
-			else
-			{
-				ValidateSelectedImages (false);
-			}
-		}
-		//SetColor(level,event.m_itemIndex);
-	/*}
+	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);
+	  }
+      }
+    
   }
   //================================================================
 
@@ -477,7 +465,6 @@ namespace creaImageIO
   {
 	long item = -1;
 	int level=mLevelList.size()-1;
-	
     for ( ;; )
     {
 		item = GetCtrl(level)->GetNextItem(item,
@@ -493,16 +480,9 @@ namespace creaImageIO
 		{
 			mProcess=false;
 		}
-
-		/*if(item!=0)
-		{*/
 		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);
-		//}
-		
     }
-
-	
   }
 
   //================================================================
@@ -511,34 +491,22 @@ namespace creaImageIO
   void WxTreeView::OnColClick(wxListEvent& event)
   { 
 	mColumnSelected=event.m_col;
-	wxPoint clientpt = event.GetPoint();
+	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;
 	}
-	for(int i=0;i<mColumnSelected;i++)
-	{
-		clientpt.x+=GetCtrl(level)->GetColumnWidth(i);
-	}
-	for(int i=0;i<level;i++)
-	{
-		clientpt.x+=GetSplitter(i)->GetSashPosition();
-	}
-	clientpt.y+=level*2;	
-	if(level==mLevelList.size()-1)
-	{
-		mColumnSelected+=1;
-		PopupMenu(menu, clientpt);
-	}
-	else if(mColumnSelected!=0)
-	{
-		PopupMenu(menu, clientpt);
-	}
+	PopupMenu(menu, clientpt);
 
   }
-    //================================================================
+    
+  //================================================================
+  //================================================================
+
   void WxTreeView::OnPopupFilter(wxCommandEvent& event)
   {
 		wxBusyCursor busy;
@@ -570,7 +538,7 @@ namespace creaImageIO
 			
 			long adr = GetCtrl(level)->GetItemData(it);
 			tree::Node* nod = ((ItemData*)adr)->node;
-			att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected-1]);
+			att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected]);
 			
 			
 			if(att.find(filter)>900)
@@ -623,10 +591,7 @@ namespace creaImageIO
   { 	  
 	//Obtain the column name and the level that needs to be organized
 
-	if(level==mLevelList.size()-1||mColumnSelected!=0)
-	{	 
 		int l = level - 1;
-		//GetCtrl(level)->DeleteItem(0);
 		//Sets the data for the items to be sorted
 		std::string att;
 		unsigned int ty=0;
@@ -641,10 +606,10 @@ namespace creaImageIO
 			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());
@@ -683,8 +648,6 @@ namespace creaImageIO
 		}
 
 		//Resets original data
-		std::vector<tree::Node*>::iterator selection;
-		std::vector<long> change;
 		long it = -1;
 		for ( ;; )
 		{
@@ -696,40 +659,9 @@ 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:"));
-	}
 	
    }
  
@@ -767,11 +699,11 @@ namespace creaImageIO
 			item = GetCtrl(level)->GetNextItem(item,
                                      wxLIST_NEXT_BELOW);
 		}
-        if ( item == -1  )
+        if ( item == -1 || item==0  )
 		{
             break;
 		}
-		if(GetCtrl(level)->GetItemState(item, wxLIST_STATE_SELECTED)==0 && item!=0)
+		if(GetCtrl(level)->GetItemState(item, wxLIST_STATE_SELECTED)==0 )
 		{
 			adr = GetCtrl(level)->GetItemData(item);
 			nod = ((ItemData*)adr)->node;
@@ -968,6 +900,8 @@ BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl)
     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)