X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FGUI%2FWx%2FVolumeRenderer%2FwxMaracasMultipleVolumeRendererPanel.cxx;h=7c912b9ea9c6c719504f28beeae3eaf2a2c5ca35;hb=31a84e3c7e162faa88942b8b47abf833cdcc5533;hp=1d8bc3e30fd0232ee21e2e7243554387fb799408;hpb=0d47d470f614b02b3fb6d06b7688585bf535b6a7;p=creaMaracasVisu.git

diff --git a/lib/GUI/Wx/VolumeRenderer/wxMaracasMultipleVolumeRendererPanel.cxx b/lib/GUI/Wx/VolumeRenderer/wxMaracasMultipleVolumeRendererPanel.cxx
index 1d8bc3e..7c912b9 100644
--- a/lib/GUI/Wx/VolumeRenderer/wxMaracasMultipleVolumeRendererPanel.cxx
+++ b/lib/GUI/Wx/VolumeRenderer/wxMaracasMultipleVolumeRendererPanel.cxx
@@ -26,15 +26,15 @@ wxMaracasMultipleVolumeRendererPanel::wxMaracasMultipleVolumeRendererPanel(wxWin
 {
 	_propid = propid;
 	isComplexBox = _isComplexBox;
-	
+
 	createControls(img);
 }
 
 /**
 ** Class destructor
 **/
-wxMaracasMultipleVolumeRendererPanel::~wxMaracasMultipleVolumeRendererPanel(){	
-	
+wxMaracasMultipleVolumeRendererPanel::~wxMaracasMultipleVolumeRendererPanel(){
+
 	//if(isComplexBox)
 		//((wxMaracasRenderTabbedPanel*)(wxMaracasRendererView::getInstance())->getTabbedPanel())->deleteVolume(_propid);
 	//else
@@ -48,16 +48,16 @@ wxMaracasMultipleVolumeRendererPanel::~wxMaracasMultipleVolumeRendererPanel(){
 void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
 
 	wxFlexGridSizer* sizerirmprop = new wxFlexGridSizer(3);
-	
+
 	if(!isComplexBox)
 	{
-//		wxStaticText* label = 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);	
+		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);
@@ -69,33 +69,33 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
 		//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);			
+	//_colorchoose = new wxBitmapButton(this, -1, bitmap,wxDefaultPosition,wxSize(30,30));
+	//Connect(_colorchoose->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onColorChange);
 
 	mwxwidget = new HistogramDialogComboBox(this);
 	mwxwidget->setImageData(img);
     //mwxwidget->PushEventHandler(this);
 	Connect(mwxwidget->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onColorChange);
-	sizerirmprop->Add(mwxwidget,wxFIXED_MINSIZE);	
+	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);	
+	_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);
 
-	this->SetSizer(sizerirmprop, true);		
+	this->SetSizer(sizerirmprop, true);
 	this->SetAutoLayout( true );
-    
-	//_frame = new wxFrame(this, 10, _T("Configure Transfer Functions"));	
+
+	//_frame = new wxFrame(this, 10, _T("Configure Transfer Functions"));
 
 	/*wxButton* button1 = new wxButton(_frame,20,_T("OK"));
-	Connect(button1->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onOK);				
+	Connect(button1->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onOK);
 	wxButton* button2 = new wxButton(_frame,30,_T("Cancel") );
-	Connect(button2->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onCancel);				
+	Connect(button2->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onCancel);
 	wxButton* button3 = new wxButton(_frame,40,_T("Update"));
 	Connect(button3->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onUpdate);				*/
 
@@ -104,7 +104,7 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
 	img->GetScalarRange(range);
 	double max = range[1];
 
-	
+
 	//X
 	mwxwidget->addPointToTransferenceFunction(max * 0/2,0.0);
 	mwxwidget->addPointToTransferenceFunction(max * 1/2,100.0);
@@ -128,19 +128,19 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
 	boxSizer->Add(button3, wxCENTER);
 
 	wxBoxSizer* boxsizer2 = new wxBoxSizer(wxVERTICAL);
-	boxsizer2->Add(boxSizer0,1,wxEXPAND);	
-	boxsizer2->Add(boxSizer,0,wxCENTER);	
-    
+	boxsizer2->Add(boxSizer0,1,wxEXPAND);
+	boxsizer2->Add(boxSizer,0,wxCENTER);
+
 	_frame->SetAutoLayout(true);
 
 
     _frame->SetSizer(boxsizer2);
 
 	_frame->Refresh();
-	_frame->Update();*/	
+	_frame->Update();*/
 	//mwxwidget->SetFunctions(wxMaracasMultipleVolumeRendererView::getInstance()->GetTransferFunction(getPropId()),
 	//						wxMaracasMultipleVolumeRendererView::getInstance()->GetColorFunction(getPropId()));
-	mwxwidget->Refresh();	
+	mwxwidget->Refresh();
 }
 
 /**
@@ -162,7 +162,7 @@ void wxMaracasMultipleVolumeRendererPanel::onCancel(wxCommandEvent& event){
 **
 **/
 void wxMaracasMultipleVolumeRendererPanel::onUpdate(wxCommandEvent& event){
-	updateVolume();    
+	updateVolume();
 }
 
 /**
@@ -186,7 +186,7 @@ void wxMaracasMultipleVolumeRendererPanel::updateVolume(){
 		( (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);
 	}
@@ -195,19 +195,19 @@ void wxMaracasMultipleVolumeRendererPanel::updateVolume(){
 /**
 ** Updates the volume visualization
 **/
-void wxMaracasMultipleVolumeRendererPanel::onColorChange(wxCommandEvent& event){	
+void wxMaracasMultipleVolumeRendererPanel::onColorChange(wxCommandEvent& event){
 
 	//if(mwxwidget->ShowModal()==wxID_OK){
         updateVolume();
 	//	mwxwidget->Show(false);
-	//}	
+	//}
 }
 
 /**
 **
 **/
 void wxMaracasMultipleVolumeRendererPanel::onViewImage(wxCommandEvent& event)
-{	
+{
 	vtkImageData* img;
 	std::vector<int> type;
 	type.push_back(6);
@@ -217,10 +217,10 @@ void wxMaracasMultipleVolumeRendererPanel::onViewImage(wxCommandEvent& event)
 
 	if(this->isComplexBox)
 	{
-		img = (wxMaracasRendererView::getInstance())->getTabbedPanel(_propid)->getVolImage();	
+		img = (wxMaracasRendererView::getInstance())->getTabbedPanel(_propid)->getVolImage();
 	}
 	else
-	{	
+	{
 		img = wxMaracasMultipleVolumeRendererView::getInstance()->getVolumeRenderManager()->getImageData();
 	}
 
@@ -232,11 +232,11 @@ void wxMaracasMultipleVolumeRendererPanel::onViewImage(wxCommandEvent& event)
 /**
 **
 **/
-void wxMaracasMultipleVolumeRendererPanel::onCheckBoxChange(wxCommandEvent& event){	
+void wxMaracasMultipleVolumeRendererPanel::onCheckBoxChange(wxCommandEvent& event){
 	if(this->isComplexBox)
 		( (wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid) )->addRemoveActorV(this->getPropId(), checkbox->GetValue());
 	else
-		wxMaracasMultipleVolumeRendererView::getInstance()->addRemoveActor(this->getPropId(), checkbox->GetValue());	
+		wxMaracasMultipleVolumeRendererView::getInstance()->addRemoveActor(this->getPropId(), checkbox->GetValue());
 }
 
 /**
@@ -246,9 +246,9 @@ int wxMaracasMultipleVolumeRendererPanel::getPropId(){
 	return _propid;
 }
 
-void wxMaracasMultipleVolumeRendererPanel::onRadioBoxSelectFunction(wxCommandEvent& event){	
-	
-	wxMaracasMultipleVolumeRendererView::getInstance()->changeCompositeMIPFunction(this->getPropId(), _radiobox->GetSelection());	
+void wxMaracasMultipleVolumeRendererPanel::onRadioBoxSelectFunction(wxCommandEvent& event){
+
+	wxMaracasMultipleVolumeRendererView::getInstance()->changeCompositeMIPFunction(this->getPropId(), _radiobox->GetSelection());
 }
 
 /**