X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasDialog_NViewers.cpp;h=867b425cec953d61ef826b2a8d5c507c25a89ee0;hb=4dcdcabb81ce9f9e9b7ccdb86a64995d7b18ea23;hp=586cedcdf6042bb0f162f50a8f5fd97fa2b7cea5;hpb=d2fc2645728a4aea4f0aa0febfa1d7a894ab3ff1;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 586cedc..867b425 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.cpp
@@ -1,7 +1,33 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #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,15 +38,24 @@ 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))
 {
-	viewer = new wxMaracas_N_ViewersWidget(this, img, type);
-	wxFlexGridSizer* sizer = new wxFlexGridSizer(1);
+	wxSplitterWindow *splitpanel = new wxSplitterWindow(this, -1);
+	splitpanel->SetMinimumPaneSize(5);
+	//RaC Nov2012 Correctly resize internal panels with the window resize event
+	splitpanel->SetSashGravity(0.5);
 
-	sizer->Add(viewer, 1, wxGROW);
-	this->SetSizer( sizer, true );		
-	this->SetAutoLayout( true );
-	//viewer->SetSize(wxSizer(wxFIXED_MINSIZE));
+	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,18 +65,8 @@ wxMaracasDialog_NViewers::~wxMaracasDialog_NViewers(){
 }
 
 /**
-** Adds a new panel to the frame
+**
 **/
-void wxMaracasDialog_NViewers::AddPanel(wxPanel panel)
-{
-	wxFlexGridSizer* sizer = new wxFlexGridSizer(1);
-
-	//this->AddChild(panel);
-	//sizer->Add(panel, wxFIXED_MINSIZE);
-	this->SetSizer( sizer, true );		
-	this->SetAutoLayout( true );
-}
-
 void wxMaracasDialog_NViewers::OnRefreshView(wxCommandEvent & event)
 {
 	point.clear();
@@ -52,7 +77,18 @@ void wxMaracasDialog_NViewers::OnRefreshView(wxCommandEvent & event)
 	viewer->OnRefreshView(event);
 }
 
+/**
+**
+**/
 void wxMaracasDialog_NViewers::OnDClickLeft(wxCommandEvent & event)
 {
 	viewer->OnDClickLeft(event);
-}
\ No newline at end of file
+}
+
+/**
+**
+**/
+wxMaracas_N_ViewersWidget* wxMaracasDialog_NViewers::getViewer()
+{
+	return viewer;
+}