X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasMultipleVolumeRendererPanel.cxx;h=6ac3f72b6853aed0a6510976ccbad24758003699;hb=b90d2dce776b27c95bd59251ee83d10a42b0cae5;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..6ac3f72 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
@@ -1,5 +1,32 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "wxMaracasMultipleVolumeRendererPanel.h"
 #include "wxMaracasMultipleVolumeRendererView.h"
+#include "wxMaracas_N_ViewersWidget.h"
+#include "wxMaracasDialog_NViewers.h"
 #include "wxMaracasRendererView.h"
 
 #include <wx/colordlg.h>
@@ -10,6 +37,7 @@
 #include <OpenImage.xpm>
 #include <Add.xpm>
 #include "Color.xpm"
+#include <vector>
 //#include <vtkImageCast.h>
 /**
 **	Implementation of viewProp3D
@@ -48,15 +76,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 +233,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 +271,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
+}
+