*** empty log message ***

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index 703af86cc4296eba79ba772ae11182a53ecfbefa..bf11360898cafb2f3530104b9f7e9665bb8a2950 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -47,6 +47,7 @@ wxMaracasRenderTabbedPanel::~wxMaracasRenderTabbedPanel()
        //wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSA(_propid, false);
        //wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSB(_propid, false);
        //wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSC(_propid, false);
+       addRemoveActorMPR(false);
        if( vtkmpr3Ddataviewer  )       { delete vtkmpr3Ddataviewer;    }
        if( mwxvtkmpr3Dview             )       { delete mwxvtkmpr3Dview;               }
 
@@ -446,7 +447,49 @@ void wxMaracasRenderTabbedPanel::addRemoveActorSC(int id, bool addremove)
                diag->ShowModal();
                delete diag;
        }
-}      
+}
+
+void wxMaracasRenderTabbedPanel::addRemoveActorMPR(bool addremove)
+{
+       int id = 4;
+       wxtabs->SetSelection(id);
+       if(addremove)
+       {
+               wxtabs->GetPage(id)->Enable();
+
+               bool valueX = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleX();
+               bool valueY = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleY();
+               bool valueZ = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleZ();
+               bool valueXYZ = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleXYZ();
+               bool valuePlane = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisiblePlane();
+
+               mwxvtkmpr3Dview->VisibleImageActor( 0, valueX );
+               mwxvtkmpr3Dview->VisibleImageActor( 1, valueY );
+               mwxvtkmpr3Dview->VisibleImageActor( 2, valueZ );
+               mwxvtkmpr3Dview->VisiblePointWidget(valueXYZ);
+               mwxvtkmpr3Dview->VisiblePlaneWidget(valuePlane);
+               mwxvtkmpr3Dview->showOutlineActor(true);
+               
+               mwxvtkmpr3Dview->Refresh();
+
+
+       }
+       else
+       {
+               wxtabs->GetPage(id)->Disable();
+
+               mwxvtkmpr3Dview->VisiblePointWidget(false);
+               mwxvtkmpr3Dview->VisiblePlaneWidget(false);
+               mwxvtkmpr3Dview->VisibleImageActor(0, false );
+               mwxvtkmpr3Dview->VisibleImageActor(1, false );
+               mwxvtkmpr3Dview->VisibleImageActor(2, false );
+               mwxvtkmpr3Dview->showOutlineActor(false);
+               mwxvtkmpr3Dview->Refresh();
+
+               wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+               mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+       }
+}
 
 
 /**
@@ -710,10 +753,13 @@ void wxMaracasRenderTabbedPanel::onCheckBoxSCChange(wxCommandEvent& event)
 **/
 void wxMaracasRenderTabbedPanel::onMPROptions(wxCommandEvent& event)
 {
+       addRemoveActorMPR(checkboxViewer->IsChecked());
+       /*
        int id = 4;
        wxtabs->SetSelection(id);
        if(checkboxViewer->IsChecked())
        {
+               
                wxtabs->GetPage(id)->Enable();
 
                bool valueX = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleX();
@@ -747,7 +793,7 @@ void wxMaracasRenderTabbedPanel::onMPROptions(wxCommandEvent& event)
 
                wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
                mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
-       }
+       }*/
 }
 
 void wxMaracasRenderTabbedPanel::OnRefreshView(wxCommandEvent & event) 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
index 6552e6876a9ccb9a19927a020d01dd1e795492ae..cad417a955643f822a3b3c0e65ed038578718dad 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
@@ -30,6 +30,7 @@ public:
        void addRemoveActorSA(int id, bool addremove);
        void addRemoveActorSB(int id, bool addremove);
        void addRemoveActorSC(int id, bool addremove);
+       void addRemoveActorMPR(bool addremove);
        void addMPROptions();
 
        // ----- Volume rendering functions ----- //