After checking that the event goes up in the hierarchy (in win32 at least)

[creaImageIO.git] / src2 / creaImageIOWxTreeView.cpp

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 5d77aadc95cd742af7e1885a005407aa65f65943..c8189585bd7e52a096e2ef5833235aee38e398b4 100644 (file)
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -276,7 +276,12 @@ namespace creaImageIO
            //      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);
+
            GetCtrl(l)->SetItem(item);
+               
            //      GetCtrl(l)->SetItem(id,0, crea::std2wx(s));
            //      GetCtrl(l)->SetColumnWidth(0, wxLIST_AUTOSIZE );
 
@@ -491,6 +496,7 @@ namespace creaImageIO
                //Compatibility with maximum 
                        if(valid)
                        {       
+                               
                                int rows;
                                int cols;
                                int planes;
@@ -545,7 +551,6 @@ namespace creaImageIO
        else
        {
                mess="Cannot have 0 images selected";
-               GimmickMessage(1,"Cannot have 0 images selected"<< std::endl);
                valid=false;
        }
        
@@ -566,48 +571,24 @@ namespace creaImageIO
   }
 
   //================================================================
-
-
   vtkImageData* WxTreeView::GetSelectedImage(int dim)
   {
-         /*
-               wxArrayTreeItemIds id;
-    // TO DO : TEST THAT STYLE IS MULTIPLE 
-    unsigned int nb = mTreeListCtrl->GetSelections(id);
-    f.clear();
-
-    // Collect the brute vector of Image nodes
-    std::vector<DicomNode*> im;
-    for (unsigned int i=0; i<nb; ++i)
-      {
-       TreeItemData *data = 
-         (TreeItemData *)mTreeListCtrl->GetItemData(id[i]);
-       if ((data) && (data->IsDicomNode()))
-         {
-           if (data->GetDicomNode()->GetType()==DicomNode::Image)
-             {
-               im.push_back ( data->GetDicomNode() );
+       
+       return NULL;
+  }
 
-             }
-           else if (data->GetDicomNode()->GetType()==DicomNode::Series)
-             {
-               DicomNode::ChildrenListType::iterator j;
-               for (j =data->GetDicomNode()->GetChildrenList().begin();
-                    j!=data->GetDicomNode()->GetChildrenList().end();
-                    j++) 
-                 {
-                   im.push_back ( *j );
-                 }
-             }
-         }
-      }
+  void WxTreeView::GetSelectedImages(std::vector<vtkImageData*>& f, int dim)
+  {
+         /*
+       std::vector<tree::Node*> im=GetSelected(level+1);
+       
     // Create the output data
     if (im.size()==1) 
       {
-       // Only one image : give it
-       vtkImageData* out = vtkImageData::New();
-       out->ShallowCopy(mReader.GetImage(im.front()->ImageGetFullFileName()));
-       f.push_back( out );
+               // Only one image : give it
+               vtkImageData* out = vtkImageData::New();
+               out->ShallowCopy(mReader.GetImage(im.front()->ImageGetFullFileName()));
+               f.push_back( out );
       }
     else if (im.size()>1)
       {
@@ -667,12 +648,6 @@ namespace creaImageIO
          }
       }
          */
-       return NULL;
-  }
-
-  void WxTreeView::GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
-  {
-
   }
   BEGIN_EVENT_TABLE(WxTreeView, wxPanel)
   /*