*** 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..0889c620d6cf25bffe46d5c32cf6bb588f43e5f6 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -1,21 +1,23 @@
 #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 <vtkProp3D.h>
-#include "wxVtkMPR3DViewCntrlPanel.h"
+
+
 
 /**
 ** Class constructor
@@ -259,23 +261,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 +281,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 +329,9 @@ void wxMaracasRenderTabbedPanel::addMPROptions()
        }
 
        if (baseView!=NULL)     
+       {
                baseView                        ->Configure();  
+       }
 
        if (vtkmpr3Ddataviewer  !=NULL) 
        {
@@ -461,7 +467,6 @@ void wxMaracasRenderTabbedPanel::SetValuesPointsFunction(int volid, std::vector<
                diag->ShowModal();
                delete diag;
        }
-       
 }
 
 /**
@@ -766,15 +771,15 @@ 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);
        
        std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
-       cutter = CutModel2MainPanel::getInstance(dialog1->getinternalPanel(), path);
+       cutter = CutModelMainPanel::getInstance(dialog1->getinternalPanel(), path);
        cutter->setRenderer( dialog1->getViewer()->GetwxVtkBaseView(1)->GetRenderer() );
        cutter->setInteractor( dialog1->getViewer()->GetwxVtkBaseView(1)->GetWxVTKRenderWindowInteractor() );
        cutter->setImageData(getVolImage());