X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvSlicerManager.h;h=bb30f54d5aa255611b6fb9901de7463a078ea6b3;hb=1ec47c5838e94f0ff1606093ae3998fc239a3191;hp=eda2d227a2ead7e85b76b7f7be4a82e22ae430d5;hpb=a0b0efabb1aadd2422cb32f4173f3ffecc041ab0;p=clitk.git diff --git a/vv/vvSlicerManager.h b/vv/vvSlicerManager.h index eda2d22..bb30f54 100644 --- a/vv/vvSlicerManager.h +++ b/vv/vvSlicerManager.h @@ -4,7 +4,7 @@ Authors belong to: - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr + - Léon Bérard cancer center http://www.centreleonberard.fr - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr This software is distributed WITHOUT ANY WARRANTY; without even @@ -15,7 +15,7 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html - ======================================================================-====*/ + ===========================================================================**/ #ifndef VVSLICERMANAGER_H #define VVSLICERMANAGER_H @@ -36,7 +36,6 @@ class vtkRenderWindow; class vtkPolyData; // VV -#include "vvConstants.h" #include "clitkCommon.h" #include "vvImage.h" #include "vvMesh.h" @@ -60,9 +59,9 @@ class vvSlicerManager : public QObject { return mLastError; } - bool SetImage(std::string filename,LoadedImageType type, int n=0, unsigned int slice=0); + bool SetImage(std::string filename, vvImageReader::LoadedImageType type, int n=0, unsigned int slice=0); void SetImage(vvImage::Pointer image); - bool SetImages(std::vector filenames, LoadedImageType type, int n=0); + bool SetImages(std::vector filenames, vvImageReader::LoadedImageType type, int n=0); bool SetOverlay(std::string filename, int dim, std::string component); bool SetFusion(std::string filename, int dim, std::string component); @@ -234,7 +233,7 @@ protected: double mFusionLevel; int mPreset; - LoadedImageType mType; + vvImageReader::LoadedImageType mType; std::string mVFComponent; std::string mOverlayComponent; std::string mFusionComponent;