X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasMultipleVolumeRendererPanel.cxx;h=d509fd9f42f8fbb65f60398006d095f494639570;hb=1b277d14d9ea0ebab60b44bbab2e0e18ed89db6b;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..d509fd9 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
@@ -50,13 +50,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));	
@@ -237,10 +244,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
+}
+