*** 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 80eb7e54a1aedd06abdbb6ea08b32833ab45f7f9..703af86cc4296eba79ba772ae11182a53ecfbefa 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -1,21 +1,26 @@
 #include "wxMaracasRenderTabbedPanel.h"
-#include "HistogramDialogComboBox.h"
 
+#include "HistogramDialogComboBox.h"
 #include "wxMaracasMultipleVolumeRendererPanel.h"
 #include "wxMaracasSurfaceRenderingPanel.h"
 #include "wxMaracasSurfaceRenderingProp3DMHD.h"
 #include "wxMaracasMultipleVolumeRendererManagerData.h"
 #include "wxMaracasDialog_NViewers.h"
+#include "wxVtkMPR3DViewCntrlPanel.h"
 
 #include <wx/colordlg.h>
 #include <wx/button.h> 
-
+#include <vtkProp3D.h>
 #include <OpenImage.xpm>
+
 #include "Color.xpm"
-#include "creaSystem.h"
+//#include "creaSystem.h"
 
-#include <vtkProp3D.h>
-#include "wxVtkMPR3DViewCntrlPanel.h"
+
+       BEGIN_EVENT_TABLE( wxMaracasRenderTabbedPanel, wxPanel )
+               EVT_MENU( 12121, wxMaracasRenderTabbedPanel::OnRefreshView )
+               //EVT_MENU( 12122, wxMaracasRenderTabbedPanel::OnDClickLeft  )
+       END_EVENT_TABLE( );
 
 /**
 ** Class constructor
@@ -259,23 +264,7 @@ void wxMaracasRenderTabbedPanel::addSurface3(vtkImageData* img, std::string data
 **/
 void wxMaracasRenderTabbedPanel::addMPROptions()
 {
-       int x = 0,y = 0,z = 0;
-       int ext[6];
-       ext[0] = 0;
-       ext[1] = 0;
-       ext[2] = 0;
-       ext[3] = 0;
-       ext[4] = 0;
-       ext[5] = 0;
-
-       double org[3],spc[3];
-       org[0] = 0;
-       org[1] = 0;
-       org[2] = 0;
-       spc[0] = 0;
-       spc[1] = 0;
-       spc[2] = 0;
-
+       //Panel Construction
        vtkMPRBaseData* mvtkmprbasedata = new vtkMPRBaseData(); 
        marImageData*   marimagedata    = new marImageData( getVolImage() );                    
        mvtkmprbasedata                                 ->SetMarImageData(marimagedata);
@@ -295,6 +284,24 @@ void wxMaracasRenderTabbedPanel::addMPROptions()
        panelControl->SetSize(400,350);
        panelControl->Layout();
 
+       //Configure MPR
+       int x = 0,y = 0,z = 0;
+       int ext[6];
+       ext[0] = 0;
+       ext[1] = 0;
+       ext[2] = 0;
+       ext[3] = 0;
+       ext[4] = 0;
+       ext[5] = 0;
+
+       double org[3],spc[3];
+       org[0] = 0;
+       org[1] = 0;
+       org[2] = 0;
+       spc[0] = 0;
+       spc[1] = 0;
+       spc[2] = 0;
+
        if (mvtkmprbasedata!=NULL)
        {
                mvtkmprbasedata->Configure();
@@ -325,7 +332,9 @@ void wxMaracasRenderTabbedPanel::addMPROptions()
        }
 
        if (baseView!=NULL)     
+       {
                baseView                        ->Configure();  
+       }
 
        if (vtkmpr3Ddataviewer  !=NULL) 
        {
@@ -337,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;
@@ -461,7 +472,6 @@ void wxMaracasRenderTabbedPanel::SetValuesPointsFunction(int volid, std::vector<
                diag->ShowModal();
                delete diag;
        }
-       
 }
 
 /**
@@ -721,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
@@ -742,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);
+}
+
 /**
 ** 
 **/
@@ -766,20 +783,20 @@ void wxMaracasRenderTabbedPanel::onOpenCutter(wxCommandEvent& event)
        vtkImageData* img = getVolImage();      
        std::vector<int> type;
        type.push_back(5);
-       type.push_back(0);
        type.push_back(1);
-       type.push_back(3);
+       type.push_back(2);
+       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");
-       cutter = CutModel2MainPanel::getInstance(dialog1->getinternalPanel(), path);
+       /**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();
 }