X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasSuperpositionPanel.cxx;h=83fd3f94b9f4b99f905d46b93a7aee5250fb51bd;hb=b2ac7f59e78e33f8e11065cffa2f2072aa9a9ee5;hp=803eaa5b90a03df9f72ef3fcc3c16607f0fdeb7e;hpb=4db65eb4d687cf3695582df7098db27b0d24ab97;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSuperpositionPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSuperpositionPanel.cxx index 803eaa5..83fd3f9 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSuperpositionPanel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSuperpositionPanel.cxx @@ -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. +# ------------------------------------------------------------------------ */ + //---------------------------------------------------------------------------------------------------------------- // Class definition include @@ -12,10 +37,11 @@ // Constructors & Destructors //------------------------------------------------------------------------------------------------------------ - wxMaracasSuperpositionPanel :: wxMaracasSuperpositionPanel ( std::vector imgs, wxWindow *parent, const wxPoint& pos, const wxSize& size,long style, int vertStart, int vertEnd, int horzStart, int horzEnd ) + wxMaracasSuperpositionPanel :: wxMaracasSuperpositionPanel ( std::vector imgs, int type, wxWindow *parent, const wxPoint& pos, const wxSize& size,long style, int vertStart, int vertEnd, int horzStart, int horzEnd ) :wxPanel(parent, -1, pos, size, style) { _images = imgs; + _type = type; int gapH = 20; int gapV = 10; createSuperpositionPanel(); @@ -45,7 +71,16 @@ std::vector * numViews = new std::vector (); numViews->push_back(0); - theViewPanel = new wxMaracas_N_ViewersWidget( this, _images[0], numViews ); + + if (_type==1 || _type==3) + { + theViewPanel = new wxMaracas_N_ViewersWidget( this, _images[0], numViews ); + } + else if (_type==2) + { + theViewPanel = new wxMaracas_N_ViewersWidget( this, _images[1], numViews ); + } + SetVisibleAxis(false); theViewPanel->SetBackgroundColour(wxColour(0,0,0)); @@ -120,4 +155,5 @@ void wxMaracasSuperpositionPanel::Refresh() { GetwxVtkMPR2DView()->GetRenWin()->Render(); - } \ No newline at end of file + } +