Divides in two panels the Surface/Volume tab. It was changed only the class "maracasV...

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx
index 75a549b7997e0d648001454c48d4fef0313065d1..44753e2039bf269ee6c52f478003023e9f67aa3f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx
@@ -23,9 +23,13 @@ wxVtkClipping3DViewCntrlPanel::wxVtkClipping3DViewCntrlPanel(wxWindow *parent, w
                                        _surfC                  = new wxRadioButton(panel,-1,_T("C"));
                                        _surfD                  = new wxRadioButton(panel,-1,_T("D"));
 
-       wxCheckBox              *ckVolum                = new wxCheckBox(panel,-1,_T("Vol"));
+
+       //RaC 03-2010 Divides in two panels thje last tab Surface/Volume        
+       //wxCheckBox            *ckVolum                = new wxCheckBox(panel,-1,_T("Vol"));
        wxCheckBox              *ckBoxSurface   = new wxCheckBox(panel,-1,_T("Surface Box"));
-       wxCheckBox              *ckBoxVolume    = new wxCheckBox(panel,-1,_T("Volume Box"));
+       
+       //RaC 03-2010 Divides in two panels thje last tab Surface/Volume        
+       //wxCheckBox            *ckBoxVolume    = new wxCheckBox(panel,-1,_T("Volume Box"));
 
                                        _color                  = new wxButton(panel,-1,_T(""));
                                        _visible                = new wxCheckBox(panel,-1,_T("Vis"));
@@ -56,12 +60,15 @@ wxVtkClipping3DViewCntrlPanel::wxVtkClipping3DViewCntrlPanel(wxWindow *parent, w
        wxButton *btnSTL                                = new wxButton(panel,-1,_T("Create STL File"));
        wxButton *btnSaveRaw                    = new wxButton(panel,-1,_T("Save Raw Volume"));
 
-       wxButton *btnVolumeFunctions    = new wxButton(panel,-1,_T("Read Volume Functions"));
+       //RaC 03-2010 Divides in two panels thje last tab Surface/Volume        
+       //wxButton *btnVolumeFunctions  = new wxButton(panel,-1,_T("Read Volume Functions"));
 
 
        Connect(btnSTL->GetId()                         , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnBtnCreateFileSTL    ); 
        Connect(btnSaveRaw->GetId()                     , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnBtnSaveRawVolume    ); 
-       Connect(btnVolumeFunctions->GetId()     , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnBtnVolumeFunctions  ); 
+       
+       //RaC 03-2010 Divides in two panels thje last tab Surface/Volume        
+       //Connect(btnVolumeFunctions->GetId()   , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnBtnVolumeFunctions  ); 
 
 
        wxButton *btnMeshVTKLoad        = new wxButton(panel,-1,_T("Load Mesh"));
@@ -82,7 +89,11 @@ wxVtkClipping3DViewCntrlPanel::wxVtkClipping3DViewCntrlPanel(wxWindow *parent, w
 
 //     ckVolum->Enable(false);
        ckBoxSurface->SetValue(false);
-       ckBoxVolume->SetValue(false);
+       
+       
+       //ckBoxVolume->SetValue(false);
+
+
        _color->SetSize(40,20);
        _opacity->SetSize(370,20);
 //     ckBoxX->SetValue(true);
@@ -96,8 +107,9 @@ wxVtkClipping3DViewCntrlPanel::wxVtkClipping3DViewCntrlPanel(wxWindow *parent, w
 //     _positionY->SetSize(400,20);
 //     _positionZ->SetSize(400,20);
 
-       Connect(ckVolum->GetId()                , wxEVT_COMMAND_CHECKBOX_CLICKED          , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnVisibleVolume                             );
-       Connect(ckBoxVolume->GetId()    , wxEVT_COMMAND_CHECKBOX_CLICKED          , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnVisibleBoxVolume                  );
+       //RaC 03-2010 Divides in two panels thje last tab Surface/Volume        
+       //Connect(ckVolum->GetId()              , wxEVT_COMMAND_CHECKBOX_CLICKED          , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnVisibleVolume                             );
+       //Connect(ckBoxVolume->GetId()  , wxEVT_COMMAND_CHECKBOX_CLICKED          , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnVisibleBoxVolume                  );
 
        Connect(_surfA->GetId()                 , wxEVT_COMMAND_RADIOBUTTON_SELECTED  , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnSurface                                       );
        Connect(_surfB->GetId()                 , wxEVT_COMMAND_RADIOBUTTON_SELECTED  , (wxObjectEventFunction) &wxVtkClipping3DViewCntrlPanel::OnSurface                                       );
@@ -134,12 +146,13 @@ wxVtkClipping3DViewCntrlPanel::wxVtkClipping3DViewCntrlPanel(wxWindow *parent, w
        //wxFlexGridSizer *sizerH5 = new wxFlexGridSizer(10); // JPRx
        //wxFlexGridSizer *sizerH6 = new wxFlexGridSizer(10); // JPRx
 
-       sizerH0->Add( ckVolum                                                                   , 1, wxALL|wxEXPAND, 0);
-       sizerH0->Add( new wxStaticText(panel, -1,_T("          "))      , 1, wxALL|wxEXPAND, 0);
-       sizerH0->Add( ckBoxVolume                                                               , 1, wxALL|wxEXPAND, 0);
-       sizerH0->Add( new wxStaticText(panel, -1,_T("          "))      , 1, wxALL|wxEXPAND, 0);
-       sizerH0->Add( btnVolumeFunctions                                                , 1, wxALL|wxEXPAND, 0);
-       sizerH0->Add( new wxStaticText(panel, -1,_T("          "))      , 1, wxALL|wxEXPAND, 0);
+       //RaC 03-2010 Divides in two panels thje last tab Surface/Volume        
+       //sizerH0->Add( ckVolum                                                                 , 1, wxALL|wxEXPAND, 0);
+       //sizerH0->Add( new wxStaticText(panel, -1,_T("          "))    , 1, wxALL|wxEXPAND, 0);
+       //sizerH0->Add( ckBoxVolume                                                             , 1, wxALL|wxEXPAND, 0);
+       //sizerH0->Add( new wxStaticText(panel, -1,_T("          "))    , 1, wxALL|wxEXPAND, 0);
+       //sizerH0->Add( btnVolumeFunctions                                              , 1, wxALL|wxEXPAND, 0);
+       //sizerH0->Add( new wxStaticText(panel, -1,_T("          "))    , 1, wxALL|wxEXPAND, 0);
        sizerH0->Add( btnMeshVTKLoad                                                    , 1, wxALL|wxEXPAND, 0);