X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FPlaneDirectionViewer.cxx;h=618bd36bd95a4cc6eda25f33af539a8ec26b03f1;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=db97047c458eb204e7c48d1ee73878ad91567f85;hpb=e42ecf415793e6f85e5de98b41385fe53b6d00e0;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/PlaneDirectionViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/PlaneDirectionViewer.cxx index db97047..618bd36 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/PlaneDirectionViewer.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/PlaneDirectionViewer.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. +# ------------------------------------------------------------------------ */ + #include "PlaneDirectionViewer.h" @@ -15,10 +40,8 @@ PlaneDirectionViewer::PlaneDirectionViewer(wxWindow* parent,int radio, double co wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL); this->SetSizer(sizer); this->SetAutoLayout(true); - } - PlaneDirectionViewer* PlaneDirectionViewer::getInstance(wxWindow* parent,int radio, double colour[3], int opacity){ if(instance==NULL){ instance = new PlaneDirectionViewer(parent,radio,colour,opacity); @@ -37,6 +60,7 @@ PlaneDirectionViewer::~PlaneDirectionViewer(){ void PlaneDirectionViewer::SetRenderer(vtkRenderer* render){ manager->SetRenderer(render); } + void PlaneDirectionViewer::SetVectors( std::vector lstPointsx, std::vector lstPointsy, std::vector lstPointsz){ manager->SetVectors(lstPointsx,lstPointsy,lstPointsz); } @@ -44,18 +68,18 @@ void PlaneDirectionViewer::SetVectors( std::vector lstPointsx, std::vect void PlaneDirectionViewer::UpdateDirections() throw (std::exception){ manager->UpdateDirections(); std::vector vectdata = manager->GetPlanesData(); - for(int i = 0; i < viewdata.size();i++){ + int i; + for(i = 0; i < (int)viewdata.size();i++){ this->GetSizer()->Remove(i); viewdata[i]->Destroy(); } viewdata.clear(); - for(int i = 0; i < vectdata.size(); i++){ + for(i = 0; i < (int)vectdata.size(); i++){ PlaneDirectionViewerPanel* planedirview = new PlaneDirectionViewerPanel(this, vectdata[i],i); viewdata.push_back(planedirview); this->GetSizer()->Add(planedirview,1); } - this->Layout(); - + this->Layout(); } void PlaneDirectionViewer::addRemoveActor(int index, bool addremove){ @@ -72,5 +96,5 @@ void PlaneDirectionViewer::WriteInformation(std::string filename, double* spc){ void PlaneDirectionViewer::SetArrowSize(int arrowsize){ manager->SetArrowSize(arrowsize); +} -} \ No newline at end of file