DFCH

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMaracasRenderTabbedPanel.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index 88d9d4b65e9e8bcac9364a05ae5a774556801b53..830269a3bcc9154fcd7cb42fdc77038a371fd4a6 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -4,7 +4,7 @@
 #include "wxMaracasMultipleVolumeRendererPanel.h"
 #include "wxMaracasSurfaceRenderingPanel.h"
 #include "wxMaracasSurfaceRenderingProp3DMHD.h"
-#include "wxMaracasMultipleVolumeRendererManagerData.h"
+#include "volumerenderermanagerdata.h"
 #include "wxMaracasDialog_NViewers.h"
 #include "wxVtkMPR3DViewCntrlPanel.h"
 
@@ -33,7 +33,7 @@ wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent, int id,
        baseView = _baseView;
        dialog = NULL;
 
-       volmanager =      new wxMaracasMultipleVolumeRendererManager();
+        volmanager =      new VolumeRendererManager();
        surrendmanager1 = new wxMaracasSurfaceRenderingManager();
        surrendmanager2 = new wxMaracasSurfaceRenderingManager();
        surrendmanager3 = new wxMaracasSurfaceRenderingManager();
@@ -116,12 +116,7 @@ void wxMaracasRenderTabbedPanel::createControls(vtkImageData* inImg, std::string
                        addSurface2(img, filename);
                        addSurface3(img, filename);     
                        addMPROptions();
-<<<<<<< wxMaracasRenderTabbedPanel.cpp
-//                     volname = (wxString) filename;
-                       volname = wxString(filename.c_str(),wxConvUTF8);
-=======
                        volname = crea::std2wx(filename);
->>>>>>> 1.16
                        wxtabs->Refresh();
                }
        }