no message

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
index 82e0c06e4ee3e1419b2164cb037fadf970482678..11fb1977d857f61982ccb0ce426d7fa9fd0fbb9a 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
@@ -29,20 +29,20 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
        */
 
        ckBoxX                  = new wxCheckBox(panel,-1,_T("X           "));
-       _positionX              = new wxSlider(panel,-1,maxX/2,0,maxX, wxDefaultPosition, wxSize(150,40), wxSL_HORIZONTAL | wxSL_LABELS);
+       _positionX              = new wxSlider(panel,-1,maxX/2,0,maxX, wxDefaultPosition, wxSize(300,40), wxSL_HORIZONTAL | wxSL_LABELS);
        ckBoxY                  = new wxCheckBox(panel,-1,_T("Y           "));
-       _positionY              = new wxSlider(panel,-1,maxY/2,0,maxY, wxDefaultPosition, wxSize(150,40), wxSL_HORIZONTAL | wxSL_LABELS);
+       _positionY              = new wxSlider(panel,-1,maxY/2,0,maxY, wxDefaultPosition, wxSize(300,40), wxSL_HORIZONTAL | wxSL_LABELS);
        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") );
+       _positionZ              = new wxSlider(panel,-1,maxZ/2,0,maxZ, wxDefaultPosition, wxSize(300,40), wxSL_HORIZONTAL | wxSL_LABELS);
+       wxButton                *btnColorTable  = new wxButton (panel, -1, _T("Color Table") );
 
        _ckBoxXYZ               = new wxCheckBox(panel,-1,_T("XYZ                  "));
        _ckBoxPlane             = new wxCheckBox(panel,-1,_T("Plane"));
 
-       _ckFreePlaneX= new wxCheckBox(panel,-1,_T("Free plane X                  "));;
-       _ckFreePlaneY= new wxCheckBox(panel,-1,_T("Free plane Y                  "));;
-       _ckFreePlaneZ= new wxCheckBox(panel,-1,_T("Free plane Z                  "));;
-       _ckFreePlaneInteraction= new wxCheckBox(panel,-1,_T("Free pnale interaction                  "));;
+       _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
@@ -89,7 +89,7 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
        wxFlexGridSizer *sizerH6;
        if(align)
        {
-               sizer    = new wxFlexGridSizer(2);
+               sizer    = new wxFlexGridSizer(3);
 
                sizerH4 = new wxFlexGridSizer(2);
                sizerH4->Add( _positionX                        ,1,wxGROW                                                       , 0 );
@@ -108,9 +108,13 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
                sizerH5->Add( btnColorTable                                                             , 0,wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 );
                //sizerH5->Add( new wxStaticText(panel, -1,_T("      "))                        , 1, wxALL|wxEXPAND, 0);
                
-       }
-       else
-       {
+               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);
@@ -128,18 +132,19 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
                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);
        }
+
+       
        
-       sizerH6 = new wxFlexGridSizer(10);
-       sizerH6->Add( new wxStaticText(panel, -1,_T("      "))  , 1, wxALL|wxEXPAND                     , 0);
-       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);
        
        //EED 28 sep 2006
        //      wxFlexGridSizer *sizerH6 = new wxFlexGridSizer(10);
@@ -375,12 +380,14 @@ void wxVtkMPR3DViewCntrlPanel::OnEditColorTable(wxCommandEvent& event)
 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() );
 }
 
 
@@ -388,6 +395,7 @@ void wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneY(wxCommandEvent& event)
 void wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneZ(wxCommandEvent& event)
 {
        _wxvtkmpr3Dview->FreePlaneVisible(  3, event.IsChecked() );
+       _wxvtkmpr3Dview->FreePlaneInteraction( _ckFreePlaneInteraction->GetValue() );
 }