X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasDialog_NViewers.cpp;h=33175063dc4a2e3ef8e2affcd0560c7a67e744fc;hb=01623c2f1bfd464bb9a8e8c86d36f7bfc6314427;hp=270fbbdfc47ef8bab122d2a678a22150760dcbd1;hpb=241ec043d82df169705445f317b332207fd1b6b2;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.cpp
index 270fbbd..3317506 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.cpp
@@ -1,7 +1,8 @@
 #include "wxMaracasDialog_NViewers.h"
 //#include <wx/frame.h> 
 #include <wx/sizer.h> 
-
+#include <wx/splitter.h>
+#include "creaSystem.h"
 
 BEGIN_EVENT_TABLE( wxMaracasDialog_NViewers, wxFrame )
 	EVT_MENU( 12121, wxMaracasDialog_NViewers::OnRefreshView )
@@ -12,17 +13,23 @@ END_EVENT_TABLE( );
 ** Class constructor
 **/
 wxMaracasDialog_NViewers::wxMaracasDialog_NViewers(wxWindow* parent, vtkImageData* img, std::vector<int>* type, wxString title)
-: wxFrame(parent, -1, title)
+//: wxFrame(parent, -1, title)
+: wxFrame(NULL, -1, title, wxDefaultPosition,wxSize(700,700))
 {
-	panelcut = new wxPanel(this, -1);
-	panelcut->SetSize(800, 700);
-	viewer = new wxMaracas_N_ViewersWidget(panelcut, img, type);
-	sizer = new wxFlexGridSizer(2, 1);
 
-	sizer->Add(viewer, wxGROW, 1);
-	panelcut->SetSizer( sizer, true );		
-	panelcut->SetAutoLayout( true );
-	//viewer->SetSize(wxSizer(wxALL|wxEXPAND));
+	wxSplitterWindow *splitpanel = new wxSplitterWindow(this, -1);
+	splitpanel->SetMinimumPaneSize(5);
+
+	viewer = new wxMaracas_N_ViewersWidget(splitpanel, img, type);
+
+	std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
+	cutter = CutModelMainPanel::getInstance(splitpanel, path);
+	cutter->setRenderer( viewer->GetwxVtkBaseView(1)->GetRenderer() );
+	cutter->setInteractor( viewer->GetwxVtkBaseView(1)->GetWxVTKRenderWindowInteractor() );
+	cutter->setImageData(img);
+	
+	splitpanel->SplitVertically( cutter, viewer, 50);
+
 }
 
 /**
@@ -31,19 +38,6 @@ wxMaracasDialog_NViewers::wxMaracasDialog_NViewers(wxWindow* parent, vtkImageDat
 wxMaracasDialog_NViewers::~wxMaracasDialog_NViewers(){	
 }
 
-/**
-** Adds a new panel to the frame
-**/
-void wxMaracasDialog_NViewers::AddPanel(wxWindow* panel)
-{
-	//wxFlexGridSizer* sizer = new wxFlexGridSizer(1);
-
-	panel->SetSize(400, 200);
-
-	sizer->Add(panel, wxGROW);
-	panelcut->SetSizer( sizer, true );		
-	panelcut->SetAutoLayout( true );
-}
 
 /**
 **
@@ -72,12 +66,4 @@ void wxMaracasDialog_NViewers::OnDClickLeft(wxCommandEvent & event)
 wxMaracas_N_ViewersWidget* wxMaracasDialog_NViewers::getViewer()
 {
 	return viewer;
-}
-
-/**
-**
-**/
-wxPanel* wxMaracasDialog_NViewers::getinternalPanel()
-{
-	return panelcut;
 }
\ No newline at end of file