X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasDialog_NViewers.cpp;h=2e58be96c9cfb67c6053e80ec76f5a5b32639054;hb=8138ced89fa9f1cc6933ff739dfa28b1e3c3883b;hp=086d31c64ede849e3033f37dce56c236f3db5914;hpb=d7d3ec17199e6b725bd375fdfe1085eeb35b34cc;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 086d31c..2e58be9 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,16 +13,22 @@ 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);
-	viewer = new wxMaracas_N_ViewersWidget(panelcut, img, type);
-	sizer = new wxFlexGridSizer(2);
+	wxSplitterWindow *splitpanel = new wxSplitterWindow(this, -1);
+	splitpanel->SetMinimumPaneSize(5);
 
-	sizer->Add(viewer, wxALL|wxEXPAND, 1);
-	panelcut->SetSizer( sizer, true );		
-	panelcut->SetAutoLayout( true );
-	//viewer->SetSize(wxSizer(wxALL|wxEXPAND));
+	viewer = new wxMaracas_N_ViewersWidget(splitpanel, img, type);
+//	std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll"); // JPR
+        std::string dllLastName("bbcreaMaracasVisu.dll");	
+	std::string path = crea::System::GetDllAppPath(dllLastName);
+	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);
 }
 
 /**
@@ -30,20 +37,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, wxALL|wxEXPAND);
-	panelcut->SetSizer( sizer, true );		
-	panelcut->SetAutoLayout( true );
-}
-
 /**
 **
 **/
@@ -72,11 +65,3 @@ wxMaracas_N_ViewersWidget* wxMaracasDialog_NViewers::getViewer()
 {
 	return viewer;
 }
-
-/**
-**
-**/
-wxPanel* wxMaracasDialog_NViewers::getinternalPanel()
-{
-	return panelcut;
-}
\ No newline at end of file