]> Creatis software - creaMaracasVisu.git/blobdiff - lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
creaButtonContainer: exceptions added, doxygen documentation added :)
[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxVtkMPR3DViewCntrlPanel.cxx
index 8665e09ccd1f77507895fc9dd573499254a31acc..25a2781e3497d37acb1ab4077ea483a806b55568 100644 (file)
@@ -2,10 +2,9 @@
 
 #include "HistogramDialog.h"
 
-wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DView *wxvtkmpr3Dview )
+wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DView *wxvtkmpr3Dview, bool align )
 : wxPanel(parent, -1)
 {
-
        wxPanel *panel  = this;
        _wxvtkmpr3Dview = wxvtkmpr3Dview;
 
@@ -13,10 +12,12 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
        int maxY = _wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetVtkMPRBaseData()->GetMaxPositionY();
        int maxZ = _wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetVtkMPRBaseData()->GetMaxPositionZ();*/
 
-       int maxX = 1;
-       int maxY = 1;
-       int maxZ = 1;
+       //int maxX = 1;
+       //int maxY = 1;
+       //int maxZ = 1;
 
+       //CPR: Modified 30 Nov 2009
+       /*
        wxCheckBox              *ckBoxX                 = new wxCheckBox(panel,-1,_T("X           "));
                                        _positionX              = new wxSlider(panel,-1,maxX/2,0,maxX, wxDefaultPosition, wxSize(150,40), wxSL_HORIZONTAL | wxSL_LABELS);
        wxCheckBox              *ckBoxY                 = new wxCheckBox(panel,-1,_T("Y           "));
@@ -24,10 +25,30 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
        wxCheckBox              *ckBoxZ                 = new wxCheckBox(panel,-1,_T("Z           "));
                                        _positionZ              = new wxSlider(panel,-1,maxZ/2,0,maxZ, wxDefaultPosition, wxSize(150,40), wxSL_HORIZONTAL | wxSL_LABELS);
        wxButton                *btnColorTable  = new wxButton (panel, -1, _T("Edit Color Table") );
-
-       _ckBoxXYZ                       = new wxCheckBox(panel,-1,_T("XYZ                  "));
-       _ckBoxPlane                     = new wxCheckBox(panel,-1,_T("Plane"));
-
+       */
+
+       ckBoxX                  = new wxCheckBox(panel,-1,_T("X           "));
+       _positionX              = new wxSlider(panel,-1,0,0,1, wxDefaultPosition, wxSize(300,40), wxSL_HORIZONTAL | wxSL_LABELS);
+       ckBoxY                  = new wxCheckBox(panel,-1,_T("Y           "));
+       _positionY              = new wxSlider(panel,-1,0,0,1, wxDefaultPosition, wxSize(300,40), wxSL_HORIZONTAL | wxSL_LABELS);
+       ckBoxZ                  = new wxCheckBox(panel,-1,_T("Z           "));
+       _positionZ              = new wxSlider(panel,-1,0,0,1, wxDefaultPosition, wxSize(300,40), wxSL_HORIZONTAL | wxSL_LABELS);
+       wxButton                *btnColorTable  = new wxButton (panel, -1, _T("Color Table") );
+
+       _ckBoxXYZ               = new wxCheckBox(panel,-1,_T("Show XYZ axis         "));
+       _ckBoxPlane             = new wxCheckBox(panel,-1,_T("Show Planes"));
+
+       _ckFreePlaneX= new wxCheckBox(panel,-1,_T("free X"));;
+       _ckFreePlaneY= new wxCheckBox(panel,-1,_T("free Y"));;
+       _ckFreePlaneZ= new wxCheckBox(panel,-1,_T("free Z"));;
+       _ckFreePlaneInteraction= new wxCheckBox(panel,-1,_T("Interaction "));;
+       
+       //EED: If-else statements added 30 Nov 2009
+       _ckFreePlaneX->SetValue(true);
+       _ckFreePlaneY->SetValue(false);
+       _ckFreePlaneZ->SetValue(false);
+       _ckFreePlaneInteraction->SetValue(true);
+       
        ckBoxX->SetValue(false);
        ckBoxY->SetValue(false);
        ckBoxZ->SetValue(false);
@@ -38,69 +59,120 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
        _positionY->SetSize(400,20);
        _positionZ->SetSize(400,20);
 
-       Connect(ckBoxX->GetId()                 , wxEVT_COMMAND_CHECKBOX_CLICKED          , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisX   );
-       Connect(_positionX->GetId()             , wxEVT_COMMAND_SLIDER_UPDATED            , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionX              );
-       Connect(ckBoxY->GetId()                 , wxEVT_COMMAND_CHECKBOX_CLICKED          , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisY   );
-       Connect(_positionY->GetId()             , wxEVT_COMMAND_SLIDER_UPDATED            , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionY              );
-       Connect(ckBoxZ->GetId()                 , wxEVT_COMMAND_CHECKBOX_CLICKED          , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisZ   );
-       Connect(_positionZ->GetId()             , wxEVT_COMMAND_SLIDER_UPDATED            , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionZ              );
-       Connect(btnColorTable->GetId()  , wxEVT_COMMAND_BUTTON_CLICKED            , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnEditColorTable );
-
-       Connect(_ckBoxXYZ->GetId()  , wxEVT_COMMAND_CHECKBOX_CLICKED      , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisXYZ );
-       Connect(_ckBoxPlane->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED      , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisiblePlane   );
-
-
-       wxFlexGridSizer *sizer   = new wxFlexGridSizer(1);
-//     wxBoxSizer *sizer        = new wxBoxSizer(wxVERTICAL);
-
-//     wxBoxSizer *sizerH4 = new wxBoxSizer(wxHORIZONTAL);
-       wxFlexGridSizer *sizerH4 = new wxFlexGridSizer(10);
-       wxFlexGridSizer *sizerH5 = new wxFlexGridSizer(10);
-
-
-
-//EED 28 sep 2006
-//     wxFlexGridSizer *sizerH6 = new wxFlexGridSizer(10);
-//     wxFlexGridSizer *sizerH7 = new wxFlexGridSizer(10);
+       Connect(ckBoxX->GetId(),        wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisX       );
+       Connect(_positionX->GetId(),    wxEVT_COMMAND_SLIDER_UPDATED,   (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionX          );
+       Connect(ckBoxY->GetId(),        wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisY       );
+       Connect(_positionY->GetId(),    wxEVT_COMMAND_SLIDER_UPDATED,   (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionY          );
+       Connect(ckBoxZ->GetId(),        wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisZ       );
+       Connect(_positionZ->GetId(),    wxEVT_COMMAND_SLIDER_UPDATED,   (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionZ          );
+       Connect(btnColorTable->GetId(), wxEVT_COMMAND_BUTTON_CLICKED,   (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnEditColorTable     );
+
+       Connect(_ckBoxXYZ->GetId(),     wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisXYZ     );
+       Connect(_ckBoxPlane->GetId(),   wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisiblePlane       );
+
+       Connect(_ckFreePlaneX->GetId()          , wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneX        );
+       Connect(_ckFreePlaneY->GetId()          , wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneY        );
+       Connect(_ckFreePlaneZ->GetId()          , wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneZ        );
+       Connect(_ckFreePlaneInteraction->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneInteraction      );
+       
+       wxFlexGridSizer *sizer;
+       
+       //      wxBoxSizer *sizer        = new wxBoxSizer(wxVERTICAL);
+       //      wxBoxSizer *sizerH4 = new wxBoxSizer(wxHORIZONTAL);
+       
+       //CPR: If-else statements added 30 Nov 2009
+       wxFlexGridSizer *sizerH4;
+       wxFlexGridSizer *sizerH5;
+       wxFlexGridSizer *sizerH6;
+       if(align)
+       {
+               sizer    = new wxFlexGridSizer(3);
+
+               sizerH4 = new wxFlexGridSizer(2);
+               sizerH4->Add( _positionX ,1,wxGROW                          , 0 );
+               sizerH4->Add( ckBoxX     ,0,wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 );
+               sizerH4->Add( _positionY ,1,wxGROW, 0 );
+               sizerH4->Add( ckBoxY     ,0,wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 );
+               sizerH4->Add( _positionZ ,1,wxGROW, 0 );
+               sizerH4->Add( ckBoxZ     ,0,wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 );
+               
+               sizerH5 = new wxFlexGridSizer(1);
+               sizerH5->Add( new wxStaticText(panel, -1,_T("      "))  , 1, wxALL|wxEXPAND, 0);
+               sizerH5->Add( _ckBoxXYZ                                 , 1, wxALL|wxEXPAND, 0);
+               sizerH5->Add( new wxStaticText(panel, -1,_T("      "))  , 1, wxALL|wxEXPAND, 0);
+               sizerH5->Add( _ckBoxPlane                               , 1, wxALL|wxEXPAND, 0);
+               sizerH5->Add( new wxStaticText(panel, -1,_T("      "))  , 1, wxALL|wxEXPAND, 0);
+               sizerH5->Add( btnColorTable                             , 0, wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 );
+               //sizerH5->Add( new wxStaticText(panel, -1,_T("      ")), 1, wxALL|wxEXPAND, 0);
+               
+               sizerH6 = new wxFlexGridSizer(1);
+               sizerH6->Add( _ckFreePlaneX,            1, wxALL|wxEXPAND, 0);
+               sizerH6->Add( _ckFreePlaneY,            1, wxALL|wxEXPAND, 0);
+               sizerH6->Add( _ckFreePlaneZ,            1, wxALL|wxEXPAND, 0);
+               sizerH6->Add( _ckFreePlaneInteraction , 1, wxALL|wxEXPAND, 0);
+               
+       }       else    {
+               sizer    = new wxFlexGridSizer(1);
+
+               sizerH4 = new wxFlexGridSizer(10);
+               sizerH5 = new wxFlexGridSizer(10);
+               sizerH6 = new wxFlexGridSizer(10);
+
+               sizerH4->Add( _positionX        , 1, wxGROW                          , 0 );
+               sizerH4->Add( ckBoxX            , 0, wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 );
+               sizerH4->Add( _positionY        , 1, wxGROW                          , 0 );
+               sizerH4->Add( ckBoxY            , 0, wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 );
+               sizerH4->Add( _positionZ        , 1, wxGROW                          , 0 );
+               sizerH4->Add( ckBoxZ            , 0, wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 );
+               sizerH4->Add( btnColorTable     , 0, wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 );
+
+               sizerH5->Add( _ckBoxXYZ                                , 1, wxALL|wxEXPAND, 0);
+               sizerH5->Add( _ckBoxPlane                              , 1, wxALL|wxEXPAND, 0);
+               sizerH5->Add( new wxStaticText(panel, -1,_T("      ")) , 1, wxALL|wxEXPAND, 0);
+
+               sizerH6 = new wxFlexGridSizer(10);
+               sizerH6->Add( _ckFreePlaneX                            , 1, wxALL|wxEXPAND, 0);
+               sizerH6->Add( new wxStaticText(panel, -1,_T(" "))      , 1, wxALL|wxEXPAND, 0);
+               sizerH6->Add( _ckFreePlaneY                            , 1, wxALL|wxEXPAND, 0);
+               sizerH6->Add( new wxStaticText(panel, -1,_T(" "))      , 1, wxALL|wxEXPAND, 0);
+               sizerH6->Add( _ckFreePlaneZ                            , 1, wxALL|wxEXPAND, 0);
+               sizerH6->Add( new wxStaticText(panel, -1,_T("  "))     , 1, wxALL|wxEXPAND, 0);
+               sizerH6->Add( _ckFreePlaneInteraction                  , 1, wxALL|wxEXPAND, 0);
+       }
 
-//     sizerH4->Add( ckBoxX            , 1, wxALL|wxEXPAND, 0);
-//     sizerH4->Add( new wxStaticText(panel, -1,"  ")                  , 1, wxALL|wxEXPAND, 0);
-//     sizerH4->Add( _positionX        , 1, wxALL|wxEXPAND, 0);
 
-//     sizerH5->Add( ckBoxY            , 1, wxALL|wxEXPAND, 0);
-//     sizerH5->Add( new wxStaticText(panel, -1,"  ")                  , 1, wxALL|wxEXPAND, 0);
-//     sizerH5->Add( _positionY        , 1, wxALL|wxEXPAND, 0);
+       //EED 28 sep 2006
+       //      wxFlexGridSizer *sizerH6 = new wxFlexGridSizer(10);
+       //      wxFlexGridSizer *sizerH7 = new wxFlexGridSizer(10);
 
-//     sizerH6->Add( ckBoxZ            , 1, wxALL|wxEXPAND, 0);
-//     sizerH6->Add( new wxStaticText(panel, -1,"  ")                  , 1, wxALL|wxEXPAND, 0);
-//     sizerH6->Add( _positionZ        , 1, wxALL|wxEXPAND, 0);
+       //      sizerH4->Add( ckBoxX            , 1, wxALL|wxEXPAND, 0);
+       //      sizerH4->Add( new wxStaticText(panel, -1,"  ")                  , 1, wxALL|wxEXPAND, 0);
+       //      sizerH4->Add( _positionX        , 1, wxALL|wxEXPAND, 0);
 
-//     sizerH7->Add( _ckBoxXYZ         , 1, wxALL|wxEXPAND, 0);
-//     sizerH7->Add( _ckBoxPlane       , 1, wxALL|wxEXPAND, 0);
+       //      sizerH5->Add( ckBoxY            , 1, wxALL|wxEXPAND, 0);
+       //      sizerH5->Add( new wxStaticText(panel, -1,"  ")                  , 1, wxALL|wxEXPAND, 0);
+       //      sizerH5->Add( _positionY        , 1, wxALL|wxEXPAND, 0);
 
-//     sizer->Add( sizerH4                     , 1, wxALL|wxEXPAND, 2);
-//     sizer->Add( sizerH5                     , 1, wxALL|wxEXPAND, 2);
-//     sizer->Add( sizerH6                     , 1, wxALL|wxEXPAND, 2);
-//     sizer->Add( sizerH7                     , 1, wxALL|wxEXPAND, 2);
+       //      sizerH6->Add( ckBoxZ            , 1, wxALL|wxEXPAND, 0);
+       //      sizerH6->Add( new wxStaticText(panel, -1,"  ")                  , 1, wxALL|wxEXPAND, 0);
+       //      sizerH6->Add( _positionZ        , 1, wxALL|wxEXPAND, 0);
 
-       sizerH4->Add( _positionX                                                                ,1,wxGROW                                       , 0 );
-       sizerH4->Add( ckBoxX                                                                    ,0,wxALIGN_CENTER_VERTICAL|wxSHAPED     , 0 );
-       sizerH4->Add( _positionY                                                                ,1,wxGROW                                       , 0 );
-       sizerH4->Add( ckBoxY                                                                    ,0,wxALIGN_CENTER_VERTICAL|wxSHAPED     , 0 );
-       sizerH4->Add( _positionZ                                                                ,1,wxGROW                                       , 0 );
-       sizerH4->Add( ckBoxZ                                                                    ,0,wxALIGN_CENTER_VERTICAL|wxSHAPED     , 0 );
-       sizerH4->Add( btnColorTable                                                             ,0,wxALIGN_CENTER_VERTICAL|wxSHAPED     , 0 );
+       //      sizerH7->Add( _ckBoxXYZ         , 1, wxALL|wxEXPAND, 0);
+       //      sizerH7->Add( _ckBoxPlane       , 1, wxALL|wxEXPAND, 0);
 
-       sizerH5->Add( _ckBoxXYZ                         ,  1, wxALL|wxEXPAND, 0);
-       sizerH5->Add( _ckBoxPlane                       ,  1, wxALL|wxEXPAND, 0);
-       sizerH5->Add( new wxStaticText(panel, -1,_T("      "))                  , 1, wxALL|wxEXPAND, 0);
-//     sizerH5->Add( ckBoxX                            ,  1, wxALL|wxEXPAND, 0);
-//     sizerH5->Add( ckBoxY                            ,  1, wxALL|wxEXPAND, 0);
-//     sizerH5->Add( ckBoxZ                            ,  1, wxALL|wxEXPAND, 0);
+       //      sizer->Add( sizerH4                     , 1, wxALL|wxEXPAND, 2);
+       //      sizer->Add( sizerH5                     , 1, wxALL|wxEXPAND, 2);
+       //      sizer->Add( sizerH6                     , 1, wxALL|wxEXPAND, 2);
+       //      sizer->Add( sizerH7                     , 1, wxALL|wxEXPAND, 2);
 
-       sizer->Add( sizerH4                                     ,  1, wxALL|wxGROW, 2);
-       sizer->Add( sizerH5                                     ,  1, wxALL|wxEXPAND, 2);
+               
+       //      sizerH5->Add( ckBoxX                            ,  1, wxALL|wxEXPAND, 0);
+       //      sizerH5->Add( ckBoxY                            ,  1, wxALL|wxEXPAND, 0);
+       //      sizerH5->Add( ckBoxZ                            ,  1, wxALL|wxEXPAND, 0);
 
+       sizer->Add( sizerH4,  1, wxALL|wxGROW,  2);
+       sizer->Add( sizerH5,  1, wxALL|wxEXPAND,2);
+       sizer->Add( sizerH6,  1, wxALL|wxEXPAND,2);
 
        panel->SetSize(400,50);
        panel->SetAutoLayout(true);
@@ -108,44 +180,43 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
        panel->Layout();
 
        panel->SetEventHandler((wxEvtHandler*)this);
-
+       
        //this->UpdateControlPanel();
-
 }
 void wxVtkMPR3DViewCntrlPanel::UpdateControlPanel()
 {
-
        vtkMPRBaseData* basedata = _wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetVtkMPRBaseData();
        if(basedata != NULL){
 
                /*int maxX = basedata->GetMaxPositionX();
                int maxY = basedata->GetMaxPositionY();
                int maxZ = basedata->GetMaxPositionZ();*/
+               vtkImageData* img = basedata->GetImageData();
                int x0,x1,y0,y1,z0,z1;
-
-               basedata->GetDimensionExtention(&x0,&x1,&y0,&y1,&z0,&z1);
                /*int maxX = x1-x0;//basedata->GetMaxPositionX();
                int maxY = y1-y0;//basedata->GetMaxPositionY();
                int maxZ = z1-z0;//basedata->GetMaxPositionZ();*/
 
-               
-
                //std::cout<<"wxVtkMPR3DViewCntrlPanel::UpdateControlPanel() maxX="<<maxX<<" maxY="<<maxY<<" maxZ="<<maxZ<<std::endl;
                /*_positionX->SetRange(0,maxX);
                _positionY->SetRange(0,maxY);
                _positionZ->SetRange(0,maxZ);*/
-               _positionX->SetRange(x0,x1);
-               _positionY->SetRange(y0,y1);
-               _positionZ->SetRange(z0,z1);
-
-               _positionX->SetValue((x0+x1)/2);
-               _positionY->SetValue((y0+y1)/2);
-               _positionZ->SetValue((z0+z1)/2);
-
-               _positionX->Update();
-               _positionY->Update();
-               _positionZ->Update();
-               this->Update();
+               if(img){
+                       img->GetExtent(x0,x1,y0,y1,z0,z1);
+                       _positionX->SetRange(x0,x1);
+                       _positionY->SetRange(y0,y1);
+                       _positionZ->SetRange(z0,z1);
+
+                       _positionX->SetValue((x0+x1)/2);
+                       _positionY->SetValue((y0+y1)/2);
+                       _positionZ->SetValue((z0+z1)/2);
+
+                       _positionX->Update();
+                       _positionY->Update();
+                       _positionZ->Update();
+                       this->Update();
+               }
+               
        }
        
 }
@@ -190,7 +261,7 @@ int wxVtkMPR3DViewCntrlPanel::GetIdTissue()
 //-------------------------------------------------------------------
 void wxVtkMPR3DViewCntrlPanel::OnEditColorTable(wxCommandEvent& event)
 {
-
+       
        vtkColorTransferFunction *ctfun                 = this->_wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetvtkColorTransferFunction(); 
        std::vector<double> *ctfunVectorPoint   = this->_wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetctFunVectorPoint();
        std::vector<double> *ctfunVectorRed             = this->_wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetctFunVectorRed();
@@ -207,7 +278,7 @@ void wxVtkMPR3DViewCntrlPanel::OnEditColorTable(wxCommandEvent& event)
        HistogramDialog* hDlg=new HistogramDialog(NULL,_T("Color table"),imagedata,2);
        
                
-       hDlg->erasePointsTransferenceFunction();        
+       hDlg->erasePointsTransferenceFunction();                
        int ctfSize=ctfunVectorRed->size();
        if(ctfSize>0)
        {
@@ -218,9 +289,10 @@ void wxVtkMPR3DViewCntrlPanel::OnEditColorTable(wxCommandEvent& event)
                                double gr       = (*ctfunVectorPoint)[i];
                                double r        = (*ctfunVectorRed)[i];
                                double g        = (*ctfunVectorGreen)[i];
-                               double b        = (*ctfunVectorBlue)[i];
-                       
-hDlg->addColorPoint(gr,(int)(r*255),(int)(g*255),(int)(b*255));
+                               double b        = (*ctfunVectorBlue)[i];                        
+
+                               hDlg->addColorPoint(gr,(int)(r*255),(int)(g*255),(int)(b*255));
+
                                i++;
                        }
        }
@@ -232,7 +304,7 @@ hDlg->addColorPoint(gr,(int)(r*255),(int)(g*255),(int)(b*255));
        //setting variables if the user wants to do refresh
        
        hDlg->setCTF(ctfun);
-       hDlg->setMPR3Dview(_wxvtkmpr3Dview);
+       //hDlg->setMPR3Dview(_wxvtkmpr3Dview);
        
        if(hDlg->ShowModal()== wxID_OK )
        {       
@@ -299,12 +371,43 @@ hDlg->addColorPoint(gr,(int)(r*255),(int)(g*255),(int)(b*255));
 }
 
 
+//-------------------------------------------------------------------
+void wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneX(wxCommandEvent& event)
+{
+       _wxvtkmpr3Dview->FreePlaneVisible( 1, event.IsChecked() );
+       _wxvtkmpr3Dview->FreePlaneInteraction( _ckFreePlaneInteraction->GetValue() );
+}
+
+//-------------------------------------------------------------------
+void wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneY(wxCommandEvent& event)
+{
+       _wxvtkmpr3Dview->FreePlaneVisible(  2, event.IsChecked() );
+       _wxvtkmpr3Dview->FreePlaneInteraction( _ckFreePlaneInteraction->GetValue() );
+}
+
+
+//-------------------------------------------------------------------
+void wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneZ(wxCommandEvent& event)
+{
+       _wxvtkmpr3Dview->FreePlaneVisible(  3, event.IsChecked() );
+       _wxvtkmpr3Dview->FreePlaneInteraction( _ckFreePlaneInteraction->GetValue() );
+}
+
+
+//-------------------------------------------------------------------
+void wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneInteraction(wxCommandEvent& event)
+{
+       _wxvtkmpr3Dview->FreePlaneInteraction(  event.IsChecked() );
+}
+
+
 //-------------------------------------------------------------------
 void wxVtkMPR3DViewCntrlPanel::OnVisibleAxisX(wxCommandEvent& event)
 {
+       
        _wxvtkmpr3Dview->VisibleImageActor(0, event.IsChecked() );
        _wxvtkmpr3Dview->Refresh();
-
+       
        wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
 
        try{
@@ -312,7 +415,6 @@ void wxVtkMPR3DViewCntrlPanel::OnVisibleAxisX(wxCommandEvent& event)
        }catch(char* e){
                std::cout<<e<<std::endl;
        }
-
 }
 //-------------------------------------------------------------------
 void wxVtkMPR3DViewCntrlPanel::OnVisibleAxisY(wxCommandEvent& event)
@@ -320,7 +422,7 @@ void wxVtkMPR3DViewCntrlPanel::OnVisibleAxisY(wxCommandEvent& event)
        _wxvtkmpr3Dview->VisibleImageActor(1, event.IsChecked() );
        _wxvtkmpr3Dview->Refresh();
 
-       wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+       wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
        _wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
 
 }
@@ -337,6 +439,7 @@ void wxVtkMPR3DViewCntrlPanel::OnVisibleAxisZ(wxCommandEvent& event)
 //-------------------------------------------------------------------
 void wxVtkMPR3DViewCntrlPanel::OnVisibleAxisXYZ(wxCommandEvent& event)
 {
+
        _wxvtkmpr3Dview->VisiblePointWidget(event.IsChecked());
 }
 
@@ -344,14 +447,15 @@ void wxVtkMPR3DViewCntrlPanel::OnVisibleAxisXYZ(wxCommandEvent& event)
 void wxVtkMPR3DViewCntrlPanel::OnVisiblePlane(wxCommandEvent& event)
 {
        _wxvtkmpr3Dview->VisiblePlaneWidget(event.IsChecked());
-}
 
+}
 
 //-------------------------------------------------------------------
 void wxVtkMPR3DViewCntrlPanel::OnPositionX(wxScrollEvent& event)
 {
        _wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetVtkMPRBaseData()->SetX( _positionX->GetValue() );
        _wxvtkmpr3Dview->RefreshView();
+
        wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
        _wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
 }
@@ -371,3 +475,84 @@ void wxVtkMPR3DViewCntrlPanel::OnPositionZ(wxScrollEvent& event)
        wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
        _wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
 }
+
+//-------------------------------------------------------------------
+bool wxVtkMPR3DViewCntrlPanel::GetVisibleX()
+{
+       return ckBoxX->GetValue();
+}
+
+//-------------------------------------------------------------------
+bool wxVtkMPR3DViewCntrlPanel::GetVisibleY()
+{
+       return ckBoxY->GetValue();
+}
+
+//-------------------------------------------------------------------
+bool wxVtkMPR3DViewCntrlPanel::GetVisibleZ()
+{
+       return ckBoxZ->GetValue();
+}
+
+//-------------------------------------------------------------------
+bool wxVtkMPR3DViewCntrlPanel::GetVisibleXYZ()
+{
+       return _ckBoxXYZ->GetValue();
+}
+
+//-------------------------------------------------------------------
+bool wxVtkMPR3DViewCntrlPanel::GetVisiblePlane()
+{
+       return _ckBoxPlane->GetValue();
+}
+
+//-------------------------------------------------------------------
+void wxVtkMPR3DViewCntrlPanel::SetVisibleX(bool value)
+{
+       ckBoxX->SetValue(value);
+       
+       _wxvtkmpr3Dview->VisibleImageActor(0, value );
+       _wxvtkmpr3Dview->Refresh();
+
+       wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
+       _wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+}
+
+//-------------------------------------------------------------------
+void wxVtkMPR3DViewCntrlPanel::SetVisibleY(bool value)
+{
+       ckBoxY->SetValue(value);
+       
+       _wxvtkmpr3Dview->VisibleImageActor(1, value );
+       _wxvtkmpr3Dview->Refresh();
+
+       wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
+       _wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+}
+
+//-------------------------------------------------------------------
+void wxVtkMPR3DViewCntrlPanel::SetVisibleZ(bool value)
+{
+       ckBoxZ->SetValue(value);
+
+       _wxvtkmpr3Dview->VisibleImageActor(2, value );
+       _wxvtkmpr3Dview->Refresh();
+
+       wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
+       _wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+}
+
+//-------------------------------------------------------------------
+void wxVtkMPR3DViewCntrlPanel::SetVisibleXYZ(bool value)
+{
+       _ckBoxXYZ->SetValue(value);
+       _wxvtkmpr3Dview->VisiblePointWidget(value);
+
+}
+
+//-------------------------------------------------------------------
+void wxVtkMPR3DViewCntrlPanel::SetVisiblePlane(bool value)
+{
+       _ckBoxPlane->SetValue(value);
+       _wxvtkmpr3Dview->VisiblePlaneWidget(value);
+}