From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Wed, 21 Apr 2010 16:18:19 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~15
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaBruker.git;a=commitdiff_plain;h=6c8867ec999e620e3b68afb1f84ad7d84a45b6a6

*** empty log message ***
---

diff --git a/lib/src1/CMakeLists.txt b/lib/src1/CMakeLists.txt
index 5cf7902..85dbafd 100644
--- a/lib/src1/CMakeLists.txt
+++ b/lib/src1/CMakeLists.txt
@@ -71,11 +71,41 @@ IF(BUILD_DOXYGEN_DOC)
   SUBDIRS(doxygen)
 ENDIF(BUILD_DOXYGEN_DOC)
   
+
+
+
+
+
+  IF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+    SET(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".")
+  ELSE ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+    FILE(RELATIVE_PATH 
+      CILFC_EXECUTABLE_OUTPUT_REL_PATH
+      ${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH})
+  ENDIF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+
+ IF(UNIX)
+    SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
+      ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
+    SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
+  ELSE(UNIX)
+    SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
+      ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
+    SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
+  ENDIF(UNIX)
+  SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME}) 
+  
+#EED ????  set(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".")
+
   #----------------------------------------------------------------------------
   # MACRO WHICH DOES ALL THE JOB : BUILD AND INSTALL
   CREA_ADD_LIBRARY( ${LIBRARY_NAME} )
   #----------------------------------------------------------------------------
 
 
+
+
+
+
   #---------------------------------------------------------------------------
 ENDIF ( BUILD_${LIBRARY_NAME} )
diff --git a/lib/src1/bruker2dicom.cxx b/lib/src1/bruker2dicom.cxx
index 36313ce..13c7947 100644
--- a/lib/src1/bruker2dicom.cxx
+++ b/lib/src1/bruker2dicom.cxx
@@ -1391,6 +1391,7 @@ void Bruker2Dicom::MakeDicomImage(unsigned char *tabPixels,
 
   // if (strlen(patientName) != 0)
    file->InsertEntryString(patientName.c_str(),0x0010,0x0010, "PN"); // Patient's Name
+   file->InsertEntryString(patientName.c_str(),0x0010,0x0020, "LO"); // Patient's ID
 
    file->InsertEntryString(studyUID, 0x0020, 0x000d, "UI");
    file->InsertEntryString(serieUID, 0x0020, 0x000e, "UI");