*** empty log message ***

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMaracasRenderTabbedPanel.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index 0889c620d6cf25bffe46d5c32cf6bb588f43e5f6..703af86cc4296eba79ba772ae11182a53ecfbefa 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -14,10 +14,13 @@
 #include <OpenImage.xpm>
 
 #include "Color.xpm"
-#include "creaSystem.h"
-
+//#include "creaSystem.h"
 
 
+       BEGIN_EVENT_TABLE( wxMaracasRenderTabbedPanel, wxPanel )
+               EVT_MENU( 12121, wxMaracasRenderTabbedPanel::OnRefreshView )
+               //EVT_MENU( 12122, wxMaracasRenderTabbedPanel::OnDClickLeft  )
+       END_EVENT_TABLE( );
 
 /**
 ** Class constructor
@@ -343,6 +346,8 @@ void wxMaracasRenderTabbedPanel::addMPROptions()
                mwxvtkmpr3Dview         ->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer);            
                mwxvtkmpr3Dview         ->Configure();
                mwxvtkmpr3Dview         ->ResetCamera(ext,org,spc);
+               vtkInteractorStyleBaseView* vtkInteractorBV = (vtkInteractorStyleBaseView*)mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetInteractorStyleBaseView();
+               vtkInteractorBV->AddParentToReport(this);
        }
 
        int id = 4;
@@ -726,8 +731,6 @@ void wxMaracasRenderTabbedPanel::onMPROptions(wxCommandEvent& event)
                
                mwxvtkmpr3Dview->Refresh();
 
-               wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
-               mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
 
        }
        else
@@ -747,6 +750,15 @@ void wxMaracasRenderTabbedPanel::onMPROptions(wxCommandEvent& event)
        }
 }
 
+void wxMaracasRenderTabbedPanel::OnRefreshView(wxCommandEvent & event) 
+{
+       printf("CPR wxMaracasRenderTabbedPanel::OnRefreshView \n");
+       mwxvtkmpr3Dview->RefreshView();
+
+       wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+       mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+}
+
 /**
 ** 
 **/
@@ -776,15 +788,15 @@ void wxMaracasRenderTabbedPanel::onOpenCutter(wxCommandEvent& event)
        type.push_back(0);
        
        wxMaracasDialog_NViewers* dialog1 = new wxMaracasDialog_NViewers(this, img, &type, wxString(_T("Cut Module") ));
-       dialog1->SetSize(800, 700);
+       //dialog1->SetSize(800, 700);
        
-       std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
+       /**std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
        cutter = CutModelMainPanel::getInstance(dialog1->getinternalPanel(), path);
        cutter->setRenderer( dialog1->getViewer()->GetwxVtkBaseView(1)->GetRenderer() );
        cutter->setInteractor( dialog1->getViewer()->GetwxVtkBaseView(1)->GetWxVTKRenderWindowInteractor() );
        cutter->setImageData(getVolImage());
-       
-       dialog1->AddPanel(cutter);
+       **/
+       //dialog1->AddPanel(cutter);
        dialog1->Show();
 }