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=ae196719490130990cdde501c982c3370b46b21c;hp=bbbd73bb962a0e6492e5b717e83fd37a1daae82d;hpb=87b6a1645b4dd6293e9c6ed9b33731d82a8623af;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
index bbbd73b..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,15 +51,22 @@ 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")));
 		Connect(checkbox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onCheckBoxChange);	
 		checkbox->SetValue(true);	
 
+		wxString choices[] = {_T("Composite"), _T("MIP")};
+		_radiobox = new wxRadioBox(this, -1, wxString(_T("Function")), wxDefaultPosition, wxDefaultSize, 2, choices);
+		Connect(_radiobox->GetId(), wxEVT_COMMAND_RADIOBOX_SELECTED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onRadioBoxSelectFunction);
+
 		sizerirmprop->Add(checkbox,wxFIXED_MINSIZE);
-		sizerirmprop->Add(label,wxFIXED_MINSIZE);
-		sizerirmprop->Add(label2,wxFIXED_MINSIZE);
+		sizerirmprop->AddSpacer(5);
+		sizerirmprop->Add(_radiobox,wxFIXED_MINSIZE);
+		//sizerirmprop->Add(label2,wxFIXED_MINSIZE);
 	}
 	//wxBitmap bitmap(Color_xpm);
 	//_colorchoose = new wxBitmapButton(this, -1, bitmap,wxDefaultPosition,wxSize(30,30));	
@@ -198,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();
 }
 
 /**
@@ -237,10 +246,16 @@ int wxMaracasMultipleVolumeRendererPanel::getPropId(){
 	return _propid;
 }
 
+void wxMaracasMultipleVolumeRendererPanel::onRadioBoxSelectFunction(wxCommandEvent& event){	
+	
+	wxMaracasMultipleVolumeRendererView::getInstance()->changeCompositeMIPFunction(this->getPropId(), _radiobox->GetSelection());	
+}
+
 /**
 ** Carolina Perez: Recently added method
 **/
 HistogramDialogComboBox* wxMaracasMultipleVolumeRendererPanel::getMwxwidget()
 {
 	return mwxwidget;
-}
\ No newline at end of file
+}
+