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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
index 011314d..13f7f3d 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
@@ -25,13 +25,11 @@
  #include <vtkColorTransferFunction.h>
  #include <vtkVolumeRayCastMapper.h>
  #include <vtkVolume.h>
- #include "../wxMPRWidget.h"
-#include "HistogramDialogComboBoxItem.h"
-
-#include <wx/bmpcbox.h>
-
+ //#include "../wxMPRWidget.h"
 
-#define FILENAME "/Data/colorsfunction.txt"
+#include "HistogramDialogComboBoxItem.h"
+#include <wx/checkbox.h>
+#include <wx/statbmp.h>
 
 class HistogramDialog:public wxDialog
 {
@@ -39,11 +37,12 @@ public:
 	/*
 	 Constructor
 	*/
-	HistogramDialog(wxWindow *parent,wxString title,vtkImageData* imageData,int type);
+	HistogramDialog(wxWindow *parent,wxString title,vtkImageData* imageData,bool extracontrols=false);
 	/*
 	 Constructor
 	*/
-	HistogramDialog(wxWindow *parent,wxString title);
+	HistogramDialog(wxWindow *parent,wxString title,bool extracontrols=false);
+	~HistogramDialog();
 	/*
 	 Methods
 	*/
@@ -119,8 +118,8 @@ public:
 	void setTF(vtkPiecewiseFunction* tf);
 	void setVolumeMapper(vtkVolumeRayCastMapper* volMapper);
 	void setVolume(vtkVolume* vol);
-	void setMPR3Dview(wxVtkMPR3DView *wxvtkmpr3Dview1);
-	void setClipping3DView(wxVtkClipping3DView *wxvtkclipping3Dview1);
+	//void setMPR3Dview(wxVtkMPR3DView *wxvtkmpr3Dview1);
+	//void setClipping3DView(wxVtkClipping3DView *wxvtkclipping3Dview1);
 
 	//--------------------
 	// plotter Information
@@ -134,7 +133,7 @@ public:
 	void OnSaveData(wxCommandEvent& event);
 	void OnLoadData(wxCommandEvent& event);
 	void OnRefreshBtn(wxCommandEvent& event);
-	void OnEditBitmapCombo(wxCommandEvent& event);
+	
 
 	/**
 	**	Initialize the histogram 
@@ -155,7 +154,22 @@ public:
 									std::vector<double>& blue);
 	void SetFunctions(vtkPiecewiseFunction* _opac, vtkColorTransferFunction* _color);
 
-	void OnBitmapComboItemSelected(wxCommandEvent& event);
+	/**
+	** Set to true in the constructor
+	**/
+	void setInfoPanExtraControls(std::vector<HistogramDialogComboBoxItem*> comboitems);
+	
+
+	/**
+	*
+	*/
+	void OnEditColorsCombo(wxCommandEvent& event);
+	void OnDeleteColor(wxCommandEvent& event);
+
+	std::vector<HistogramDialogComboBoxItem*> getComboBoxItems(){return _comboitems;}
+
+	void UpdateCurrentComboElement();
+	
 private:
 	/*
 	Histogram Widget
@@ -164,7 +178,6 @@ private:
 /**
 **	
 **/
-	double _maxgreyvalue;
 	/*
 	 ok Button
 	*/
@@ -188,7 +201,8 @@ private:
 	*/
 	wxButton		*refreshBtn;
 
-	wxSizer* _bitmapsizer;
+	wxPanel* _panextracontrols;
+	
 	
 	// the user had pressed refresh
 	bool refreshed;
@@ -199,21 +213,32 @@ private:
 	vtkVolume							*newvol;
 
 	//things to refresh
-	wxVtkMPR3DView						*wxvtkmpr3Dview;
-	wxVtkClipping3DView					*wxvtkclipping3Dview;
-
-	wxBitmapComboBox*	_bitmapcombo;	
-	std::vector<HistogramDialogComboBoxItem*> _bitmapsitems;
-	wxSizer* getControls();
-	wxSizer* getBitmapCombo();
-	wxBitmapComboBox* getBitmapComboElements();
-	void OnLoadComboBoxData(std::vector<HistogramDialogComboBoxItem*>& itembitmaps, std::string filename,std::vector<double>& greyvect, std::vector<int>& redvect, std::vector<int>& greenvect, std::vector<int>& bluevect);
-	std::vector<wxBitmap*> GetBitmapsList(std::vector<double> greyvect, std::vector<int> redvect, std::vector<int> greenvect, std::vector<int> bluevect);
+	//wxVtkMPR3DView						*wxvtkmpr3Dview;
+	//wxVtkClipping3DView					*wxvtkclipping3Dview;
+
+	
+	wxSizer* getControls(bool extracontrols = false);
+
+	
+	
 //	DECLARE_CLASS(HistogramDialog);
 	// any class wishing to process wxWindows events must use this macro
 	//DECLARE_EVENT_TABLE()
 
-	void initializeHistogramDialog();
+	void initializeHistogramDialog(bool extracontrols);
+
+	 wxPanel* getPanExtraControls();
+
+	 std::vector<wxBitmapButton*> bitmapbuttonsvect;
+	 std::vector<HistogramDialogComboBoxItem*> _comboitems;
+
+	 void setCurrentColorConfigurationIntoButton();
+	 void AddNewBitmapButton();
+	 wxSizer* getBitmapButtonDelete(wxBitmap bitmap);
+	 std::vector<wxBitmapButton*> _deletebuttonsvector;
+
+	 int _maxgreyvalue;
+	 int _currentcolorselectedbitmap;
 };
 
 #endif