X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxTreeView.cpp;h=852107bfcf48ec2c36e518cd58a560794819ac92;hb=d38ff4802df421152298211fc44eb5f20b7a5dec;hp=72b58fc97ca980af62eb4e18150d3d63549e98dd;hpb=6cac83c30fb8c3cd89c41685078eccff6e952a50;p=creaImageIO.git

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 72b58fc..852107b 100644
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -1,6 +1,8 @@
 #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)
 {	
@@ -62,10 +64,11 @@ 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);
@@ -108,24 +111,27 @@ 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 = 0;
-	
+	int col = 1;
 	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);
@@ -142,6 +148,21 @@ namespace creaImageIO
 	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
  
@@ -149,6 +170,9 @@ namespace creaImageIO
 	mColumnSelected=1;
 	mLastSelected=0;
 	mDirection=true;
+	mSelectionMade=false;
+	mProcess=true;
+	//CreateColorPalette();
     UpdateLevel(1);
 
     SetSizer( sizer );     
@@ -208,7 +232,7 @@ namespace creaImageIO
 	      }
 	  }	
       }
-	
+	 
 	  return sel;
   }
 
@@ -288,91 +312,91 @@ namespace creaImageIO
     GetCtrl(l)->DeleteAllItems();
     
     std::vector<tree::Node*>::iterator i;
-    for (i=sel.begin(); i!=sel.end(); ++i)
+	
+    //Adds the first item (filter)
+   
+	for (i=sel.begin(); i!=sel.end(); ++i)
       {
 	GimmickDebugMessage(2,
 			    "adding children of '"
 			    <<(*i)->GetLabel()
-			    <<"'"<<level
+			    <<"'"
 			    <<std::endl);
-	int _id=0;
-	//Adds columns
+	int _id=1;
+	
+	//Adds items (other than the first) 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);
-		/*
-		std::string a=(*j)->GetAttribute(mLevelList[l].key[mColumnSelected-1]);
-		GimmickMessage(1,
-			"State Check: Att VAL"
-			    <<a
-			    <<std::endl);
-	*/
+		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));
-	    //	    item.SetTextColour(*wxRED);
-	    //	    item.SetBackgroundColour(*wxBLACK); 
-	    item.SetColumn(0);
-
-		//Sets the last level as selecte....How to make it select only the first time?
-		//if (level==mLevelList.size()) item.SetState(wxLIST_STATE_SELECTED);
+	    item->SetText( crea::std2wx(s));		
 
-	    GetCtrl(l)->SetItem(item);
+	    item->SetColumn(0);
+		 GetCtrl(l)->InsertItem(*item);
+		//GetCtrl(l)->SetItem(item);
 		
-	    //	    GetCtrl(l)->SetItem(id,0, crea::std2wx(s));
-	    //	    GetCtrl(l)->SetColumnWidth(0, wxLIST_AUTOSIZE );
-
-	  for (int k=1; k<GetCtrl(l)->GetColumnCount(); k++)
+		//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.SetTextColour(*wxBLACK);
-		//		item.SetBackgroundColour(*wxWHITE); 
-		item.SetColumn(k);
-		GetCtrl(l)->SetItem(item);
-
-		//		GetCtrl(l)->SetItem(id,k, crea::std2wx(val));
-		// GetCtrl(l)->SetColumnWidth(k, wxLIST_AUTOSIZE );
-		
-	      }
-	    
+			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++)
+	      {
+			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);
+	
  }
   //=====================================================================
 
@@ -388,45 +412,221 @@ namespace creaImageIO
     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)
-      {
+	// 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 (level<mLevelList.size()-1) UpdateLevel( level + 2 ); 
-	if (level==mLevelList.size()-1) ValidateSelectedImages ();
+	/*
+	if(event.m_itemIndex!=0)
+	{*/
+		if(level<mLevelList.size()-1)
+		{
+		mSelected=GetSelected(level+2);
+		}
+		else if(mProcess)
+		{
+		mLastLevelSelected=GetSelected(level+2);
+		}
+		else
+		{
+			event.Veto();
+		}
+		
+		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);
+	/*}
+	else
+	{
+		if(event.GetEventType()==10145)
+		{
+		
+		GetCtrl(level)->SetItemText(0,crea::std2wx(""));
+		GetCtrl(level)->EditLabel(event.m_itemIndex);
+		}
+		
+	}*/
+	
+	
+  }
+  //================================================================
+
+  //================================================================
+  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;
+		}
+
+		/*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::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 = event.GetPoint();
+	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++)
 	{
-		wxObject* ctrl = event.GetEventObject(); 
+		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);
+	}
+
+  }
+    //================================================================
+  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 = 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-1]);
+			
+			
+			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;
-	 
-		int l = level - 1;
+		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
 
+	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;
@@ -436,6 +636,7 @@ 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)
@@ -468,7 +669,6 @@ namespace creaImageIO
 				GetCtrl(level)->SortItems(CompareFunctionStrings, 0);
 			}
 			
-			mDirection=false;
 		}
 		else
 		{
@@ -480,11 +680,11 @@ 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;
 		for ( ;; )
 		{
@@ -492,27 +692,61 @@ namespace creaImageIO
 										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;
+			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);	
+					}
+				}
+			}
+			
 			
 		}
+		//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::ValidateSelectedImages()
+  void WxTreeView::ValidateSelectedImages(bool isSelection)
   {
-		//Send an event telling wether the selection is valid or not
-		wxCommandEvent event( 0, GetId() );
-		event.SetEventObject( this );
-		std::vector<tree::Node*> sel=GetSelected((mLevelList.size()+1));
-		event.SetClientData(&sel);
-		GetEventHandler()->ProcessEvent( event );
+    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;
@@ -533,11 +767,11 @@ namespace creaImageIO
 			item = GetCtrl(level)->GetNextItem(item,
                                      wxLIST_NEXT_BELOW);
 		}
-        if ( item == -1 )
+        if ( item == -1  )
 		{
             break;
 		}
-		if(GetCtrl(level)->GetItemState(item, wxLIST_STATE_SELECTED)==0)
+		if(GetCtrl(level)->GetItemState(item, wxLIST_STATE_SELECTED)==0 && item!=0)
 		{
 			adr = GetCtrl(level)->GetItemData(item);
 			nod = ((ItemData*)adr)->node;
@@ -560,8 +794,118 @@ namespace creaImageIO
 		  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]); 
+		}*/
+  }
   //================================================================
-  BEGIN_EVENT_TABLE(WxTreeView, wxPanel)
+  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)
 
@@ -602,8 +946,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
@@ -618,9 +964,9 @@ 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_LIST_COL_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnColBeginDrag)