Changed validation methods from TreeView to GimmickView (Abstract)

[creaImageIO.git] / src2 / creaImageIOWxGimmickView.cpp

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 7594cbef3bcda45fc83ad4ee44106988c3ff7de1..5e851a398639fdffe765dd053ec163539d45e1f9 100644 (file)
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -65,7 +65,7 @@ namespace creaImageIO
                                   int max_dim,
                               int number_of_threads)
     : wxPanel(parent,id,pos,size),
-      GimmickView(gimmick),
+      GimmickView(gimmick, number_of_threads),
       mProgressDialog(0)
   {
     GimmickDebugMessage(1,"WxGimmickView::WxGimmickView"
@@ -99,8 +99,8 @@ namespace creaImageIO
        //Gimmick
        mGimmick=gimmick;
 
-       mSelectionMaxDimension=max_dim;
-       mSelectionMinDimension=min_dim;
+       mSelectionMaxDimension= max_dim;
+       mSelectionMinDimension= min_dim;
 
     // Create the views
     CreateTreeViews();
@@ -111,7 +111,7 @@ namespace creaImageIO
        
     // Splitting
     int hsize = size.GetHeight();
-    int bottom_minsize = 20;
+    int bottom_minsize = 15;
 
     mSplitter->SetMinimumPaneSize( bottom_minsize );
     mSplitter->SplitHorizontally( mNotebook, mBottomPanel, 
@@ -185,9 +185,6 @@ namespace creaImageIO
                   name<<"'"<<std::endl);
     // Create the WxTreeView
     WxTreeView* view = new WxTreeView(h,mNotebook,-1);
-       
-       view->SetMaxDimension(mSelectionMaxDimension);
-       view->SetMinDimension(mSelectionMinDimension);
 
     // TO DO : TEST THAT A VIEW WITH SAME NAME IS NOT
     // ALREADY IN THE MAP
@@ -201,16 +198,24 @@ namespace creaImageIO
   /// Returns the selected Image so that it complies with the given parameter(<4D)
   vtkImageData* WxGimmickView::GetSelectedImage(int dim)
   {
-         return GetTreeViewMap()["Local database"]->GetSelectedImage(dim);
+         return NULL;
+                 //GetTreeViewMap()["Local database"]->GetSelectedImage(dim);
   }
 
   //======================================================================
   /// Returns the selected Images so that they comply with the given parameter(4D)
   void WxGimmickView::GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
   {
-         GetTreeViewMap()["Local database"]->GetSelectedImages(s,dim);
+       int level=GetTreeViewMap()["Local database"]->GetNumberOfLevels();
+       std::vector<tree::Node*> im=GetTreeViewMap()["Local database"]->GetSelected(level+1);
+       ReadImagesNotThreaded(s,im,dim);
+  }
+  //======================================================================
+  /// Returns the selected Images so that they comply with the given parameter(4D)
+  void WxGimmickView::GetSelectedFiles(std::vector<std::string>& s)
+  {
+       GetTreeViewMap()["Local database"]->GetSelectedAsString(s);
   }
-
   //=================================================
   void WxGimmickView::CreateIconList()
   {
@@ -348,11 +353,14 @@ namespace creaImageIO
   //=================================================
 
   //=================================================
-  void WxGimmickView::SetMessage(const wxString& mess)
+  bool WxGimmickView::ValidateSelection(void * s)
   {      
     wxBusyCursor busy;
+       std::vector<tree::Node*> sel=* (std::vector<tree::Node*> *) s;
+       bool valid=ValidateSelected(sel,mSelectionMinDimension,mSelectionMaxDimension );
+       mText->SetLabel(_T("Status: ")+GetMessage());
+       return valid;
     
-    mText->SetLabel(_T("Status: ")+mess);
    }
   //=================================================
 
@@ -413,6 +421,7 @@ namespace creaImageIO
     */
     wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this);
   }
+
    //=================================================
 
    //=================================================