X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxTreeView.cpp;h=c121c96a04a2d745a97c0c802dbc3b28835176e5;hb=7c6f60361461c27cb809f3e5d0473f211801b813;hp=18ced63630fae13fc05b87a03b46e45ed8587939;hpb=cac026929f2431aa4a966bf9ae3c8ff263f5dd63;p=creaImageIO.git

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 18ced63..c121c96 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++;
-		
+		}
 		
 	  }
 	  
@@ -313,9 +322,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 +331,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,54 +357,25 @@ namespace creaImageIO
 	    item->SetData(data);
 	    
 		_id++;
+		GetCtrl(l)->InsertItem(*item);
 		
-		
-		//Setting first column (number of children)
-	    std::ostringstream oss;
-	    int	n= 0; //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++)
+		//Setting attributes
+
+		for (int k=0; k<GetCtrl(l)->GetColumnCount(); k++)
 	      {
-			std::string val = (*j)->GetAttribute(mLevelList[l].key[k-1]);
+			  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);
-			// Unefficient
-			//			GetCtrl(l)->RefreshItem(*item);
-	      }	
-		}
-		else
-		{
-			for (int k=0; k<GetCtrl(l)->GetColumnCount(); 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)->DeleteItem(0);
       }
     
     GetCtrl(l)->Show();
-    
-    //  if (level<mLevelList.size()) UpdateLevel(level+1);
-	
+    	
  }
   //=====================================================================
 
@@ -423,22 +401,6 @@ namespace creaImageIO
     GimmickDebugMessage(1,
 			" Level "<<level+1
 			<<std::endl);
-    /*
-      if(event.m_itemIndex!=0)
-      {*/
-    
-    if(level<mLevelList.size()-1)
-      {
-	//mSelected=GetSelected(level+1); //2);
-      }
-    else if(mProcess)
-      {
-	//mLastLevelSelected=GetSelected(level+1); //2);
-      }
-    else
-      {
-	event.Veto();
-      }
     
     // Update the children level (if selection not at last level)
     if (level<mLevelList.size()-1) 
@@ -461,19 +423,6 @@ namespace creaImageIO
 	    ValidateSelectedImages (false);
 	  }
       }
-    //SetColor(level,event.m_itemIndex);
-    /*}
-      else
-      {
-      if(event.GetEventType()==10145)
-      {
-      
-      GetCtrl(level)->SetItemText(0,crea::std2wx(""));
-      GetCtrl(level)->EditLabel(event.m_itemIndex);
-      }
-      
-      }*/
-    
     
   }
   //================================================================
@@ -483,7 +432,6 @@ namespace creaImageIO
   {
 	long item = -1;
 	int level=mLevelList.size()-1;
-	
     for ( ;; )
     {
 		item = GetCtrl(level)->GetNextItem(item,
@@ -499,29 +447,11 @@ 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);
-		//}
-		
     }
-
-	
   }
 
-  
-  //================================================================
-  //================================================================
-
-  void WxTreeView::OnMouseClick(wxMouseEvent& event)
-  { 
-	   if (event.ButtonDown())
-	   {
-	   }
-	  std::cout<<"HELLO WORLD"<<std::endl;
-  }
   //================================================================
   //================================================================
 
@@ -537,27 +467,13 @@ namespace creaImageIO
 	{
 	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;
@@ -589,7 +505,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)
@@ -642,10 +558,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;
@@ -660,10 +573,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());
@@ -702,8 +615,6 @@ namespace creaImageIO
 		}
 
 		//Resets original data
-		std::vector<tree::Node*>::iterator selection;
-		std::vector<long> change;
 		long it = -1;
 		for ( ;; )
 		{
@@ -715,40 +626,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:"));
-	}
 	
    }
  
@@ -790,7 +670,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;