X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasSurfaceRenderingProp3D.cxx;h=a0c99108b6315434a3e8fede3e36737b7203cac2;hb=d2fc2645728a4aea4f0aa0febfa1d7a894ab3ff1;hp=1200c68261699a8802df5f4dec4013dbede192bc;hpb=476100b14fe16ecb940787a8f98d65e8359d7f58;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.cxx
index 1200c68..a0c9910 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.cxx
@@ -1,4 +1,5 @@
 #include "wxMaracasSurfaceRenderingProp3D.h"
+#include "wxMaracasDialog_NViewers.h"
 
 #include <wx/colordlg.h>
 #include "wxMaracasSurfaceRendering.h"
@@ -159,8 +160,23 @@ void wxMaracasSurfaceRenderingProp3D::onOpacityRelease(wxScrollEvent& event ){
 ** Loads the volume in a separate window
 **/
 void wxMaracasSurfaceRenderingProp3D::onViewImage(wxCommandEvent& event){	
-	printf("wxMaracasSurfaceRenderingProp3D->onViewImage: Test View Image");
-	vtkImageData* image = ((wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid))->getVolImage(this->_propid);
-	
-}
+	vtkImageData* img;
+	if(this->isComplexBox){
+		if(this->getPanId() == 1)
+			img = (wxMaracasRendererView::getInstance())->getTabbedPanel(_propid)->getSurfAImage();
+		if(this->getPanId() == 2)
+			img = (wxMaracasRendererView::getInstance())->getTabbedPanel(_propid)->getSurfBImage();
+		if(this->getPanId() == 3)
+			img = (wxMaracasRendererView::getInstance())->getTabbedPanel(_propid)->getSurfCImage();
+		
+		std::vector<int> type;
+		type.push_back(6);
 
+		wxMaracasDialog_NViewers* dialog1 = new wxMaracasDialog_NViewers(this, img, &type, wxString(_T("Volume Visualization") ));
+		dialog1->SetSize(730, 700);
+		dialog1->Show();
+	}
+	else{	
+		//vtkImageData* img = wxMaracasMultipleVolumeRendererView::getInstance()->getVolImage();
+	}
+}
\ No newline at end of file