X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FHistogramDialog.cxx;h=1a2c14093f0a03835514879350d6e7ee66f5a2af;hb=65c158dc171f8d3114ee3544b2a94a1f41880df0;hp=bdbe707bca9748028c449631f15d7732e7008513;hpb=f70f07396065237d1d4fabea4e9524ad4d9c7d13;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx
index bdbe707..1a2c140 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx
@@ -53,8 +53,8 @@ void HistogramDialog::initializeHistogramDialog(bool extracontrols){
 	/*
 	Pointers
 	*/
-	wxvtkmpr3Dview=NULL;
-	wxvtkclipping3Dview=NULL;
+	//wxvtkmpr3Dview=NULL;
+	//wxvtkclipping3Dview=NULL;
 	
 	/*
 	 Histogram
@@ -137,7 +137,7 @@ void HistogramDialog::setInfoPanExtraControls(std::vector<HistogramDialogComboBo
 		}	
 		
 		wxButton* button = new wxButton(_panextracontrols,wxID_ANY);			
-		button->SetToolTip("Add the current color to the list of predefined");		
+		button->SetToolTip(wxString("Add the current color to the list of predefined",wxConvUTF8));
 		button->SetLabel(wxString(_T("Add")));
 		Connect(button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&HistogramDialog::OnEditColorsCombo);				
 		_panextracontrols->GetSizer()->Add(button);					        
@@ -152,14 +152,14 @@ void HistogramDialog::setInfoPanExtraControls(std::vector<HistogramDialogComboBo
 wxSizer* HistogramDialog::getBitmapButtonDelete(wxBitmap bitmap){
 	//wxCheckBox* checkbox = new wxCheckBox(_panextracontrols,wxID_ANY,_T(""));
 	wxBitmap bitmap0(Delete_xpm);
-	wxBitmapButton* deletebutton = new wxBitmapButton(_panextracontrols,wxID_ANY,bitmap0,wxDefaultPosition,wxSize(20,20));	
-	deletebutton->SetToolTip("Delete the color from the list");
+	wxBitmapButton* deletebutton = new wxBitmapButton(_panextracontrols,wxID_ANY,bitmap0,wxDefaultPosition,wxSize(20,20));
+	deletebutton->SetToolTip(wxString("Delete the color from the list",wxConvUTF8));
 	Connect(deletebutton->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&HistogramDialog::OnDeleteColor);
-	_deletebuttonsvector.push_back(deletebutton);
+	 _deletebuttonsvector.push_back(deletebutton);
 	
 	//wxBitmap bitmap0(OpenImage_xpm);
 	wxBitmapButton* button = new wxBitmapButton(_panextracontrols,wxID_ANY,bitmap,wxDefaultPosition,wxSize(30,30));			
-	button->SetToolTip("Load the current color configuration.");
+	button->SetToolTip(wxString("Load the current color configuration.",wxConvUTF8));
 	bitmapbuttonsvect.push_back(button);			
 	Connect(button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&HistogramDialog::OnEditColorsCombo);
 	/*char c[10];
@@ -576,16 +576,16 @@ void HistogramDialog::OnRefreshBtn(wxCommandEvent &event)
 	 NOTE I NEED THE UPDATE
 	*/
 	//if it was call from the clipping ctnrl panel
-	if(wxvtkclipping3Dview!=NULL)
-	{
-		wxvtkclipping3Dview->Refresh();
+	//if(wxvtkclipping3Dview!=NULL)
+	//{
+	//	wxvtkclipping3Dview->Refresh();
 
-	}
-	else if(wxvtkmpr3Dview!=NULL)
-	{
-		wxvtkmpr3Dview->Refresh();
+	//}
+	//else if(wxvtkmpr3Dview!=NULL)
+	//{
+	//	wxvtkmpr3Dview->Refresh();
 
-	}
+	//}
 }
 
 
@@ -708,14 +708,14 @@ void HistogramDialog::OnRefreshBtn(wxCommandEvent &event)
 	{
 		newvol=vol;	
 	}
-	void HistogramDialog::setMPR3Dview(wxVtkMPR3DView *wxvtkmpr3Dview1)
-	{
-		wxvtkmpr3Dview=wxvtkmpr3Dview1;
-	}
-	void HistogramDialog::setClipping3DView(wxVtkClipping3DView *wxvtkclipping3Dview1)
-	{
-		wxvtkclipping3Dview=wxvtkclipping3Dview1;
-	}
+	//void HistogramDialog::setMPR3Dview(wxVtkMPR3DView *wxvtkmpr3Dview1)
+	//{
+	//	wxvtkmpr3Dview=wxvtkmpr3Dview1;
+	//}
+	//void HistogramDialog::setClipping3DView(wxVtkClipping3DView *wxvtkclipping3Dview1)
+	//{
+	//	wxvtkclipping3Dview=wxvtkclipping3Dview1;
+	//}
 
 
 	void  HistogramDialog::setTransferenceFunctionHasPoints(bool hasPoints)
@@ -766,4 +766,4 @@ void HistogramDialog::GetValuesColorPointsFunction(std::vector<double>& greyleve
 void HistogramDialog::SetFunctions(vtkPiecewiseFunction* _opac, vtkColorTransferFunction* _color){
 	_tfun = _opac;
 	_ctfun = _color;	
-}
\ No newline at end of file
+}