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=241ec043d82df169705445f317b332207fd1b6b2;hp=0844b784a1b3c2541e58829614ef758f02b95aed;hpb=79df2a7fc2b468bc2e7279ac77c0148269fe6aee;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
index 0844b78..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>
@@ -50,13 +51,20 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
 	{
 		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 +206,19 @@ void wxMaracasMultipleVolumeRendererPanel::onColorChange(wxCommandEvent& event){
 **/
 void wxMaracasMultipleVolumeRendererPanel::onViewImage(wxCommandEvent& event)
 {	
-	printf("wxMaracasMultipleVolumeRendererPanel->onViewImage: Test View Image");
-	vtkImageData* img = (wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid)->getVolImage(_propid);
-	/*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();
+	}
 }
 
 /**
@@ -230,7 +231,6 @@ void wxMaracasMultipleVolumeRendererPanel::onCheckBoxChange(wxCommandEvent& even
 		wxMaracasMultipleVolumeRendererView::getInstance()->addRemoveActor(this->getPropId(), checkbox->GetValue());	
 }
 
-
 /**
 ** Gets the propId
 **/
@@ -238,10 +238,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
+}
+