From e3ee3436dd081af55f71997e58f5727345a84bff Mon Sep 17 00:00:00 2001 From: Frederic Cervenansky Date: Thu, 15 Nov 2012 13:31:36 +0000 Subject: [PATCH] Feature #1767 --- CMakeLists.txt | 25 +++++ CTestConfig.cmake | 25 +++++ README.txt | 27 +++++- appli/CMakeLists.txt | 27 +++++- appli/Dcm2VtkImageData/CMakeLists.txt | 24 +++++ appli/Dcm2VtkImageData/Dcm2VtkImageData.cxx | 36 +++++-- appli/PrintParameterFile/CMakeLists.txt | 25 +++++ .../PrintParameterFile/PrintParameterFile.cxx | 27 +++++- appli/README.txt | 25 +++++ appli/essaiDenis/CMakeLists.txt | 25 +++++ appli/essaiDenis/essaiDenis.cpp | 26 +++++ .../exObjectVaryingProperties/CMakeLists.txt | 24 +++++ appli/exObjectVaryingProperties/main.cxx | 27 +++++- appli/testBruker2Dicom/CMakeLists.txt | 24 +++++ appli/testBruker2Dicom/testBruker2Dicom.cxx | 36 +++++-- cmake/UserBuildAllOption.cmake | 25 +++++ cmake/UserBuildDoxygenDoc.cmake | 24 +++++ cmake/UserBuildHtmlDocFromLatex.cmake | 24 +++++ cmake/UserBuildLatexDoc.cmake | 24 +++++ cmake/UserConfig.cmake | 24 +++++ cmake/UserDefineOptions.cmake | 25 +++++ cmake/UserMacros.cmake | 25 +++++ cmake/UserRootCMakeLists.cmake | 24 +++++ cmake/UserSetDeducedPaths.cmake | 25 +++++ doc/CMakeLists.txt | 24 +++++ doc/README_HowToUpload.txt | 25 +++++ doc/UserDocumentation/CMakeLists.txt | 25 +++++ doc/UserDoxygen/CMakeLists.txt | 25 +++++ doc/UserDoxygen/DoxyMainPage.txt.in | 25 +++++ doc/help_contents.html.in | 26 +++++ doc/index-no-frame.html.in | 26 +++++ doc/index.html.in | 27 +++++- install/CMakeLists.txt | 25 +++++ lib/CMakeLists.txt | 25 +++++ lib/src1/CMakeLists.txt | 25 +++++ lib/src1/bruker2dicom.cxx | 94 ++++++++++++++----- lib/src1/bruker2dicom.h | 38 ++++++-- lib/src1/bruker2dicom2.cxx | 26 +++++ lib/src1/bruker2dicom2.h | 26 +++++ lib/src1/brukerFieldData.cpp | 26 +++++ lib/src1/brukerFieldData.h | 26 +++++ lib/src1/brukerSystem.h | 27 +++++- lib/src1/brukerdataset.cpp | 46 +++++++-- lib/src1/brukerdataset.h | 32 ++++++- lib/src1/brukerexception.cxx | 26 +++++ lib/src1/brukerexception.h | 26 +++++ lib/src1/brukerimage.cpp | 26 +++++ lib/src1/brukerimage.h | 27 ++++++ lib/src1/brukerimageset.cpp | 26 +++++ lib/src1/brukerimageset.h | 26 +++++ lib/src1/brukerkspaceobject.cpp | 26 +++++ lib/src1/brukerkspaceobject.h | 26 +++++ lib/src1/brukerobjectvaryingproperties.cpp | 26 +++++ lib/src1/brukerobjectvaryingproperties.h | 26 +++++ lib/src1/doxygen/CMakeLists.txt | 25 ++++- lib/src1/doxygen/DoxyMainPage.txt.in | 26 +++++ lib/template_lib/CMakeLists.txt | 25 +++++ 57 files changed, 1519 insertions(+), 60 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 563805a..c511652 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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. +# ------------------------------------------------------------------------ + # --------------------------------- # # Unless you are an experimented cmake user, diff --git a/CTestConfig.cmake b/CTestConfig.cmake index 0a208c3..6321a88 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -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. +# ------------------------------------------------------------------------ + ## This file should be placed in the root directory of your project. ## Then modify the CMakeLists.txt file in the root directory of your ## project to incorporate the testing dashboard. diff --git a/README.txt b/README.txt index e146304..f894b65 100644 --- a/README.txt +++ b/README.txt @@ -1,5 +1,30 @@ +# --------------------------------------------------------------------- +# +# 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. +# ------------------------------------------------------------------------ + creaBruker -(c) CREATIS 2009 +(c) CREATIS 2012 a Bruker exam has the following 3 levels structure : diff --git a/appli/CMakeLists.txt b/appli/CMakeLists.txt index 7aa1a0b..5cb84f6 100644 --- a/appli/CMakeLists.txt +++ b/appli/CMakeLists.txt @@ -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. +# ------------------------------------------------------------------------ + # Add a SUBDIRS command for each one of your applications # SUBDIRS(MyApp1) # SUBDIRS(MyApp2) @@ -18,7 +43,7 @@ if(USE_GDCM) #ADD_SUBDIRECTORY( essaiDenis ) #ADD_SUBDIRECTORY( PrintParameterFile) #ADD_SUBDIRECTORY( exObjectVaryingProperties) -#ADD_SUBDIRECTORY( testBruker2Dicom) +ADD_SUBDIRECTORY( testBruker2Dicom) #ADD_SUBDIRECTORY( Dcm2VtkImageData) #ADD_SUBDIRECTORY( appli1_WithoutWx) #ADD_SUBDIRECTORY( appli2_WithWx) diff --git a/appli/Dcm2VtkImageData/CMakeLists.txt b/appli/Dcm2VtkImageData/CMakeLists.txt index 49be8d7..c03212c 100644 --- a/appli/Dcm2VtkImageData/CMakeLists.txt +++ b/appli/Dcm2VtkImageData/CMakeLists.txt @@ -1,3 +1,27 @@ +# --------------------------------------------------------------------- +# +# 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. +# ------------------------------------------------------------------------ #---------------------------------------------------------------------------- # SET THE NAME OF YOUR EXECUTABLE diff --git a/appli/Dcm2VtkImageData/Dcm2VtkImageData.cxx b/appli/Dcm2VtkImageData/Dcm2VtkImageData.cxx index 1d28631..39f142f 100644 --- a/appli/Dcm2VtkImageData/Dcm2VtkImageData.cxx +++ b/appli/Dcm2VtkImageData/Dcm2VtkImageData.cxx @@ -1,14 +1,36 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ /*========================================================================= - Program: gdcm + Program: creaBruker Module: $RCSfile: Dcm2VtkImageData.cxx,v $ Language: C++ - Date: $Date: 2009/07/17 14:14:04 $ - Version: $Revision: 1.1 $ - - Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de - l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. + Date: $Date: 2012/11/15 13:31:39 $ + Version: $Revision: 1.2 $ This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR diff --git a/appli/PrintParameterFile/CMakeLists.txt b/appli/PrintParameterFile/CMakeLists.txt index 17dc39b..58b87ad 100755 --- a/appli/PrintParameterFile/CMakeLists.txt +++ b/appli/PrintParameterFile/CMakeLists.txt @@ -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. +# ------------------------------------------------------------------------ + #---------------------------------------------------------------------------- # SET THE NAME OF YOUR EXECUTABLE diff --git a/appli/PrintParameterFile/PrintParameterFile.cxx b/appli/PrintParameterFile/PrintParameterFile.cxx index 9d18a3e..3398490 100644 --- a/appli/PrintParameterFile/PrintParameterFile.cxx +++ b/appli/PrintParameterFile/PrintParameterFile.cxx @@ -1,4 +1,29 @@ - +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ #ifdef HAVE_CONFIG_H #include #endif diff --git a/appli/README.txt b/appli/README.txt index e2c0ab8..3f059e3 100644 --- a/appli/README.txt +++ b/appli/README.txt @@ -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. +# ------------------------------------------------------------------------ + Une 'vraie' application (contrairement `a un 'exemple') est succeptible d'^etre r'epartie sur plusieurs fichiers sources. Par convention, nous consid`ererons qu'il y a un directory par application. diff --git a/appli/essaiDenis/CMakeLists.txt b/appli/essaiDenis/CMakeLists.txt index d8a7c06..7f1be34 100644 --- a/appli/essaiDenis/CMakeLists.txt +++ b/appli/essaiDenis/CMakeLists.txt @@ -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. +# ------------------------------------------------------------------------ + #---------------------------------------------------------------------------- # SET THE NAME OF YOUR EXECUTABLE SET ( EXE_NAME essaiDenis ) diff --git a/appli/essaiDenis/essaiDenis.cpp b/appli/essaiDenis/essaiDenis.cpp index 792751f..26860c1 100644 --- a/appli/essaiDenis/essaiDenis.cpp +++ b/appli/essaiDenis/essaiDenis.cpp @@ -1,3 +1,29 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ #ifdef HAVE_CONFIG_H #include #endif diff --git a/appli/exObjectVaryingProperties/CMakeLists.txt b/appli/exObjectVaryingProperties/CMakeLists.txt index 8d1c92e..de4aa33 100755 --- a/appli/exObjectVaryingProperties/CMakeLists.txt +++ b/appli/exObjectVaryingProperties/CMakeLists.txt @@ -1,3 +1,27 @@ +# --------------------------------------------------------------------- +# +# 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. +# ------------------------------------------------------------------------ #---------------------------------------------------------------------------- # SET THE NAME OF YOUR EXECUTABLE diff --git a/appli/exObjectVaryingProperties/main.cxx b/appli/exObjectVaryingProperties/main.cxx index 582f06a..931dc18 100644 --- a/appli/exObjectVaryingProperties/main.cxx +++ b/appli/exObjectVaryingProperties/main.cxx @@ -1,4 +1,29 @@ - +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ #ifdef HAVE_CONFIG_H #include #endif diff --git a/appli/testBruker2Dicom/CMakeLists.txt b/appli/testBruker2Dicom/CMakeLists.txt index 61bad20..d2cc69f 100755 --- a/appli/testBruker2Dicom/CMakeLists.txt +++ b/appli/testBruker2Dicom/CMakeLists.txt @@ -1,3 +1,27 @@ +# --------------------------------------------------------------------- +# +# 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. +# ------------------------------------------------------------------------ #---------------------------------------------------------------------------- # SET THE NAME OF YOUR EXECUTABLE diff --git a/appli/testBruker2Dicom/testBruker2Dicom.cxx b/appli/testBruker2Dicom/testBruker2Dicom.cxx index 5216302..6ccdf93 100644 --- a/appli/testBruker2Dicom/testBruker2Dicom.cxx +++ b/appli/testBruker2Dicom/testBruker2Dicom.cxx @@ -1,14 +1,38 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ + /*========================================================================= - Program: gdcm + Program: creaBruker Module: $RCSfile: testBruker2Dicom.cxx,v $ Language: C++ - Date: $Date: 2011/04/07 10:16:59 $ - Version: $Revision: 1.11 $ + Date: $Date: 2012/11/15 13:31:58 $ + Version: $Revision: 1.12 $ - Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de - l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR diff --git a/cmake/UserBuildAllOption.cmake b/cmake/UserBuildAllOption.cmake index 5df73d1..d4e98f8 100644 --- a/cmake/UserBuildAllOption.cmake +++ b/cmake/UserBuildAllOption.cmake @@ -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. +# ------------------------------------------------------------------------ + #----------------------------------------------------------------------------- # If --BUILD_ALL is set to ON then all options # for which the macro SWITCH_ON_IF_BUILD_ALL have been used are set to ON diff --git a/cmake/UserBuildDoxygenDoc.cmake b/cmake/UserBuildDoxygenDoc.cmake index 1ac3f5a..c75e21e 100644 --- a/cmake/UserBuildDoxygenDoc.cmake +++ b/cmake/UserBuildDoxygenDoc.cmake @@ -1,3 +1,27 @@ +# --------------------------------------------------------------------- +# +# 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. +# ------------------------------------------------------------------------ MACRO(USER_BUILD_DOXYGEN_DOC NAME INPUT DOC_RELATIVE_INSTALL_PATH PREDEFINED) diff --git a/cmake/UserBuildHtmlDocFromLatex.cmake b/cmake/UserBuildHtmlDocFromLatex.cmake index 1cba436..e8cebae 100644 --- a/cmake/UserBuildHtmlDocFromLatex.cmake +++ b/cmake/UserBuildHtmlDocFromLatex.cmake @@ -1,3 +1,27 @@ +# --------------------------------------------------------------------- +# +# 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. +# ------------------------------------------------------------------------ MACRO(USER_BUILD_HTML_DOC_FROM_LATEX TEX_FILE OUTPUT_REL_PATH) diff --git a/cmake/UserBuildLatexDoc.cmake b/cmake/UserBuildLatexDoc.cmake index 1f5ad69..e17b16a 100644 --- a/cmake/UserBuildLatexDoc.cmake +++ b/cmake/UserBuildLatexDoc.cmake @@ -1,3 +1,27 @@ +# --------------------------------------------------------------------- +# +# 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. +# ------------------------------------------------------------------------ MACRO(USER_BUILD_LATEX_DOC TEX_FILE OUTPUT_REL_PATH) diff --git a/cmake/UserConfig.cmake b/cmake/UserConfig.cmake index 58dfc68..2cd81f4 100644 --- a/cmake/UserConfig.cmake +++ b/cmake/UserConfig.cmake @@ -1,3 +1,27 @@ +# --------------------------------------------------------------------- +# +# 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. +# ------------------------------------------------------------------------ #----------------------------------------------------------------------------- diff --git a/cmake/UserDefineOptions.cmake b/cmake/UserDefineOptions.cmake index 65a1446..75cc6fd 100644 --- a/cmake/UserDefineOptions.cmake +++ b/cmake/UserDefineOptions.cmake @@ -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. +# ------------------------------------------------------------------------ + #----------------------------------------------------------------------------- # messages compilation options OPTION ( BUILD_${PROJECT_NAME}_DOC "Build documentation for ${PROJECT_NAME}." OFF) diff --git a/cmake/UserMacros.cmake b/cmake/UserMacros.cmake index 0f33860..2cffca4 100644 --- a/cmake/UserMacros.cmake +++ b/cmake/UserMacros.cmake @@ -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. +# ------------------------------------------------------------------------ + #======================================================================== # MACRO WHICH COPIES ALL IMAGES (png, jpg, gif) # FROM SOURCE TREE TO DOC BUILD TREE diff --git a/cmake/UserRootCMakeLists.cmake b/cmake/UserRootCMakeLists.cmake index d4ee59b..cb8f7f0 100644 --- a/cmake/UserRootCMakeLists.cmake +++ b/cmake/UserRootCMakeLists.cmake @@ -1,3 +1,27 @@ +# --------------------------------------------------------------------- +# +# 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(cmake/UserMacros.cmake) INCLUDE(cmake/UserConfig.cmake) diff --git a/cmake/UserSetDeducedPaths.cmake b/cmake/UserSetDeducedPaths.cmake index 922742a..c0114e8 100644 --- a/cmake/UserSetDeducedPaths.cmake +++ b/cmake/UserSetDeducedPaths.cmake @@ -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. +# ------------------------------------------------------------------------ + MESSAGE(STATUS "===============================================") MESSAGE(STATUS "Setting up deduced pathes:") # Black box docs relative path diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 7becfcf..e22e19a 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,3 +1,27 @@ +# --------------------------------------------------------------------- +# +# 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. +# ------------------------------------------------------------------------ #----------------------------------------------------------------------------- diff --git a/doc/README_HowToUpload.txt b/doc/README_HowToUpload.txt index 2b15cbd..3832b34 100644 --- a/doc/README_HowToUpload.txt +++ b/doc/README_HowToUpload.txt @@ -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. +# ------------------------------------------------------------------------ + After builing ALL : cd in the build tree diff --git a/doc/UserDocumentation/CMakeLists.txt b/doc/UserDocumentation/CMakeLists.txt index 37efffd..96b5f35 100644 --- a/doc/UserDocumentation/CMakeLists.txt +++ b/doc/UserDocumentation/CMakeLists.txt @@ -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. +# ------------------------------------------------------------------------ + MESSAGE(STATUS "") MESSAGE(STATUS "=======================================") MESSAGE(STATUS "Configuring creaBruker Package Developers' Guide build ") diff --git a/doc/UserDoxygen/CMakeLists.txt b/doc/UserDoxygen/CMakeLists.txt index c90be3e..fc77c8b 100644 --- a/doc/UserDoxygen/CMakeLists.txt +++ b/doc/UserDoxygen/CMakeLists.txt @@ -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. +# ------------------------------------------------------------------------ + MESSAGE(STATUS "") MESSAGE(STATUS "=======================================") MESSAGE(STATUS "Configuring user doxygen doc") diff --git a/doc/UserDoxygen/DoxyMainPage.txt.in b/doc/UserDoxygen/DoxyMainPage.txt.in index 94c4c71..0bccfde 100644 --- a/doc/UserDoxygen/DoxyMainPage.txt.in +++ b/doc/UserDoxygen/DoxyMainPage.txt.in @@ -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. +# ------------------------------------------------------------------------ + /** * \mainpage bbtk documentation diff --git a/doc/help_contents.html.in b/doc/help_contents.html.in index 54410f7..bd0a5e6 100644 --- a/doc/help_contents.html.in +++ b/doc/help_contents.html.in @@ -1,3 +1,29 @@ + diff --git a/doc/index-no-frame.html.in b/doc/index-no-frame.html.in index d1c4acd..f5d7203 100644 --- a/doc/index-no-frame.html.in +++ b/doc/index-no-frame.html.in @@ -1,3 +1,29 @@ + diff --git a/doc/index.html.in b/doc/index.html.in index f6341df..f305513 100644 --- a/doc/index.html.in +++ b/doc/index.html.in @@ -1,4 +1,29 @@ - + User Project diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt index 5f300f3..4dcaec4 100644 --- a/install/CMakeLists.txt +++ b/install/CMakeLists.txt @@ -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. +# ------------------------------------------------------------------------ + #----------------------------------------------------------------------------- # CPACK+NSIS PACKAGING #----------------------------------------------------------------------------- diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index e641fe1..060522a 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,2 +1,27 @@ +# --------------------------------------------------------------------- +# +# 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. +# ------------------------------------------------------------------------ + # Add a ADD_SUBDIRECTORY command for each one of your libraries ADD_SUBDIRECTORY(src1) diff --git a/lib/src1/CMakeLists.txt b/lib/src1/CMakeLists.txt index 7270c18..5fe19ff 100644 --- a/lib/src1/CMakeLists.txt +++ b/lib/src1/CMakeLists.txt @@ -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. +# ------------------------------------------------------------------------ + #---------------------------------------------------------------------------- # SET THE NAME OF YOUR LIBRARY SET ( LIBRARY_NAME creaBruker ) diff --git a/lib/src1/bruker2dicom.cxx b/lib/src1/bruker2dicom.cxx index 0241946..32cb9b2 100644 --- a/lib/src1/bruker2dicom.cxx +++ b/lib/src1/bruker2dicom.cxx @@ -1,3 +1,29 @@ +/* + # --------------------------------------------------------------------- + # + # 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 "bruker2dicom.h" #include #include @@ -9,6 +35,7 @@ bool Bruker2Dicom::Execute() { + int dimension = 1; // ----- Check input directory name ----- bool bigEndian = GDCM_NAME_SPACE::Util::IsCurrentProcessorBigEndian(); @@ -99,7 +126,7 @@ bool Bruker2Dicom::Execute() subject_name = b_name.GetStringValue()[0]; strPatientName = subject_name; cleanString(subject_name); - DealWithSingleStudyDirectory (fileNames); + DealWithSingleStudyDirectory (fileNames, dimension); } break; } @@ -107,13 +134,13 @@ bool Bruker2Dicom::Execute() case 2: { subject_name = "defaultPatName"; strPatientName = subject_name; - DealWithSingleStudyDirectory (fileNames); + DealWithSingleStudyDirectory (fileNames, dimension); break; } case 3: { std::cout << " User passed a 'non study' directory; Hope it's a *non recursive* 'set of studies' directory! (recursive not yet dealt with)" << std::endl; - DealWithMultiStudyDirectory (fileNames); + DealWithMultiStudyDirectory (fileNames, dimension); break; } } @@ -121,7 +148,7 @@ bool Bruker2Dicom::Execute() // ---------------------------------------------------------------------------------------------------------- -void Bruker2Dicom::DealWithMultiStudyDirectory (GDCM_NAME_SPACE::DirListType &dirNames) +void Bruker2Dicom::DealWithMultiStudyDirectory (GDCM_NAME_SPACE::DirListType &dirNames, int dimension) { GDCM_NAME_SPACE::DirListType::iterator it; @@ -164,7 +191,7 @@ void Bruker2Dicom::DealWithMultiStudyDirectory (GDCM_NAME_SPACE::DirListType &di subject_name = b_name.GetStringValue()[0]; strPatientName = subject_name; cleanString(subject_name); - DealWithSingleStudyDirectory(fileNames); + DealWithSingleStudyDirectory(fileNames,dimension); } } else @@ -177,12 +204,14 @@ void Bruker2Dicom::DealWithMultiStudyDirectory (GDCM_NAME_SPACE::DirListType &di // ---------------------------------------------------------------------------------------------------------- -void Bruker2Dicom::DealWithSingleStudyDirectory (GDCM_NAME_SPACE::DirListType &fileNames) +void Bruker2Dicom::DealWithSingleStudyDirectory (GDCM_NAME_SPACE::DirListType &fileNames, int dimension) { bool res; // creation directory : 'nom du patient' std::string tempStringPatDir(OutputDirName); - tempStringPatDir = tempStringPatDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR + subject_name; + + tempStringPatDir = tempStringPatDir + "/"+ subject_name; + //GDCM_NAME_SPACE::GDCM_FILESEPARATOR + subject_name; //FCY TO MODIFY res=CreateDirectory(tempStringPatDir); if (!res) { @@ -319,7 +348,7 @@ void Bruker2Dicom::DealWithSingleStudyDirectory (GDCM_NAME_SPACE::DirListType &f if (verbose) printf ("outputDirName [%s]\n", outputDirName); try { - DealWithNiveau1(*it, strOutputDirName); + DealWithNiveau1(*it, strOutputDirName, dimension); } catch (BrukerHopelessException &e) { @@ -332,7 +361,7 @@ void Bruker2Dicom::DealWithSingleStudyDirectory (GDCM_NAME_SPACE::DirListType &f // ===================================================================== -void Bruker2Dicom::DealWithNiveau1(std::string &level1Directory, std::string ¤tOutputDirName) { +void Bruker2Dicom::DealWithNiveau1(std::string &level1Directory, std::string ¤tOutputDirName, int dimension) { // // e.g. : at level 1, in B67d1.Bp1/6 // @@ -434,7 +463,7 @@ void Bruker2Dicom::DealWithNiveau1(std::string &level1Directory, std::string &cu 7 1 */ try { - DealWithNiveau2(*it, strOutputDirName); + DealWithNiveau2(*it, strOutputDirName, dimension); } catch (BrukerHopelessException &e) { @@ -447,7 +476,7 @@ void Bruker2Dicom::DealWithNiveau1(std::string &level1Directory, std::string &cu // ===================================================================== -void Bruker2Dicom::DealWithNiveau2(std::string &level2Directory, std::string ¤tOutputDirName) { +void Bruker2Dicom::DealWithNiveau2(std::string &level2Directory, std::string ¤tOutputDirName, int dimension) { // e.g. : at level 2 in B67d1.Bp1/6/pdata // @@ -533,7 +562,7 @@ void Bruker2Dicom::DealWithNiveau2(std::string &level2Directory, std::string &cu } std::string strOutputDirName(outputDirName); try { - DealWithNiveau3(*it, strOutputDirName); + DealWithNiveau3(*it, strOutputDirName, dimension); } catch (BrukerHopelessException &e) { @@ -555,7 +584,7 @@ void Bruker2Dicom::DealWithNiveau2(std::string &level2Directory, std::string &cu // ===================================================================== // -void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string ¤tOutputDirName){ +void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string ¤tOutputDirName, int dimension){ // // e.g. at level 3, in @@ -720,20 +749,31 @@ void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string &cu // Better we use 'get' accessors from BrukerImage class, as Denis wrote them BrukerFieldData fov = br_reco.GetFieldData("RECO_fov"); - double fovX = fov.GetDoubleValue()[0]; - double fovY = fov.GetDoubleValue()[1]; + + double fovX; + double fovY; + fovX= fov.GetDoubleValue()[0]; + if(fov.GetDoubleValue().size() > 1) + fovY = fov.GetDoubleValue()[1]; if (verbose) std::cout << "FOV (ds reco) " << fovX << " " << fovY << std::endl; BrukerFieldData size = br_reco.GetFieldData("RECO_size"); - double sizeX = size.GetDoubleValue()[0]; - double sizeY = size.GetDoubleValue()[1]; + double sizeX; + double sizeY; + sizeX = size.GetDoubleValue()[0]; + + if(fov.GetDoubleValue().size() > 1) + sizeY = size.GetDoubleValue()[1]; if (verbose) std::cout << "SIZE (ds reco) " << sizeX << " " << sizeY << std::endl; - double spatResolX = fovX / sizeX; - double spatResolY = fovY / sizeY; + double spatResolX; + double spatResolY; + spatResolX = fovX / sizeX; + if(fov.GetDoubleValue().size() > 1) + spatResolY = fovY / sizeY; if (verbose) std::cout << "spatResol (ds reco : fov/size) " << spatResolX << " " << spatResolY << std::endl; @@ -742,10 +782,12 @@ void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string &cu /// \TODO probabely a more sophisticated accessor will be necessary : /// (cf : non contiguous slices, overlapping, slice thickness, space between slices, etc) - + double sliceDistance; + if(dimension > 1) + { BrukerFieldData bsliceDistance = br_method.GetFieldData("PVM_SPackArrSliceDistance"); - double sliceDistance = bsliceDistance.GetDoubleValue()[0]; - + sliceDistance = bsliceDistance.GetDoubleValue()[0]; + } if (verbose) std::cout << "SPackArrSliceDistance (ds method) " << sliceDistance << std::endl; @@ -773,6 +815,8 @@ void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string &cu if (verbose) std::cout << "nbSlices " << nbSlices << std::endl; int k; + if(dimension ==1) + nbSlices = 1; int nbInstants = nbFrames/nbSlices; if (verbose) std::cout << "nbInstants (deduced)" << nbInstants << std::endl; @@ -810,7 +854,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string &cu // This one will be important! // --------------------------- try { - imageSet = CreateImageSet ( ); + imageSet = CreateImageSet ( dimension); } catch (BrukerInitException& e) { @@ -1361,10 +1405,10 @@ void Bruker2Dicom::getImhDataType(BrukerFieldData &bDPT, std::string &mhdDataPix // =========================================================================================== -std::vector Bruker2Dicom::CreateImageSet ( ) +std::vector Bruker2Dicom::CreateImageSet ( int dimension) { std::vector imageSet; - br_acqp.SetLoopStructure(); + br_acqp.SetLoopStructure(dimension); std::vector tempVect = br_acqp.GetLoopStructure() ; std::map map = br_acqp.GetBrukerHeaderMap(); diff --git a/lib/src1/bruker2dicom.h b/lib/src1/bruker2dicom.h index 6d6b9d4..2fd2c3b 100644 --- a/lib/src1/bruker2dicom.h +++ b/lib/src1/bruker2dicom.h @@ -1,3 +1,29 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ #ifndef BRUKER2DICOM_H #define BRUKER2DICOM_H @@ -65,7 +91,7 @@ void MakeDicomImage(unsigned char *tabPixels, GDCM_NAME_SPACE::ImageContentType contentType ); -std::vector CreateImageSet ( ); +std::vector CreateImageSet ( int dimension); void getImhDataType(BrukerFieldData &bDPT, std::string &mhdDataPixelType, @@ -76,11 +102,11 @@ void cleanString(std::string &s); bool CreateDirectory(std::string &dirNameout); int CheckUserDirectory(std::string &userDirName); -void DealWithMultiStudyDirectory(GDCM_NAME_SPACE::DirListType &fileNames); -void DealWithSingleStudyDirectory(GDCM_NAME_SPACE::DirListType &fileNames); -void DealWithNiveau1(std::string &level1Directory, std::string ¤tOutputDirName); -void DealWithNiveau2(std::string &level2Directory, std::string ¤tOutputDirName); -void DealWithNiveau3(std::string &level3Directory, std::string ¤tOutputDirName); +void DealWithMultiStudyDirectory(GDCM_NAME_SPACE::DirListType &fileNames,int dimension); +void DealWithSingleStudyDirectory(GDCM_NAME_SPACE::DirListType &fileNames, int dimension); +void DealWithNiveau1(std::string &level1Directory, std::string ¤tOutputDirName, int dimension); +void DealWithNiveau2(std::string &level2Directory, std::string ¤tOutputDirName, int dimension); +void DealWithNiveau3(std::string &level3Directory, std::string ¤tOutputDirName, int dimension); void dealWithCarto(GDCM_NAME_SPACE::DirListType &fileNames, int NX, int NY, int nbSlices, double fovX, double fovY, double sliceDistance, diff --git a/lib/src1/bruker2dicom2.cxx b/lib/src1/bruker2dicom2.cxx index ee9dab4..29da638 100644 --- a/lib/src1/bruker2dicom2.cxx +++ b/lib/src1/bruker2dicom2.cxx @@ -1,3 +1,29 @@ +/* + # --------------------------------------------------------------------- + # + # 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 "bruker2dicom2.h" #include "brukerexception.h" diff --git a/lib/src1/bruker2dicom2.h b/lib/src1/bruker2dicom2.h index 390ae1f..8ae972c 100644 --- a/lib/src1/bruker2dicom2.h +++ b/lib/src1/bruker2dicom2.h @@ -1,3 +1,29 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ #ifndef BRUKER2DICOM2_H #define BRUKER2DICOM2_H diff --git a/lib/src1/brukerFieldData.cpp b/lib/src1/brukerFieldData.cpp index a4fdc05..42fc26c 100644 --- a/lib/src1/brukerFieldData.cpp +++ b/lib/src1/brukerFieldData.cpp @@ -1,3 +1,29 @@ +/* + # --------------------------------------------------------------------- + # + # 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 "brukerFieldData.h" #include #include diff --git a/lib/src1/brukerFieldData.h b/lib/src1/brukerFieldData.h index c773e10..6a2ac64 100644 --- a/lib/src1/brukerFieldData.h +++ b/lib/src1/brukerFieldData.h @@ -1,3 +1,29 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ #ifndef BRUKERFIELDDATA_H #define BRUKERFIELDDATA_H /*! \file brukerFieldData.h diff --git a/lib/src1/brukerSystem.h b/lib/src1/brukerSystem.h index 7681792..d993ebd 100644 --- a/lib/src1/brukerSystem.h +++ b/lib/src1/brukerSystem.h @@ -1,4 +1,29 @@ - +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ #ifndef _BRUKERSYSTEM_H_ #define _BRUKERSYSTEM_H_ diff --git a/lib/src1/brukerdataset.cpp b/lib/src1/brukerdataset.cpp index 936696e..f4cdc70 100644 --- a/lib/src1/brukerdataset.cpp +++ b/lib/src1/brukerdataset.cpp @@ -1,3 +1,30 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ + // // C++ Implementation: brukerdataset // @@ -571,10 +598,10 @@ NR (Nbre de repetitions) * @return bool @todo implement multicoil version */ -bool BrukerDataSet::SetLoopStructure () +bool BrukerDataSet::SetLoopStructure (int dimension) { - if (! SetInnerObjectLoopStructure()) return false; - if (! SetOuterObjectLoopStructure()) return false; + if (! SetInnerObjectLoopStructure(dimension)) return false; + if (! SetOuterObjectLoopStructure(dimension)) return false; std::vector Inner=GetInnerObjectLoopStructure(); std::vector Outer=GetOuterObjectLoopStructure(); std::vector TmpVect; @@ -681,7 +708,7 @@ std::map BrukerDataSet::GetBrukerHeaderMap() const //} -bool BrukerDataSet::SetInnerObjectLoopStructure() +bool BrukerDataSet::SetInnerObjectLoopStructure(int dimension) { /* * @@ -712,11 +739,15 @@ bool BrukerDataSet::SetInnerObjectLoopStructure() //std::cout<<"BrukerDataSet::BrukerHeaderMap[(std::string) ACQ_ns_list_size].IntValue[0]" << BrukerDataSet::BrukerHeaderMap[(std::string) "ACQ_ns_list_size"].IntValue[0] << std::endl; TempIntVect.push_back(BrukerDataSet::BrukerHeaderMap[(std::string) "ACQ_phase_factor"].IntValue[0]); //std::cout<<"BrukerDataSet::BrukerHeaderMap[(std::string) ACQ_phase_factor].IntValue[0]" << BrukerDataSet::BrukerHeaderMap[(std::string) "ACQ_phase_factor"].IntValue[0]<< std::endl; + if(dimension > 1) TempIntVect.push_back(BrukerDataSet::BrukerHeaderMap[(std::string) "NSLICES"].IntValue[0]); //std::cout << "BrukerDataSet::BrukerHeaderMap[(std::string) NSLICES].IntValue[0]" << BrukerDataSet::BrukerHeaderMap[(std::string) "NSLICES"].IntValue[0] << std::endl; if (1<=BrukerDataSet::BrukerHeaderMap[ (std::string) "ACQ_size" ].DimensionNumber ) { - TempIntVect.push_back(BrukerDataSet::BrukerHeaderMap[ (std::string) "ACQ_size" ].IntValue[1]/BrukerDataSet::BrukerHeaderMap[(std::string) "ACQ_phase_factor"].IntValue[0]); + if(dimension == 1) + TempIntVect.push_back(BrukerDataSet::BrukerHeaderMap[ (std::string) "ACQ_size" ].IntValue[0]/BrukerDataSet::BrukerHeaderMap[(std::string) "ACQ_phase_factor"].IntValue[0]); + else + TempIntVect.push_back(BrukerDataSet::BrukerHeaderMap[ (std::string) "ACQ_size" ].IntValue[1]/BrukerDataSet::BrukerHeaderMap[(std::string) "ACQ_phase_factor"].IntValue[0]); //std::cout << "BrukerDataSet::BrukerHeaderMap[ (std::string) ACQ_size ].IntValue[1]/BrukerDataSet::BrukerHeaderMap[(std::string) ACQ_phase_factor].IntValue[0]" << BrukerDataSet::BrukerHeaderMap[ (std::string) "ACQ_size" //].IntValue[1]/BrukerDataSet::BrukerHeaderMap[(std::string) "ACQ_phase_factor"].IntValue[0] << std::endl; if (2<=BrukerDataSet::BrukerHeaderMap[ (std::string) "ACQ_size" ].DimensionNumber ) @@ -744,7 +775,7 @@ std::vector< int > BrukerDataSet::GetOuterObjectLoopStructure() const } -bool BrukerDataSet::SetOuterObjectLoopStructure () +bool BrukerDataSet::SetOuterObjectLoopStructure (int dimension) { OuterObjectLoopStructure.clear(); /* @@ -759,6 +790,9 @@ bool BrukerDataSet::SetOuterObjectLoopStructure () if (! CheckExistKeyword("NI")) return false; // Ici, boucles additionnelles si elles existent regroupees en une seule //temp=GetIntValueN(NIStr,1)/(GetIntValueN(NSLICESStr,1)*GetIntValueN(NECHOESStr,1)); + if(dimension ==1) + temp=BrukerDataSet::BrukerHeaderMap[ (std::string) "NI" ].IntValue[0]/(BrukerDataSet::BrukerHeaderMap[ (std::string) "ACQ_ns_list_size" ].IntValue[0]); + else temp=BrukerDataSet::BrukerHeaderMap[ (std::string) "NI" ].IntValue[0]/(BrukerDataSet::BrukerHeaderMap[ (std::string) "NSLICES" ].IntValue[0]*BrukerDataSet::BrukerHeaderMap[ (std::string) "ACQ_ns_list_size" ].IntValue[0]); if (1 < temp) TempIntVect.push_back(temp); diff --git a/lib/src1/brukerdataset.h b/lib/src1/brukerdataset.h index e9cdacb..aeb75e4 100644 --- a/lib/src1/brukerdataset.h +++ b/lib/src1/brukerdataset.h @@ -1,3 +1,29 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ // // C++ Interface: brukerdataset // @@ -60,7 +86,7 @@ public: bool Getkspace (std::string &); const BrukerFieldData& GetFieldData(std::string &); const BrukerFieldData& GetFieldData(const char *); - bool SetLoopStructure ( ); + bool SetLoopStructure ( int dimension); bool SetLoopStructureOld ( ); bool SetLoopStructure (const std::vector& theValue); std::vector GetLoopStructure ( ) const; @@ -71,9 +97,9 @@ public: std::vector > GetBrukerImageList() const; std::map GetBrukerHeaderMap() const; - bool SetInnerObjectLoopStructure (); + bool SetInnerObjectLoopStructure (int dimension); std::vector GetInnerObjectLoopStructure() const; - bool SetOuterObjectLoopStructure (); + bool SetOuterObjectLoopStructure (int dimension); std::vector GetOuterObjectLoopStructure() const; bool SetImageLoopStructure (); std::vector GetImageLoopStructure() const; diff --git a/lib/src1/brukerexception.cxx b/lib/src1/brukerexception.cxx index 9929942..ca964d1 100644 --- a/lib/src1/brukerexception.cxx +++ b/lib/src1/brukerexception.cxx @@ -1 +1,27 @@ +/* + # --------------------------------------------------------------------- + # + # 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 "brukerexception.h" diff --git a/lib/src1/brukerexception.h b/lib/src1/brukerexception.h index 27a107a..7034360 100644 --- a/lib/src1/brukerexception.h +++ b/lib/src1/brukerexception.h @@ -1,3 +1,29 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ // #ifndef BRUKEREXCEPTION_H #define BRUKEREXCEPTION_H diff --git a/lib/src1/brukerimage.cpp b/lib/src1/brukerimage.cpp index cd1789a..e63b799 100644 --- a/lib/src1/brukerimage.cpp +++ b/lib/src1/brukerimage.cpp @@ -1,3 +1,29 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ // // C++ Implementation: brukerimage // diff --git a/lib/src1/brukerimage.h b/lib/src1/brukerimage.h index 22e61ee..f3398e7 100644 --- a/lib/src1/brukerimage.h +++ b/lib/src1/brukerimage.h @@ -1,3 +1,30 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ + // // C++ Interface: brukerimage // diff --git a/lib/src1/brukerimageset.cpp b/lib/src1/brukerimageset.cpp index 3e808b1..2a47ccc 100644 --- a/lib/src1/brukerimageset.cpp +++ b/lib/src1/brukerimageset.cpp @@ -1 +1,27 @@ +/* + # --------------------------------------------------------------------- + # + # 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 "brukerimageset.h" diff --git a/lib/src1/brukerimageset.h b/lib/src1/brukerimageset.h index 6c4e77a..9ae807e 100644 --- a/lib/src1/brukerimageset.h +++ b/lib/src1/brukerimageset.h @@ -1,3 +1,29 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ // #ifndef BRUKERIMAGESET_H #define BRUKERIMAGESET_H diff --git a/lib/src1/brukerkspaceobject.cpp b/lib/src1/brukerkspaceobject.cpp index cd7883c..95d51ef 100644 --- a/lib/src1/brukerkspaceobject.cpp +++ b/lib/src1/brukerkspaceobject.cpp @@ -1,3 +1,29 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ // // C++ Implementation: brukerobject // diff --git a/lib/src1/brukerkspaceobject.h b/lib/src1/brukerkspaceobject.h index 1e266fc..a55161f 100644 --- a/lib/src1/brukerkspaceobject.h +++ b/lib/src1/brukerkspaceobject.h @@ -1,3 +1,29 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ // // C++ Interface: brukerobject // diff --git a/lib/src1/brukerobjectvaryingproperties.cpp b/lib/src1/brukerobjectvaryingproperties.cpp index 1222eae..66af40d 100644 --- a/lib/src1/brukerobjectvaryingproperties.cpp +++ b/lib/src1/brukerobjectvaryingproperties.cpp @@ -1,3 +1,29 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ // // C++ Implementation: brukerobjectvaryingproperties // diff --git a/lib/src1/brukerobjectvaryingproperties.h b/lib/src1/brukerobjectvaryingproperties.h index 625e62f..f698b1d 100644 --- a/lib/src1/brukerobjectvaryingproperties.h +++ b/lib/src1/brukerobjectvaryingproperties.h @@ -1,3 +1,29 @@ +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ +*/ // // C++ Interface: brukerobjectvaryingproperties // diff --git a/lib/src1/doxygen/CMakeLists.txt b/lib/src1/doxygen/CMakeLists.txt index 8d93146..6234546 100644 --- a/lib/src1/doxygen/CMakeLists.txt +++ b/lib/src1/doxygen/CMakeLists.txt @@ -1,4 +1,27 @@ - +# --------------------------------------------------------------------- +# +# 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. +# ------------------------------------------------------------------------ MACRO(CREA_BUILD_DOXYGEN_DOC NAME INPUT DOC_RELATIVE_INSTALL_PATH PREDEFINED) diff --git a/lib/src1/doxygen/DoxyMainPage.txt.in b/lib/src1/doxygen/DoxyMainPage.txt.in index 7beba21..a67ed6a 100644 --- a/lib/src1/doxygen/DoxyMainPage.txt.in +++ b/lib/src1/doxygen/DoxyMainPage.txt.in @@ -1,3 +1,29 @@ + /** * \mainpage creaBruker documentation diff --git a/lib/template_lib/CMakeLists.txt b/lib/template_lib/CMakeLists.txt index 4bbc455..84d0330 100644 --- a/lib/template_lib/CMakeLists.txt +++ b/lib/template_lib/CMakeLists.txt @@ -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. +# ------------------------------------------------------------------------ + #---------------------------------------------------------------------------- # SET THE NAME OF YOUR LIBRARY SET ( LIBRARY_NAME MyLib ) -- 2.45.1