#include "wxMaracasMultipleVolumeRendererPanel.h"
#include "wxMaracasSurfaceRenderingPanel.h"
#include "wxMaracasSurfaceRenderingProp3DMHD.h"
-#include "wxMaracasMultipleVolumeRendererManagerData.h"
+#include "volumerenderermanagerdata.h"
#include "wxMaracasDialog_NViewers.h"
#include "wxVtkMPR3DViewCntrlPanel.h"
baseView = _baseView;
dialog = NULL;
- volmanager = new wxMaracasMultipleVolumeRendererManager();
+ volmanager = new VolumeRendererManager();
surrendmanager1 = new wxMaracasSurfaceRenderingManager();
surrendmanager2 = new wxMaracasSurfaceRenderingManager();
surrendmanager3 = new wxMaracasSurfaceRenderingManager();
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();
}
}