addition of image stencil to surface rendering

[creaMaracasVisu.git] / lib / GUI / Wx / SurfaceRenderer / wxMaracasSurfaceRendering.cxx

diff --git a/lib/GUI/Wx/SurfaceRenderer/wxMaracasSurfaceRendering.cxx b/lib/GUI/Wx/SurfaceRenderer/wxMaracasSurfaceRendering.cxx
index 429734e728feddc098ee95a93f648b67777bb183..2c1c56c3b7895c365e67fa2cd951af57f5f366c0 100644 (file)
--- a/lib/GUI/Wx/SurfaceRenderer/wxMaracasSurfaceRendering.cxx
+++ b/lib/GUI/Wx/SurfaceRenderer/wxMaracasSurfaceRendering.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasSurfaceRendering.cxx,v $
   Language:  C++
-  Date:      $Date: 2011/06/28 16:56:16 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2012/05/11 11:46:39 $
+  Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -196,14 +196,22 @@ void wxMaracasSurfaceRendering::addPropMHD(vtkImageData* imgdata, std::string da
 }
 
 void wxMaracasSurfaceRendering::loadProp3D(wxString filename, wxString dataname){
-       std::string s = std::string(filename.mb_str());
-       vtkProp3D* prop3D = surrendmanager->getProp3D(s);
+        std::string fn = std::string(filename.mb_str());
+        std::string dn = std::string(dataname.mb_str());
+
+        int id = surrendmanager->addProp3D(-1, fn, dn);
+
+        if(id!=-1){
+                wxMaracasSurfaceRenderingPanel* controlpan = new wxMaracasSurfaceRenderingProp3D(this, id, false, -1);
+                addSurfaceRenderingPanel(controlpan, dn);
+        }
+        /*vtkProp3D* prop3D = surrendmanager->getProp3D(s);
        if(prop3D != NULL){
                s = std::string(dataname.mb_str() );
                this->addProp3D(prop3D,s);
        }else{
                //TODO msj to the user indicating error in file
-       }
+        }*/
 }
 
 void wxMaracasSurfaceRendering::addProp3D(vtkProp3D* prop3D, std::string dataname){