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=2fc40ea4c362e930f3a491f725a3719dd475bd6c;hpb=52134c6f15827d0ae9ea8cf0ffaa15867ab87dcc;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
index 2fc40ea..1d8bc3e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
@@ -1,41 +1,73 @@
 #include "wxMaracasMultipleVolumeRendererPanel.h"
+#include "wxMaracasMultipleVolumeRendererView.h"
+#include "wxMaracas_N_ViewersWidget.h"
+#include "wxMaracasDialog_NViewers.h"
+#include "wxMaracasRendererView.h"
 
 #include <wx/colordlg.h>
-#include "wxMaracasMultipleVolumeRendererView.h"
+
+#include "vtkImageData.h"
+#include "vtkRenderer.h"
+
 #include <OpenImage.xpm>
+#include <Add.xpm>
 #include "Color.xpm"
+#include <vector>
 //#include <vtkImageCast.h>
 /**
 **	Implementation of viewProp3D
 **/
 
-wxMaracasMultipleVolumeRendererPanel::wxMaracasMultipleVolumeRendererPanel(wxWindow* parent,int propid, vtkImageData* img)
+/**
+** Class constructor
+**/
+wxMaracasMultipleVolumeRendererPanel::wxMaracasMultipleVolumeRendererPanel(wxWindow* parent,int propid, vtkImageData* img, bool _isComplexBox)
 : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
 {
 	_propid = propid;
+	isComplexBox = _isComplexBox;
 	
 	createControls(img);
 }
 
+/**
+** Class destructor
+**/
 wxMaracasMultipleVolumeRendererPanel::~wxMaracasMultipleVolumeRendererPanel(){	
-	//wxMaracasIRMView::getInstance()->addRemoveActor(_propid, false);
-	wxMaracasMultipleVolumeRendererView::getInstance()->deleteVolume(_propid);
+	
+	//if(isComplexBox)
+		//((wxMaracasRenderTabbedPanel*)(wxMaracasRendererView::getInstance())->getTabbedPanel())->deleteVolume(_propid);
+	//else
+		//wxMaracasMultipleVolumeRendererView::getInstance()->deleteVolume(_propid);
 	delete mwxwidget;
 }
 
+/**
+** Sets panel elements
+**/
 void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
 
-	wxFlexGridSizer* sizerirmprop = new wxFlexGridSizer(1,1,1);
-	
-	wxString choices[2];
-	choices[0] = wxString(_T("On"));
-	choices[1] = wxString(_T("Off"));
-	checkbox = new  wxCheckBox(this,-1,wxString(_T("Show Actor")));
-	Connect(checkbox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onCheckBoxChange);	
-	checkbox->SetValue(true);	
-
-	sizerirmprop->Add(checkbox,wxFIXED_MINSIZE);	
+	wxFlexGridSizer* sizerirmprop = new wxFlexGridSizer(3);
 	
+	if(!isComplexBox)
+	{
+//		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->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));	
 	//Connect(_colorchoose->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onColorChange);			
@@ -46,18 +78,18 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
 	Connect(mwxwidget->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onColorChange);
 	sizerirmprop->Add(mwxwidget,wxFIXED_MINSIZE);	
 
+	wxBitmap bitmap0(Add_xpm);
+	_viewimage = new wxBitmapButton(this, -1, bitmap0, wxDefaultPosition, wxSize(30,30));	
+	Connect(_viewimage->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onViewImage);			
+	sizerirmprop->Add(_viewimage,wxFIXED_MINSIZE);	
+
 	//std::string iconsdir = wxMaracasMultipleVolumeRendererView::getInstance()->getPath();
 	//iconsdir+="/data/Icons/Add.xmp";
 	//wxBitmap* bitmap = new wxBitmap(wxString(iconsdir.c_str(),wxConvUTF8), wxBITMAP_TYPE_XPM);
-	wxBitmap bitmap(OpenImage_xpm);
-	_viewimage = new wxBitmapButton(this, -1, bitmap, wxDefaultPosition, wxSize(30,30));	
-	Connect(_viewimage->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onViewImage);			
-	sizerirmprop->Add(_viewimage,wxFIXED_MINSIZE);	
 
 	this->SetSizer(sizerirmprop, true);		
 	this->SetAutoLayout( true );
     
-
 	//_frame = new wxFrame(this, 10, _T("Configure Transfer Functions"));	
 
 	/*wxButton* button1 = new wxButton(_frame,20,_T("OK"));
@@ -110,16 +142,32 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
 	//						wxMaracasMultipleVolumeRendererView::getInstance()->GetColorFunction(getPropId()));
 	mwxwidget->Refresh();	
 }
+
+/**
+**
+**/
 void wxMaracasMultipleVolumeRendererPanel::onOK(wxCommandEvent& event){
     updateVolume();
 	//_frame->Show(false);
 }
+
+/**
+**
+**/
 void wxMaracasMultipleVolumeRendererPanel::onCancel(wxCommandEvent& event){
 	//_frame->Show(false);
 }
+
+/**
+**
+**/
 void wxMaracasMultipleVolumeRendererPanel::onUpdate(wxCommandEvent& event){
 	updateVolume();    
 }
+
+/**
+**
+**/
 void wxMaracasMultipleVolumeRendererPanel::updateVolume(){
 	std::vector<double> greylevelcolors;
 	std::vector<double> red;
@@ -132,11 +180,21 @@ void wxMaracasMultipleVolumeRendererPanel::updateVolume(){
     mwxwidget->GetValuesColorPointsFunction(greylevelcolors, red, green, blue);
 	mwxwidget->GetValuesPointsFunction(greylevel, values);
 
-
-	wxMaracasMultipleVolumeRendererView::getInstance()->SetValuesColorPointsFunction(this->_propid, greylevelcolors, red, green, blue);
-	wxMaracasMultipleVolumeRendererView::getInstance()->SetValuesPointsFunction(this->_propid, greylevel, values);
-
+	if(this->isComplexBox)
+	{
+		( (wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid) )->SetValuesColorPointsFunction(this->_propid,greylevelcolors, red, green, blue);
+		( (wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid) )->SetValuesPointsFunction(this->_propid, greylevel, values);
+	}
+	else
+	{	
+		wxMaracasMultipleVolumeRendererView::getInstance()->SetValuesColorPointsFunction(this->_propid, greylevelcolors, red, green, blue);
+		wxMaracasMultipleVolumeRendererView::getInstance()->SetValuesPointsFunction(this->_propid, greylevel, values);
+	}
 }
+
+/**
+** Updates the volume visualization
+**/
 void wxMaracasMultipleVolumeRendererPanel::onColorChange(wxCommandEvent& event){	
 
 	//if(mwxwidget->ShowModal()==wxID_OK){
@@ -145,13 +203,59 @@ void wxMaracasMultipleVolumeRendererPanel::onColorChange(wxCommandEvent& event){
 	//}	
 }
 
-void wxMaracasMultipleVolumeRendererPanel::onViewImage(wxCommandEvent& event){	
-	
+/**
+**
+**/
+void wxMaracasMultipleVolumeRendererPanel::onViewImage(wxCommandEvent& event)
+{	
+	vtkImageData* img;
+	std::vector<int> type;
+	type.push_back(6);
+
+	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();
 }
+
+/**
+**
+**/
 void wxMaracasMultipleVolumeRendererPanel::onCheckBoxChange(wxCommandEvent& event){	
-	wxMaracasMultipleVolumeRendererView::getInstance()->addRemoveActor(this->getPropId(), checkbox->GetValue());	
+	if(this->isComplexBox)
+		( (wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid) )->addRemoveActorV(this->getPropId(), checkbox->GetValue());
+	else
+		wxMaracasMultipleVolumeRendererView::getInstance()->addRemoveActor(this->getPropId(), checkbox->GetValue());	
 }
 
+/**
+** Gets the propId
+**/
 int wxMaracasMultipleVolumeRendererPanel::getPropId(){
 	return _propid;
-}
\ No newline at end of file
+}
+
+void wxMaracasMultipleVolumeRendererPanel::onRadioBoxSelectFunction(wxCommandEvent& event){	
+	
+	wxMaracasMultipleVolumeRendererView::getInstance()->changeCompositeMIPFunction(this->getPropId(), _radiobox->GetSelection());	
+}
+
+/**
+** Carolina Perez: Recently added method
+**/
+HistogramDialogComboBox* wxMaracasMultipleVolumeRendererPanel::getMwxwidget()
+{
+	return mwxwidget;
+}
+