X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FHistogramDialog.cxx;h=4f621cb350216666a5482e5f4b4c137ff7cd2b7e;hb=80b04dc9e3b981e24fe9ae0d81cdeb8af6e6f8c1;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..4f621cb 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 "HistogramDialog.h"
 #include <vector>
 
@@ -53,8 +78,8 @@ void HistogramDialog::initializeHistogramDialog(bool extracontrols){
 	/*
 	Pointers
 	*/
-	wxvtkmpr3Dview=NULL;
-	wxvtkclipping3Dview=NULL;
+	//wxvtkmpr3Dview=NULL;
+	//wxvtkclipping3Dview=NULL;
 	
 	/*
 	 Histogram
@@ -108,7 +133,12 @@ void HistogramDialog::initializeHistogramDialog(bool extracontrols){
     sizer->Add(bottomBox,0,wxCENTER);
 	SetAutoLayout( TRUE );
 	SetSizer( sizer );
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
 	SetBestSize(wxSize(600,600));
+#else
+	SetSize(wxSize(600,600));
+#endif
 }
 wxPanel* HistogramDialog::getPanExtraControls(){
 	wxBoxSizer* sizer0 = new wxBoxSizer(wxVERTICAL);
@@ -137,7 +167,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 +182,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];
@@ -334,7 +364,14 @@ wxSizer* HistogramDialog::getControls(bool extracontrols){
 
 void HistogramDialog::OnSaveData(wxCommandEvent& event)
 {
-	wxString nameF=wxFileSelector(_T("Save Data"), _T(" "),_T(""),_T(""),_T("*.*"),wxSAVE, NULL, -1,  -1);//wxFileSelector(_T("Save Data"),wxSAVE);
+	//wxFileSelector(_T("Save Data"),wxSAVE);
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+	wxString nameF=wxFileSelector(_T("Save Data"), _T(" "),_T(""),_T(""),_T("*.*"),wxSAVE, NULL, -1,  -1);
+#else
+	wxString nameF=wxFileSelector(_T("Save Data"), _T(" "),_T(""),_T(""),_T("*.*"),wxFD_SAVE, NULL, -1,  -1);
+#endif
+
 	std::ofstream file;
 	if(nameF.CompareTo( _T("/0") )>0)
 		file.open( (const char*)(nameF.mb_str()) );
@@ -576,16 +613,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();
 
-	}
+	//}
 }
 
 
@@ -700,7 +737,11 @@ void HistogramDialog::OnRefreshBtn(wxCommandEvent &event)
 		return refreshed;
 	}
 	
+#if (VTK_MAJOR_VERSION <= 7) 
 	void HistogramDialog::setVolumeMapper(vtkVolumeRayCastMapper* volMapper)
+#else 
+	void HistogramDialog::setVolumeMapper(vtkFixedPointVolumeRayCastMapper* volMapper)
+#endif
 	{
 		volumeMapper=volMapper;
 	}
@@ -708,14 +749,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 +807,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
+}