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=b2ac7f59e78e33f8e11065cffa2f2072aa9a9ee5;hp=d509c61b8384f115e9975ac1db1db5dfc4250475;hpb=2a69bae264c4dc43a7189f16b53a66dcd3a774dc;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 d509c61..867b425 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.cpp @@ -1,3 +1,28 @@ +/*# --------------------------------------------------------------------- +# +# 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 #include @@ -16,20 +41,21 @@ wxMaracasDialog_NViewers::wxMaracasDialog_NViewers(wxWindow* parent, vtkImageDat //: wxFrame(parent, -1, title) : wxFrame(NULL, -1, title, wxDefaultPosition,wxSize(700,700)) { - wxSplitterWindow *splitpanel = new wxSplitterWindow(this, -1); splitpanel->SetMinimumPaneSize(5); + //RaC Nov2012 Correctly resize internal panels with the window resize event + splitpanel->SetSashGravity(0.5); viewer = new wxMaracas_N_ViewersWidget(splitpanel, img, type); - - std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll"); +// 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); - } /** @@ -38,7 +64,6 @@ wxMaracasDialog_NViewers::wxMaracasDialog_NViewers(wxWindow* parent, vtkImageDat wxMaracasDialog_NViewers::~wxMaracasDialog_NViewers(){ } - /** ** **/