X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasMultipleVolumeRendererPanel.h;h=9bebed2a71e7dd9b153f919a58e8c0fe159d2af1;hb=f050938d3947f6b785289da6d58f8fec2da57421;hp=13d240529d646ad97b3c601f4dc5db2e51047195;hpb=0006c401e6399555e1cfa83989a3343ccce51813;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.h
index 13d2405..9bebed2 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.h
@@ -2,34 +2,40 @@
 #define wxMaracasMultipleVolumeRendererPanel_H_
 
 #include <wx/wx.h>
-#include "HistogramDialog.h"
+#include "HistogramDialogComboBox.h"
 
 class wxMaracasMultipleVolumeRendererPanel : public wxPanel{
 	
 public:
-	wxMaracasMultipleVolumeRendererPanel(wxWindow* parent, int propid, vtkImageData* img);
+	wxMaracasMultipleVolumeRendererPanel(wxWindow* parent, int propid, vtkImageData* img, bool _isComplexBox);
 	~wxMaracasMultipleVolumeRendererPanel();
-	void createControls(vtkImageData* img);		
+	void createControls(vtkImageData* img);	
 	void onCheckBoxChange(wxCommandEvent& event);
 	void onColorChange(wxCommandEvent& event);
 	void onOK(wxCommandEvent& event);
 	void onCancel(wxCommandEvent& event);
 	void onUpdate(wxCommandEvent& event);
+	void onViewImage(wxCommandEvent& event);
+	void onRadioBoxSelectFunction(wxCommandEvent& event);
 
 	void updateVolume();
 	int getPropId();
-	
+	HistogramDialogComboBox* getMwxwidget();
+
 private:
 	wxCheckBox* checkbox;
-	wxBitmapButton* _colorchoose;
+	wxRadioBox* _radiobox;
+	wxBitmapButton* _viewimage;
 	
 	int _propid;
 
 	bool first;
 
-	HistogramDialog* mwxwidget;
+	HistogramDialogComboBox* mwxwidget;
 	//wxFrame* _frame;
-	
+
+	//-- added for complex box --//
+	bool isComplexBox;
 };
 
 #endif /*wxMaracasMultipleVolumeRendererPanel_H_*/