#include "wxMaracasMultipleVolumeRendererPanel.h"
#include "wxMaracasSurfaceRenderingPanel.h"
#include "wxMaracasSurfaceRenderingProp3DMHD.h"
-#include "wxMaracasMultipleVolumeRendererManagerData.h"
+#include "volumerenderermanagerdata.h"
#include "wxMaracasDialog_NViewers.h"
#include "wxVtkMPR3DViewCntrlPanel.h"
#include "Color.xpm"
//#include "creaSystem.h"
+#include "creaWx.h"
BEGIN_EVENT_TABLE( wxMaracasRenderTabbedPanel, wxPanel )
EVT_MENU( 12121, wxMaracasRenderTabbedPanel::OnRefreshView )
** Class constructor
**/
wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent, int id, wxVtk3DBaseView* _baseView)
-: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
+ : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
{
_id = id;
baseView = _baseView;
dialog = NULL;
- volmanager = new wxMaracasMultipleVolumeRendererManager();
+ volmanager = new VolumeRendererManager();
surrendmanager1 = new wxMaracasSurfaceRenderingManager();
surrendmanager2 = new wxMaracasSurfaceRenderingManager();
surrendmanager3 = new wxMaracasSurfaceRenderingManager();
//wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSB(_propid, false);
//wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSC(_propid, false);
addRemoveActorMPR(false);
- if( vtkmpr3Ddataviewer ) { delete vtkmpr3Ddataviewer; }
- if( mwxvtkmpr3Dview ) { delete mwxvtkmpr3Dview; }
+ if( vtkmpr3Ddataviewer ) { delete vtkmpr3Ddataviewer; }
+ if( mwxvtkmpr3Dview ) { delete mwxvtkmpr3Dview; }
this->deleteVolume(_id);
delete dialog;
- delete wxtabs;
+ delete wxtabs;
}
/**
//vtkImageData* img3 = surrendmanager3->getImageData(pathfile);
if(img!=NULL /*&& img1!=NULL && img2!=NULL && img3!=NULL*/)
{
- addVolume(img, filename);
+ addVolume(img, filename);
addSurface1(img, filename);
addSurface2(img, filename);
addSurface3(img, filename);
addMPROptions();
- volname = (wxString) filename;
+ volname = crea::std2wx(filename);
wxtabs->Refresh();
}
}
int wxMaracasRenderTabbedPanel::getPropIdV()
{
return _id;
-}
\ No newline at end of file
+}