X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasMultipleVolumeRendererPanel.cxx;h=6c7d66f4d19db194a4bbc621b2c8a398b0fe122e;hb=d2fc2645728a4aea4f0aa0febfa1d7a894ab3ff1;hp=d509fd9f42f8fbb65f60398006d095f494639570;hpb=fcae90e6977dbe1fdcbc004533b20c6e4f833166;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
index d509fd9..6c7d66f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
@@ -1,5 +1,6 @@
 #include "wxMaracasMultipleVolumeRendererPanel.h"
 #include "wxMaracasMultipleVolumeRendererView.h"
+#include "wxMaracasDialog_NViewers.h"
 #include "wxMaracasRendererView.h"
 
 #include <wx/colordlg.h>
@@ -205,26 +206,19 @@ void wxMaracasMultipleVolumeRendererPanel::onColorChange(wxCommandEvent& event){
 **/
 void wxMaracasMultipleVolumeRendererPanel::onViewImage(wxCommandEvent& event)
 {	
-	printf("wxMaracasMultipleVolumeRendererPanel->onViewImage: Test View Image /n");
-	vtkImageData* img = (wxMaracasRendererView::getInstance())->getTabbedPanel(_propid)->getVolImage();
-	/*wxMaracasDialog_NViewers* dialog = new wxMaracasDialog_NViewers(this);
-
-	std::vector<int> type;
-	std::vector<int> point;
-
-	type.push_back(6);
-	dialog->SetImage(  );
-	dialog->SetType(type);
-
-	point.clear();
-	point.push_back((int)dialog->GetX());
-	point.push_back((int)dialog->GetY());
-	point.push_back((int)dialog->GetZ());
-
-	wxVtkBaseView *wvbv1 = dialog->GetwxVtkBaseView(1);
-	wxVtkBaseView *wvbv2 = dialog->GetwxVtkBaseView(2);
-	wxVtkBaseView *wvbv3 = dialog->GetwxVtkBaseView(3);
-	wxVtkBaseView *wvbv4 = dialog->GetwxVtkBaseView(4);*/
+	vtkImageData* img;
+	if(this->isComplexBox){
+		img = (wxMaracasRendererView::getInstance())->getTabbedPanel(_propid)->getVolImage();	
+		std::vector<int> type;
+		type.push_back(6);
+
+		wxMaracasDialog_NViewers* dialog1 = new wxMaracasDialog_NViewers(this, img, &type, wxString(_T("Volume Visualization") ));
+		dialog1->SetSize(wxDefaultSize);
+		dialog1->Show();
+	}
+	else{	
+		//vtkImageData* img = wxMaracasMultipleVolumeRendererView::getInstance()->getVolImage();
+	}
 }
 
 /**