X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasMultipleVolumeRendererPanel.cxx;h=1d8bc3e30fd0232ee21e2e7243554387fb799408;hb=e5dd3702826e57ae15d40b8cda521e8ae17d5c57;hp=d509fd9f42f8fbb65f60398006d095f494639570;hpb=e7d3c47803d3341d27c134738499e92a1fef426c;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..1d8bc3e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
@@ -1,5 +1,7 @@
 #include "wxMaracasMultipleVolumeRendererPanel.h"
 #include "wxMaracasMultipleVolumeRendererView.h"
+#include "wxMaracas_N_ViewersWidget.h"
+#include "wxMaracasDialog_NViewers.h"
 #include "wxMaracasRendererView.h"
 
 #include <wx/colordlg.h>
@@ -10,6 +12,7 @@
 #include <OpenImage.xpm>
 #include <Add.xpm>
 #include "Color.xpm"
+#include <vector>
 //#include <vtkImageCast.h>
 /**
 **	Implementation of viewProp3D
@@ -48,8 +51,8 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
 	
 	if(!isComplexBox)
 	{
-		wxStaticText* label = new wxStaticText(this, -1, wxString(_T("")));	
-		wxStaticText* label2 = new wxStaticText(this, -1, wxString(_T("")));
+//		wxStaticText* label = new wxStaticText(this, -1, wxString(_T("")));	
+//		wxStaticText* label2 = new wxStaticText(this, -1, wxString(_T("")));
 
 
 		checkbox = new  wxCheckBox(this,-1,wxString(_T("Show Actor")));
@@ -205,26 +208,25 @@ 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);
-
+	vtkImageData* img;
 	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);*/
+
+	wxFrame* frame = new wxFrame(this, -1, wxString(_T("Volume Visualization")));
+	frame->SetSize(wxDefaultSize);
+
+	if(this->isComplexBox)
+	{
+		img = (wxMaracasRendererView::getInstance())->getTabbedPanel(_propid)->getVolImage();	
+	}
+	else
+	{	
+		img = wxMaracasMultipleVolumeRendererView::getInstance()->getVolumeRenderManager()->getImageData();
+	}
+
+	//	wxMaracas_N_ViewersWidget* viewer = new wxMaracas_N_ViewersWidget(frame, img, &type);
+	new wxMaracas_N_ViewersWidget(frame, img, &type);
+	frame->Show();
 }
 
 /**