X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRenderTabbedPanel.cpp;h=fd6463b8b8b17a90615aac22737a93ad95912d55;hb=c1b7d6e874f1bfcac251e852ae37229c12c61656;hp=bf11360898cafb2f3530104b9f7e9665bb8a2950;hpb=4af1766449a43e02dd007e1397f239f1581126c5;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index bf11360..fd6463b 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -16,6 +16,7 @@
 #include "Color.xpm"
 //#include "creaSystem.h"
 
+#include "creaWx.h"
 
 	BEGIN_EVENT_TABLE( wxMaracasRenderTabbedPanel, wxPanel )
 		EVT_MENU( 12121, wxMaracasRenderTabbedPanel::OnRefreshView )
@@ -26,13 +27,13 @@
 ** 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 wxMaracasMultipleVolumeRendererManager();
 	surrendmanager1 = new wxMaracasSurfaceRenderingManager();
 	surrendmanager2 = new wxMaracasSurfaceRenderingManager();
 	surrendmanager3 = new wxMaracasSurfaceRenderingManager();
@@ -48,12 +49,12 @@ wxMaracasRenderTabbedPanel::~wxMaracasRenderTabbedPanel()
 	//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;
 }
 
 /**
@@ -110,12 +111,12 @@ void wxMaracasRenderTabbedPanel::createControls(vtkImageData* inImg, std::string
 		//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();
 		}
 	}	
@@ -897,4 +898,4 @@ vtkImageData* wxMaracasRenderTabbedPanel::getSurfCImage()
 int wxMaracasRenderTabbedPanel::getPropIdV()
 {
 	return _id;
-}
\ No newline at end of file
+}