*** empty log message ***

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMaracasSurfaceRendering.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx
index 66a580b327cddef5d952173fd7c59ba1865902b8..47f1c188cb7460e911a8c59a42318d9fd275634a 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasSurfaceRendering.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/10/16 15:17:57 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2009/10/30 20:06:07 $
+  Version:   $Revision: 1.3 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -20,7 +20,6 @@
 // EOF - wxMaracasMPR.cxx
 
 #include "wxMaracasSurfaceRendering.h"
-//#include "wxMaracasSurfaceRenderingPanel.h"
 #include "wxMaracasSurfaceRenderingProp3DMHD.h"
 #include "wxMaracasSurfaceRenderingProp3D.h"
 
@@ -44,6 +43,8 @@ wxMaracasSurfaceRendering::wxMaracasSurfaceRendering( wxWindow* parent,std::stri
        std::string iconsdir = path;
        iconsdir+="/data/Icons";
        this->_toolb = new ToolBar(this,iconsdir);
+       
+       /*Carolina: "Surface Rendering" label recently added*/
        wxStaticText* txt = new wxStaticText(this, -1, wxString(_T("  Surface Rendering  ")));
        wxAuiPaneInfo paneinfo;
        wxauimanager->AddPane(txt,paneinfo.ToolbarPane().Top());
@@ -146,7 +147,7 @@ void wxMaracasSurfaceRendering::addPropMHD(vtkImageData* imgdata, std::string da
                int id = surrendmanager->addPropMHD(imgdata,dataname);
                if(id!=-1){
 
-                       wxMaracasSurfaceRenderingPanel* controlpan = new wxMaracasSurfaceRenderingProp3DMHD(this, id);
+                       wxMaracasSurfaceRenderingPanel* controlpan = new wxMaracasSurfaceRenderingProp3DMHD(this, id, false, -1);
                        int maxiso = surrendmanager->getMaxIsoValue(id);
                        ((wxMaracasSurfaceRenderingProp3DMHD*)controlpan)->createControls(maxiso);
                        addSurfaceRenderingPanel(controlpan, dataname);
@@ -175,7 +176,7 @@ void wxMaracasSurfaceRendering::addProp3D(vtkProp3D* prop3D, std::string datanam
        try{
                int id = surrendmanager->addProp3D(prop3D,dataname);
                if(id!=-1){
-                       wxMaracasSurfaceRenderingPanel* controlpan = new wxMaracasSurfaceRenderingProp3D(this, id);
+                       wxMaracasSurfaceRenderingPanel* controlpan = new wxMaracasSurfaceRenderingProp3D(this, id, false, -1);
                        addSurfaceRenderingPanel(controlpan, dataname);
                }
        }catch(char* str){
@@ -194,7 +195,7 @@ void wxMaracasSurfaceRendering::addSurfaceRenderingPanel(wxMaracasSurfaceRenderi
 
 void wxMaracasSurfaceRendering::deleteActor(int propid){
        try{
-               //surrendmanager->deleteActor(propid);
+               surrendmanager->deleteActor(propid);
        }catch(char* e){
 
        }