X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualContour3V3DControler.cpp;h=e3dacf9a4f8599ae0d1c729b0ea66cc2e3593fc5;hb=e263b7ace0f53d647a731553a3f67700838ad146;hp=8c31ea1e4f14e899ae3b89fb0089f90e67801c30;hpb=414da1a291ff4c9d9a946536d3d219e4b5f9e6c2;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContour3V3DControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContour3V3DControler.cpp index 8c31ea1..e3dacf9 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContour3V3DControler.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContour3V3DControler.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 "manualContour3V3DControler.h" @@ -6,6 +31,8 @@ // ---------------------------------------------------------------------------- manualContour3V3DControler::manualContour3V3DControler() + : +_manualcontour3Vcontroler(NULL) { } // ---------------------------------------------------------------------------- @@ -39,7 +66,10 @@ void manualContour3V3DControler::InsertPoint(int x, int y, int z ) // virtual void manualContour3V3DControler::AddPoint( int x, int y, int z ) { manualContour3DControler::AddPoint( x, y, z ); - _manualcontour3Vcontroler->AddPoint_Others(); + if (_manualcontour3Vcontroler!=NULL) + { + _manualcontour3Vcontroler->AddPoint_Others(); + } } // ---------------------------------------------------------------------------- void manualContour3V3DControler::DeleteActualMousePoint(int x, int y) @@ -55,7 +85,10 @@ void manualContour3V3DControler::MouseMove( int x, int y ) if ((this->GetState()!=7) && (ss!=1)){ manualContour3DControler::MouseMove( x , y ); int id = GetManualViewBaseContour()->GetIdPoint ( x , y , GetZ() ); - _manualcontour3Vcontroler->MouseMove_Others(id); + if (_manualcontour3Vcontroler!=NULL) + { + _manualcontour3Vcontroler->MouseMove_Others(id); + } } } // ----------------------------------------------------------------------------