RaC Changes that includes a Polygon contour in creaMaracasVisu. It includes changes

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMaracasMultipleVolumeRendererPanel.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
index 0844b784a1b3c2541e58829614ef758f02b95aed..d509fd9f42f8fbb65f60398006d095f494639570 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
@@ -50,13 +50,20 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
        {
                wxStaticText* label = new wxStaticText(this, -1, wxString(_T("")));     
                wxStaticText* label2 = new wxStaticText(this, -1, wxString(_T("")));
+
+
                checkbox = new  wxCheckBox(this,-1,wxString(_T("Show Actor")));
                Connect(checkbox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onCheckBoxChange);     
                checkbox->SetValue(true);       
 
+               wxString choices[] = {_T("Composite"), _T("MIP")};
+               _radiobox = new wxRadioBox(this, -1, wxString(_T("Function")), wxDefaultPosition, wxDefaultSize, 2, choices);
+               Connect(_radiobox->GetId(), wxEVT_COMMAND_RADIOBOX_SELECTED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onRadioBoxSelectFunction);
+
                sizerirmprop->Add(checkbox,wxFIXED_MINSIZE);
-               sizerirmprop->Add(label,wxFIXED_MINSIZE);
-               sizerirmprop->Add(label2,wxFIXED_MINSIZE);
+               sizerirmprop->AddSpacer(5);
+               sizerirmprop->Add(_radiobox,wxFIXED_MINSIZE);
+               //sizerirmprop->Add(label2,wxFIXED_MINSIZE);
        }
        //wxBitmap bitmap(Color_xpm);
        //_colorchoose = new wxBitmapButton(this, -1, bitmap,wxDefaultPosition,wxSize(30,30));  
@@ -198,8 +205,8 @@ void wxMaracasMultipleVolumeRendererPanel::onColorChange(wxCommandEvent& event){
 **/
 void wxMaracasMultipleVolumeRendererPanel::onViewImage(wxCommandEvent& event)
 {      
-       printf("wxMaracasMultipleVolumeRendererPanel->onViewImage: Test View Image");
-       vtkImageData* img = (wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid)->getVolImage(_propid);
+       printf("wxMaracasMultipleVolumeRendererPanel->onViewImage: Test View Image /n");
+       vtkImageData* img = (wxMaracasRendererView::getInstance())->getTabbedPanel(_propid)->getVolImage();
        /*wxMaracasDialog_NViewers* dialog = new wxMaracasDialog_NViewers(this);
 
        std::vector<int> type;
@@ -230,7 +237,6 @@ void wxMaracasMultipleVolumeRendererPanel::onCheckBoxChange(wxCommandEvent& even
                wxMaracasMultipleVolumeRendererView::getInstance()->addRemoveActor(this->getPropId(), checkbox->GetValue());    
 }
 
-
 /**
 ** Gets the propId
 **/
@@ -238,10 +244,16 @@ int wxMaracasMultipleVolumeRendererPanel::getPropId(){
        return _propid;
 }
 
+void wxMaracasMultipleVolumeRendererPanel::onRadioBoxSelectFunction(wxCommandEvent& event){    
+       
+       wxMaracasMultipleVolumeRendererView::getInstance()->changeCompositeMIPFunction(this->getPropId(), _radiobox->GetSelection());   
+}
+
 /**
 ** Carolina Perez: Recently added method
 **/
 HistogramDialogComboBox* wxMaracasMultipleVolumeRendererPanel::getMwxwidget()
 {
        return mwxwidget;
-}
\ No newline at end of file
+}
+