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=825f47d7d281a359e9fec03de88e7db58e9e49ff;hp=4e56b5ccdc3bb2f1ce236622970ae9512e88d0c1;hpb=cc00f80af2e160ce2af3ddd2903c4a41c023cc94;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.h
index 4e56b5c..9bebed2 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.h
@@ -2,32 +2,40 @@
 #define wxMaracasMultipleVolumeRendererPanel_H_
 
 #include <wx/wx.h>
-#include "HistogramWidget.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;
 
-	HistogramWidget* mwxwidget;
-	wxFrame* _frame;
-	
+	bool first;
+
+	HistogramDialogComboBox* mwxwidget;
+	//wxFrame* _frame;
+
+	//-- added for complex box --//
+	bool isComplexBox;
 };
 
 #endif /*wxMaracasMultipleVolumeRendererPanel_H_*/