X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxTreeView.cpp;h=47123b8e96e06b50193a4ad9689b11dedbb4f4fd;hb=8d73d5f58d80abb928a7f60037837c2933b16bbd;hp=474e7f4dafd2a7b2da88ccf96d52d59e344659f5;hpb=f2585049438c3630362b07e6029ddb0130a03818;p=creaImageIO.git

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 474e7f4..47123b8 100644
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -1,16 +1,74 @@
 #include <creaImageIOWxTreeView.h>
+#include <creaImageIOGimmickView.h>
 #include <creaImageIOSystem.h>
 #include <wx/splitter.h>
+#include <wx/gdicmn.h>
+///Comparing function for ordering algorithm. Takes parameters as strings.
+int wxCALLBACK CompareFunctionStrings(long item1, long item2, long sortData)
+{	
+	std::string s1((char*)((long*)item1)[1]);
+	std::string s2((char*)((long*)item2)[1]);
+	if(sortData==1)
+	{
+		// inverse the order
+		if (s1 < s2)
+			return 1;
+		if (s1 > s2)
+			return -1;
+
+		return 0;
+	}
+	else
+	{
+		if (s1 < s2)
+			return -1;
+		if (s1 > s2)
+			return 1;
+
+		return 0;
+
+	}
+	
+}
+
+///Comparing function for ordering algorithm. Takes parameters as ints.
+int wxCALLBACK CompareFunctionInts(long item1, long item2, long sortData)
+{	
+	int val1=atoi((char*)((long*)item1)[1]);
+	int val2=atoi((char*)((long*)item2)[1]);
+	if(sortData==1)
+	{
+		// inverse the order
+		if (val1 < val2)
+			return 1;
+		if (val1 > val2)
+			return -1;
+
+		return 0;
+	}
+	else
+	{
+		if (val1 < val2)
+			return -1;
+		if (val1 > val2)
+			return 1;
+
+		return 0;
+
+	}
+	
+}
 
 namespace creaImageIO
 {
   //=====================================================================
   // CTor
   WxTreeView::WxTreeView(TreeHandler* handler,
+			 GimmickView* gimmick,
 			 wxWindow* parent,
 			 const wxWindowID id)
     : wxPanel(parent,id),
-      TreeView(handler)
+      TreeView(handler,gimmick)
   {
     GimmickDebugMessage(1,"WxTreeView::WxTreeView"
 			<<std::endl);
@@ -24,7 +82,7 @@ namespace creaImageIO
     // Global sizer
     wxBoxSizer	*sizer = new wxBoxSizer(wxHORIZONTAL);
     
-    int ctrl_style = wxLC_REPORT;
+    int ctrl_style = wxLC_REPORT | wxLC_VRULES;
     int col_style = wxLIST_FORMAT_LEFT;
 
     // Creating the ListCtrl for the levels > 0 (not for Root level)
@@ -32,37 +90,98 @@ namespace creaImageIO
 	 i < handler->GetTree().GetNumberOfLevels();
 	 ++i)
       {
-	GimmickDebugMessage(5,"Creating ListCtrl for level "<<i
+
+	GimmickDebugMessage(5,"Creating view for level "<<i
 			    <<std::endl);
 	LevelType level;
-  	wxListCtrl* ctrl = new wxListCtrl(this,
+
+	// If the first level : parent = this
+	wxWindow* sparent = this;
+	// else parent = last splitter
+	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,
 					  i,
 					  wxDefaultPosition, 
 					  wxDefaultSize,
 					  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;
 	for (a  = handler->GetTree().GetAttributeDescriptorList(i).begin();
 	     a != handler->GetTree().GetAttributeDescriptorList(i).end();
 	     ++a)
 	  {
-	    GimmickDebugMessage(5,"Creating column "<<col<<" : "
+	
+		GimmickDebugMessage(5,"Creating column "<<col<<" : "
 				<<a->GetName()
 				<<std::endl);
-	    ctrl->InsertColumn(col, 
-			       crea::std2wx(a->GetName()),
-			       col_style);
-	    level.key.push_back(a->GetKey());
-	    //	    ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE );
-	    col++;
+
+		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(title),
+				col_style);
+		level.key.push_back(a->GetKey());
+		//	    ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE );
+		col++;
+		}
+		
 	  }
+	  
 	mLevelList.push_back(level);
-	sizer->Add( ctrl ,1, wxGROW  ,0);
       }
     
+#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
+ 
+      sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW  ,0);
+	mColumnSelected=1;
+	mLastSelected=0;
+	mDirection=true;
+	mSelectionMade=false;
+	mProcess=true;
+	//CreateColorPalette();
     UpdateLevel(1);
 
     SetSizer( sizer );     
@@ -86,20 +205,16 @@ namespace creaImageIO
   struct ItemData
   {
     tree::Node* node;
+	int id;
   };
+ 
   //=====================================================================
-
-  //=====================================================================
-  /// 
-  void WxTreeView::UpdateLevel( int level )
+   std::vector<tree::Node*> WxTreeView::GetSelected(int level)
   {
-    GimmickDebugMessage(1,
-			GetTreeHandler()->GetTree().GetLabel()
-			<<" view : updating level "<<level
-			<<std::endl);
     int l = level - 1;
     // the selection of upper level
     std::vector<tree::Node*> sel;
+	
     if (level == 1) 
       {
 	sel.push_back(GetTreeHandler()->GetTree().GetTree());
@@ -113,77 +228,169 @@ namespace creaImageIO
 	      {
 		long adr = GetCtrl(l-1)->GetItemData(i);
 		tree::Node* n = ((ItemData*)adr)->node;
-		sel.push_back(n);
+			if(mLastSelected==i)
+			{
+				std::vector<tree::Node*>::iterator it;
+				it = sel.begin();
+				it = sel.insert ( it , n );
+			}
+			else
+			{
+				sel.push_back(n);
+			}
 	      }
 	  }	
       }
+	 
+	  return sel;
+  }
 
+  //=====================================================================
+  
+  ///Removes selected nodes on given level
+  void WxTreeView::RemoveSelected( int level )
+  {
+	  std::vector<tree::Node*> sel=GetSelected(level+1);
+	  bool erase=false;
+	  if (wxMessageBox(_T("Delete file(s) ?"),
+			 _T("Remove Files"),
+			 wxYES_NO,this ) == wxYES)
+	  {
+	    erase = true;
+	  }
+	  if(erase)
+	  {
+		std::vector<tree::Node*>::iterator i;
+		for (i=sel.begin(); i!=sel.end(); ++i)
+		{
+			GimmickDebugMessage(2,
+					"deleting '"
+					<<(*i)->GetLabel()
+					<<"'"<<level
+					<<std::endl);
+				GetTreeHandler()->Remove(*i);
+		}
+
+		UpdateLevel(level);
+	  }
+	  
+  }
+    
+
+  //=====================================================================
+
+ 
+  //=====================================================================
+  /// Updates a level of the view (adds or removes children, proganizes, etc.)
+  void WxTreeView::UpdateLevel( int level )
+  {
+    GimmickDebugMessage(1,
+			GetTreeHandler()->GetTree().GetLabel()
+			<<" view : updating level "<<level
+			<<std::endl);
+    
+    wxBusyCursor busy;
+    RecursiveUpdateLevel(level);
+    int i;
+    for (i=0; i<level-1; i++)
+      {
+	if (!GetSplitter(i)->IsSplit()) 
+	  GetSplitter(i)->SplitVertically(  GetCtrl(i), GetSplitter(i+1),
+					    100 );
+      }
+    if (GetSplitter(i)->IsSplit()) GetSplitter(i)->Unsplit();    
+    
+  }
+  //=====================================================================
+  
+  /// Recursive method called upon by UpdateLevel to refresh all windows
+  void WxTreeView::RecursiveUpdateLevel( int level )
+  {
+	  GimmickDebugMessage(2,
+			GetTreeHandler()->GetTree().GetLabel()
+			<<" view : updating level (recursive)"<<level
+			<<std::endl);
+
+
+    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();
     
     std::vector<tree::Node*>::iterator i;
-    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;
 	
+	//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.SetData(data);
 	    
-	    long id = GetCtrl(l)->InsertItem(item);
+		data->node = *j;
+		item->SetId(_id);
 
-	    for (int k=0; k<GetCtrl(l)->GetColumnCount(); k++)
-	      {
-		std::string val = (*j)->GetAttribute(mLevelList[l].key[k]);
-		if (val.size()==0) val = "?";
-		GetCtrl(l)->SetItem(id,k, crea::std2wx(val));
-		GetCtrl(l)->SetColumnWidth(k, wxLIST_AUTOSIZE );
-	      }
+		data->id = _id;
+	    item->SetData(data);
 	    
+		_id++;
+		GetCtrl(l)->InsertItem(*item);
+		
+		//Setting attributes
+
+		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)->DeleteItem(0);
       }
     
     GetCtrl(l)->Show();
-
-    
-    if (level<mLevelList.size()) UpdateLevel(level+1);
+    	
  }
   //=====================================================================
 
 
   //================================================================
-  void WxTreeView::OnSelected(wxListEvent& event)
+  void WxTreeView::OnSelectedChanged(wxListEvent& event)
   { 
     GimmickDebugMessage(1,
 			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;
@@ -194,14 +401,413 @@ namespace creaImageIO
     GimmickDebugMessage(1,
 			" Level "<<level+1
 			<<std::endl);
-    if (level<mLevelList.size()-1) UpdateLevel( level + 2 ); 
+    
+    // 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
+	  {
+	    ValidateSelectedImages (false);
+	  }
+      }
     
   }
   //================================================================
 
+  //================================================================
+  void WxTreeView::SelectLowerLevel()
+  {
+	long item = -1;
+	int level=mLevelList.size()-1;
+    for ( ;; )
+    {
+		item = GetCtrl(level)->GetNextItem(item,
+                                     wxLIST_NEXT_ALL);
+        if ( item == -1 )
+            break;
+
+		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)
+  { 
+	mColumnSelected=event.m_col;
+	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(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) == 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;
+		//Sets the data for the items to be sorted
+		std::string att;
+		unsigned int ty=0;
+		int n = GetCtrl(level)->GetItemCount();
+		for (int i = 0; i < n; i++)
+		{
+			  
+			//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]).DecodeType(ty);
+			}
+			//Obtains the organizing attribute
+			att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected]);
+			
+			char* d= new char [att.size()+1];
+			strcpy (d, att.c_str());
 
-  BEGIN_EVENT_TABLE(WxTreeView, wxPanel)
+			//Creates array
+			long* lp= new long[2];
+			lp[0]=adr;
+			lp[1]=(long)d;
+			 
+			//Sets it as the data
+			GetCtrl(level)->SetItemData(i,(long)lp);
+		}	
+		  
+		if(mDirection)
+		{
+			if(ty==1)
+			{
+				GetCtrl(level)->SortItems(CompareFunctionInts, 0);
+			}
+			else
+			{
+				GetCtrl(level)->SortItems(CompareFunctionStrings, 0);
+			}
+			
+		}
+		else
+		{
+			if(ty==1)
+			{
+				GetCtrl(level)->SortItems(CompareFunctionInts, 1);
+			}
+			else
+			{
+				GetCtrl(level)->SortItems(CompareFunctionStrings, 1);
+			}
+		}
+
+		//Resets original data
+		
+		std::vector<tree::Node*>::iterator selection;
+		std::vector<long> change;
+		long it = -1;
+		for ( ;; )
+		{
+			it = GetCtrl(level)->GetNextItem(it,
+										wxLIST_NEXT_ALL);
+			if ( it == -1 )
+				break;
+			
+			//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;			
+			
+		}
+	
+   }
+ 
+  //================================================================
+  void WxTreeView::ValidateSelectedImages(bool isSelection)
+  {
+    GimmickDebugMessage(7,
+			"WxTreeView::ValidateSelectedImages" 
+			<<std::endl);
+    std::vector<tree::Node*> sel(GetSelected(mLevelList.size()+1));
+ 	GetGimmickView()->OnSelectionChange(sel,isSelection,(mLastSelected-1), mProcess);
+ 
+  }
+  //================================================================
+
+
+  //================================================================
+  void WxTreeView::GetNodes(std::vector<tree::Node*>& nodes, bool direction)
+  {
+	long item = mLastSelected;
+	int level=mLevelList.size()-1;
+	//Gets current item data
+	long adr = GetCtrl(level)->GetItemData(item);
+	//Extracts the node
+	tree::Node* nod = ((ItemData*)adr)->node;
+    for ( ;; )
+    {
+		if(direction)
+		{
+			item = GetCtrl(level)->GetNextItem(item,
+                                     wxLIST_NEXT_ABOVE);
+		}
+		else
+		{
+			item = GetCtrl(level)->GetNextItem(item,
+                                     wxLIST_NEXT_BELOW);
+		}
+        if ( item == -1  )
+		{
+            break;
+		}
+		if(GetCtrl(level)->GetItemState(item, wxLIST_STATE_SELECTED)==0 /*&& item!=0*/)
+		{
+			adr = GetCtrl(level)->GetItemData(item);
+			nod = ((ItemData*)adr)->node;
+			nodes.push_back(nod);
+		}
+    }
+
+  }
+
+  //================================================================
+  void WxTreeView::GetSelectedAsString(std::vector<std::string>&s)
+  {
+	  int level=mLevelList.size();
+	std::vector<tree::Node*> sel=GetSelected(level+1);
+	std::vector<tree::Node*>::iterator i;
+	
+    for (i=sel.begin(); i!=sel.end(); ++i)
+      {
+		  std::string filename=(*i)->GetAttribute("FullFileName");
+		  s.push_back(filename);
+	  }
+  }
+
+   //================================================================
+  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()
+  {
+  GimmickDebugMessage(6,"WxTreeView::CreateColorPalette");
+  mColorPalette.push_back("WHITE");
+  mColorPalette.push_back("LIGHT GREY");
+  mColorPalette.push_back("AQUAMARINE");
+  mColorPalette.push_back("MEDIUM FOREST GREEN");
+  mColorPalette.push_back("INDIAN RED");
+  mColorPalette.push_back("KHAKI");
+  mColorPalette.push_back("ORANGE");
+  mColorPalette.push_back("LIGHT BLUE");
+  mColorPalette.push_back("LIGHT STEEL BLUE");
+  mColorPalette.push_back("PINK");
+  mColorPalette.push_back("PLUM");
+  mColorPalette.push_back("PURPLE");
+  mColorPalette.push_back("RED");
+  mColorPalette.push_back("SEA GREEN");
+  mColorPalette.push_back("SIENNA");
+  mColorPalette.push_back("SKY BLUE");
+  mColorPalette.push_back("SLATE BLUE");
+  mColorPalette.push_back("SPRING GREEN");
+  mColorPalette.push_back("TAN");
+  mColorPalette.push_back("THISTLE");
+  mColorPalette.push_back("TURQUOISE");
+  mColorPalette.push_back("VIOLET");
+  mColorPalette.push_back("VIOLET RED");
+  mColorPalette.push_back("WHEAT");
+  mColorPalette.push_back("YELLOW");
+  mColorPalette.push_back("YELLOW GREEN");
+  mColorPalette.push_back("BLUE");
+  mColorPalette.push_back("BLUE VIOLET");
+  mColorPalette.push_back("BROWN");
+  mColorPalette.push_back("CADET BLUE");
+  mColorPalette.push_back("CORAL");
+  mColorPalette.push_back("CORNFLOWER BLUE");
+  mColorPalette.push_back("CYAN");
+  mColorPalette.push_back("DARK GREY");
+  mColorPalette.push_back("DARK GREEN");
+  mColorPalette.push_back("DARK OLIVE GREEN");
+  mColorPalette.push_back("DARK ORCHID");
+  mColorPalette.push_back("DARK SLATE BLUE");
+  mColorPalette.push_back("DARK SLATE GREY");
+  mColorPalette.push_back("DARK TURQUOISE");
+  mColorPalette.push_back("FIREBRICK");
+  mColorPalette.push_back("FOREST GREEN");
+  mColorPalette.push_back("GOLD");
+  mColorPalette.push_back("GOLDENROD");
+  mColorPalette.push_back("GREY");
+  mColorPalette.push_back("GREEN");
+  mColorPalette.push_back("GREEN YELLOW");
+  mColorPalette.push_back("LIME GREEN");
+  mColorPalette.push_back("MAGENTA");
+  mColorPalette.push_back("MAROON");
+  mColorPalette.push_back("MEDIUM AQUAMARINE");
+  mColorPalette.push_back("MEDIUM BLUE");
+  mColorPalette.push_back("MEDIUM GOLDENROD");
+  mColorPalette.push_back("MEDIUM ORCHID");
+  mColorPalette.push_back("MEDIUM SEA GREEN");
+  mColorPalette.push_back("MEDIUM SLATE BLUE");
+  mColorPalette.push_back("MEDIUM SPRING GREEN");
+  mColorPalette.push_back("MEDIUM TURQUOISE");
+  mColorPalette.push_back("MEDIUM VIOLET RED");
+  mColorPalette.push_back("MIDNIGHT BLUE");
+  mColorPalette.push_back("NAVY");
+  mColorPalette.push_back("ORANGE RED");
+  mColorPalette.push_back("ORCHID, PALE GREEN");
+  mColorPalette.push_back("STEEL BLUE");
+  mColorPalette.push_back("BLACK");
+
+
+  }
+  //================================================================
+  BEGIN_EVENT_TABLE(WxTreeView, wxPanel)   
   /*
     EVT_SIZE(MyFrame::OnSize)
 
@@ -242,8 +848,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(LIST_CTRL, MyListCtrl::OnBeginLabelEdit)
-    EVT_LIST_END_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnEndLabelEdit)
+	
+    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
@@ -251,15 +859,20 @@ BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl)
     EVT_LIST_SET_INFO(LIST_CTRL, MyListCtrl::OnSetInfo)
 #endif
   */
-    EVT_LIST_ITEM_SELECTED(-1, WxTreeView::OnSelected)
-  /*
-    EVT_LIST_ITEM_DESELECTED(LIST_CTRL, MyListCtrl::OnDeselected)
+    EVT_LIST_ITEM_SELECTED(-1, WxTreeView::OnSelectedChanged)
+  
+    EVT_LIST_ITEM_DESELECTED(-1, WxTreeView::OnSelectedChanged)
+	/*
     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(-1, WxTreeView::OnColClick)
+	
+    EVT_LIST_COL_CLICK(-1, WxTreeView::OnColClick)
 
-    EVT_LIST_COL_CLICK(LIST_CTRL, MyListCtrl::OnColClick)
-    EVT_LIST_COL_RIGHT_CLICK(LIST_CTRL, MyListCtrl::OnColRightClick)
+	//EVT_LEFT_DOWN(WxTreeView::OnMouseClick)
+	/*
     EVT_LIST_COL_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnColBeginDrag)
     EVT_LIST_COL_DRAGGING(LIST_CTRL, MyListCtrl::OnColDragging)
     EVT_LIST_COL_END_DRAG(LIST_CTRL, MyListCtrl::OnColEndDrag)
@@ -277,4 +890,3 @@ END_EVENT_TABLE()
   
 } // EO namespace creaImageIO
 
-