#3458 3D white Background

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
index 9e791adf7c5274a8e570fef4abc9580f9d289fb5..97f4faddad7b6ed23a2900a44470d55bbdbf48b1 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
@@ -999,15 +999,20 @@ void wxVtkMPR3DView::SetBackGroundType(int type)
        if (_wxvtk3Dbaseview!=NULL)
        {
                if (type==0)
+               {
+                       _wxvtk3Dbaseview->GetRenderer()->GradientBackgroundOn();
+                       _wxvtk3Dbaseview->GetRenderer()->SetBackground( 0.33 , 0.33 , 0.33 );
+                       _wxvtk3Dbaseview->GetRenderer()->SetBackground2( 0.66 , 0.66 , 0.66 );
+               } // if type
+               else if (type==1)
                {
                        _wxvtk3Dbaseview->GetRenderer()->GradientBackgroundOff();
                        _wxvtk3Dbaseview->GetRenderer()->SetBackground( 0 , 0 , 0 );
                } // if type
-               if (type==1)
+               else if (type==2)
                {
-                       _wxvtk3Dbaseview->GetRenderer()->GradientBackgroundOn();
-                       _wxvtk3Dbaseview->GetRenderer()->SetBackground( 0.33 , 0.33 , 0.33 );
-                       _wxvtk3Dbaseview->GetRenderer()->SetBackground2( 0.66 , 0.66 , 0.66 );
+                       _wxvtk3Dbaseview->GetRenderer()->GradientBackgroundOff();
+                       _wxvtk3Dbaseview->GetRenderer()->SetBackground( 1 , 1 , 1 );
                } // if type
                _wxvtk3Dbaseview->Refresh();
        }// if _wxvtk3Dbaseview

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
index 9a62c86f3918565c4fe1c5511485989960d88135..1b42594a01beb9ceef32121178a16e898f38688f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
@@ -90,15 +90,28 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
        _ckBoxInterpolate->SetValue(true);
 
 
-       _ckBoxOutlineBox= new wxCheckBox(panel,-1,_T("Outline Box"));
+       _ckBoxOutlineBox        = new wxCheckBox(panel,-1,_T("Outline Box"));
        _ckBoxOutlineBox->SetValue(true);
-       _ckBoxOutlinePlane= new wxCheckBox(panel,-1,_T("Outline Plane"));
+       _ckBoxOutlinePlane      = new wxCheckBox(panel,-1,_T("Outline Plane"));
        _ckBoxOutlinePlane->SetValue(true);
-       _ckBoxBackGroundBlack= new wxCheckBox(panel,-1,_T("Background Black"));;
-       _ckBoxBackGroundBlack->SetValue(false);
+
+
        
-       _ckBoxBackGroundBlack= new wxCheckBox(panel,-1,_T("Background Black"));;
-       _ckBoxBackGroundBlack->SetValue(false);
+//     _ckBoxBackGroundBlack= new wxCheckBox(panel,-1,_T("Background Black"));;
+//     _ckBoxBackGroundBlack->SetValue(false);
+// EED Borrame 
+//     _ckBoxBackGroundBlack= new wxCheckBox(panel,-1,_T("Background Black"));;
+//     _ckBoxBackGroundBlack->SetValue(false);
+
+       wxPanel *panelH7 = new wxPanel(panel);
+
+       _rdBackGroundGradient   = new wxRadioButton( panelH7, -1, _T("Background Gradient"),wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+       _rdBackGroundBlack              = new wxRadioButton( panelH7, -1, _T("Background Black"),wxDefaultPosition, wxDefaultSize, 0);
+       _rdBackGroundWhite              = new wxRadioButton( panelH7, -1, _T("Background White"),wxDefaultPosition, wxDefaultSize, 0);
+
+       _rdBackGroundGradient->SetValue(false);
+       _rdBackGroundBlack->SetValue(false);
+       _rdBackGroundWhite->SetValue(false);
 
        _positionX->SetSize(400,20);
        _positionY->SetSize(400,20);
@@ -135,7 +148,14 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
        Connect(_cbStereo->GetId()                              , wxEVT_COMMAND_COMBOBOX_SELECTED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnSetStereo               );
        Connect(_ckBoxOutlineBox->GetId()                       , wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnOutlineBox                       );
        Connect(_ckBoxOutlinePlane->GetId()                     , wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnOutlinePlane                     );
-       Connect(_ckBoxBackGroundBlack->GetId()  , wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnBackGroundBlack  );
+
+// EED Borrame
+//     Connect(_ckBoxBackGroundBlack->GetId()  , wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnBackGroundBlack  );
+       Connect(_rdBackGroundGradient->GetId()  , wxEVT_COMMAND_RADIOBUTTON_SELECTED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnBackGroundBlack      );
+       Connect(_rdBackGroundBlack->GetId()     , wxEVT_COMMAND_RADIOBUTTON_SELECTED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnBackGroundBlack      );
+       Connect(_rdBackGroundWhite->GetId()     , wxEVT_COMMAND_RADIOBUTTON_SELECTED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnBackGroundBlack      );
+
+
        Connect(_ckBoxInterpolate->GetId()              , wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnInterpolate              );
        Connect(_ckBoxFixAxis2D->GetId()                , wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnFixAxis2D                );
        Connect(_opacityAxis->GetId()                   , wxEVT_COMMAND_SLIDER_UPDATED,   (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnOpacityAxis              );
@@ -151,6 +171,7 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
        wxFlexGridSizer *sizerH4a;
        wxFlexGridSizer *sizerH5;
        wxFlexGridSizer *sizerH6;
+       wxFlexGridSizer *sizerH7;
 
        if(align)
        {
@@ -206,7 +227,18 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
                sizerH6 = new wxFlexGridSizer(1);
                sizerH6->Add( _ckBoxOutlineBox                                                  , 1, wxALL|wxEXPAND                                             , 0);
                sizerH6->Add( _ckBoxOutlinePlane                                                , 1, wxALL|wxEXPAND                                             , 0);
-               sizerH6->Add( _ckBoxBackGroundBlack                                             , 1, wxALL|wxEXPAND                                             , 0);
+
+
+
+               sizerH7 = new wxFlexGridSizer(1);
+               panelH7->SetSizer(sizerH7);
+               sizerH7->Add( _rdBackGroundGradient                                             , 1, wxALL|wxEXPAND                                             , 0);
+               sizerH7->Add( _rdBackGroundBlack                                                , 1, wxALL|wxEXPAND                                             , 0);
+               sizerH7->Add( _rdBackGroundWhite                                                , 1, wxALL|wxEXPAND                                             , 0);
+
+
+               sizerH6->Add( new wxStaticText(panel, -1,_T(" "))               , 1, wxALL|wxEXPAND                                             , 0);
+               sizerH6->Add( panelH7                                                                   , 1, wxALL|wxEXPAND                                             , 0);
 
                sizer->Add( sizerH4,  1, wxALL|wxGROW,  2);
                sizer->Add( sizerH5,  1, wxALL|wxEXPAND,2);
@@ -283,6 +315,10 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
        //      sizerH5->Add( ckBoxZ                            ,  1, wxALL|wxEXPAND, 0);
 
 
+               panelH7->SetAutoLayout(true);
+               panelH7->Layout();
+
+
        panel->ClearBackground();
 //     panel->SetSize(400,50);
        sizer->FitInside(panel);
@@ -764,12 +800,22 @@ void wxVtkMPR3DViewCntrlPanel::OnOutlinePlane(wxCommandEvent& event)
 //-------------------------------------------------------------------
 void wxVtkMPR3DViewCntrlPanel::OnBackGroundBlack(wxCommandEvent& event)
 {
-       if (_ckBoxBackGroundBlack->GetValue()==true)
-       {
+//EED Borrame
+//     if (_ckBoxBackGroundBlack->GetValue()==true)
+//     {
+//             _wxvtkmpr3Dview->SetBackGroundType(0);
+//     } else {
+//             _wxvtkmpr3Dview->SetBackGroundType(1);
+//     }
+       
+       if (_rdBackGroundGradient->GetValue()==true) {
                _wxvtkmpr3Dview->SetBackGroundType(0);
-       } else {
+       } else if (_rdBackGroundBlack->GetValue()==true) {
                _wxvtkmpr3Dview->SetBackGroundType(1);
+       } else if (_rdBackGroundWhite->GetValue()==true) {
+               _wxvtkmpr3Dview->SetBackGroundType(2);
        }
+       
 }
 
 //-------------------------------------------------------------------

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.h
index 58545d2493a475b8b5a48efc950f46e39f2a9b24..d5025bfb22aeca2b64c33d8c14d5a71d4f807add 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.h
@@ -114,7 +114,13 @@ private:
 
        wxCheckBox              *_ckBoxOutlineBox;
        wxCheckBox              *_ckBoxOutlinePlane;
-       wxCheckBox              *_ckBoxBackGroundBlack;
+       
+// EED Borrame
+//     wxCheckBox              *_ckBoxBackGroundBlack;
+       wxRadioButton   *_rdBackGroundBlack;
+       wxRadioButton   *_rdBackGroundWhite;
+       wxRadioButton   *_rdBackGroundGradient;
+       
        wxCheckBox              *_ckBoxInterpolate;
 
 protected: