Merge branch 'master' of /home/dsarrut/clitk3.server

diff --git a/common/clitkConfiguration.h.in b/common/clitkConfiguration.h.in
index b573cc8c6d4e81fbb3f67b10eb8ee89f8d337549..5f99d7a9c7c27e3a83ac6e6b66999d24888e7a4d 100644 (file)
--- a/common/clitkConfiguration.h.in
+++ b/common/clitkConfiguration.h.in
@@ -1,3 +1,21 @@
+/*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
+
+  Authors belong to:
+  - University of LYON              http://www.universite-lyon.fr/
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
+
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
+
+  It is distributed under dual licence
+
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+===========================================================================**/
+
 #ifndef clitk_configuration_h
 #define clitk_configuration_h
 //This file is interpreted by cmake, to define macros based on the cmake configuration options

diff --git a/vv/vvConfiguration.h.in b/vv/vvConfiguration.h.in
index 7ad04e69856262cbdddeabaa43178d8d47d0cae5..36d3258b73fb9ee25de7edfd3f94f6a77a2bcdf3 100644 (file)
--- a/vv/vvConfiguration.h.in
+++ b/vv/vvConfiguration.h.in
@@ -1,2 +1,24 @@
+/*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
+
+  Authors belong to:
+  - University of LYON              http://www.universite-lyon.fr/
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
+
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
+
+  It is distributed under dual licence
+
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+===========================================================================**/
+
+#ifndef vv_configuration_h
+#define vv_configuration_h
+
 #define VV_VERSION "v@CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@.@CPACK_PACKAGE_VERSION_PATCH@"
-                              
\ No newline at end of file
+
+#endif

diff --git a/vv/vvRegisterForm.cxx b/vv/vvRegisterForm.cxx
index c2bda0e1c581c69b0554ca35c74034b297faf4e9..e39ffddadd9faf50f80befbab7f6b679927107d6 100644 (file)
--- a/vv/vvRegisterForm.cxx
+++ b/vv/vvRegisterForm.cxx
@@ -40,6 +40,8 @@ void vvRegisterForm::sendData(){
   url2.addQueryItem("os", osName->text().toUtf8());
   url2.addQueryItem("vvVersion", VV_VERSION);
   url2.addQueryItem("architecture", ARCHITECTURE);
+  url2.addQueryItem("compilationDate", QString(__DATE__) + ", " + QString(__TIME__) );
+
   manager->get(QNetworkRequest(url2));
 }
 void vvRegisterForm::accept(){