*** empty log message ***

[creaImageIO.git] / src2 / creaImageIOWxTreeView.cpp

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index cba942fd9286fe1c7484a32bd42bd6ba0e51ece6..18ced63630fae13fc05b87a03b46e45ed8587939 100644 (file)
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -354,7 +354,7 @@ namespace creaImageIO
                
                //Setting first column (number of children)
            std::ostringstream oss;
-           int n= GetTreeHandler()->GetNumberOfChildren(*j);
+           int n= 0; //GetTreeHandler()->GetNumberOfChildren(*j);
            oss << n;
            std::string s(oss.str());
            item->SetText( crea::std2wx(s));            
@@ -372,8 +372,9 @@ namespace creaImageIO
                        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);
+                       // Unefficient
+                       //                      GetCtrl(l)->RefreshItem(*item);
              } 
                }
                else
@@ -385,7 +386,7 @@ namespace creaImageIO
                        item->SetText( crea::std2wx(val));
                        item->SetColumn(k);
                        GetCtrl(l)->SetItem(*item);     
-                       GetCtrl(l)->RefreshItem(*item);
+                       //                      GetCtrl(l)->RefreshItem(*item);
              } 
                }
                  
@@ -395,7 +396,7 @@ namespace creaImageIO
     
     GetCtrl(l)->Show();
     
-    if (level<mLevelList.size()) UpdateLevel(level+1);
+    //  if (level<mLevelList.size()) UpdateLevel(level+1);
        
  }
   //=====================================================================
@@ -408,67 +409,72 @@ 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 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);
-       /*}
+    /*
+      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) 
+      {
+       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);
+         }
+      }
+    //SetColor(level,event.m_itemIndex);
+    /*}
+      else
+      {
+      if(event.GetEventType()==10145)
+      {
+      
+      GetCtrl(level)->SetItemText(0,crea::std2wx(""));
+      GetCtrl(level)->EditLabel(event.m_itemIndex);
+      }
+      
+      }*/
+    
+    
   }
   //================================================================