*** empty log message ***

diff --git a/bin/start.bat b/bin/start.bat
new file mode 100644 (file)
index 0000000..c1f82d5
--- /dev/null
+++ b/bin/start.bat
@@ -0,0 +1 @@
+start %1
\ No newline at end of file

diff --git a/data/README_Demos.txt b/data/README_Demos.txt
new file mode 100644 (file)
index 0000000..6e1a21b
--- /dev/null
+++ b/data/README_Demos.txt
@@ -0,0 +1,5 @@
+ Demos
+--------------
+-Viewer1
+-Filter1
+-ShowNPoints

diff --git a/data/README_DeveloperTools.txt b/data/README_DeveloperTools.txt
new file mode 100644 (file)
index 0000000..2968936
--- /dev/null
+++ b/data/README_DeveloperTools.txt
@@ -0,0 +1,5 @@
+ Developer Tools
+--------------
+-creaNewProject
+-bbStudio
+-bbi

diff --git a/data/README_ImageTools.txt b/data/README_ImageTools.txt
new file mode 100644 (file)
index 0000000..23b4cfa
--- /dev/null
+++ b/data/README_ImageTools.txt
@@ -0,0 +1,10 @@
+ Image Tools
+--------------
+-Contours
+-Render Viewer 3D
+-ROI
+-Registration rigid 
+-ReSample
+.
+.
+.

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index b471d55db19ed90e9daf72d726aae4eca00e93f5..1d3c9cacf6a673b577383b34551597f6461c5c78 100644 (file)
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -109,26 +109,25 @@ IF(WIN32 AND NOT UNIX)
                AddToPath_doneEED:
                SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 
 
-               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\creatisNewProject.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat'  'creaNewProject.exe'
-               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\creatisStudio.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat'  'bbStudio.exe'
-               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\creatisInterpreter.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat'  'bbi.exe'
-               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\creatisContours.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat'  'wxContourGUIExample.exe'
-               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\creatisCartography.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat'  'IRMMain.exe'
+               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\CreaTools_HomePage.lnk' '${CREATOOLS_DIRBIN}\\\\start.bat'  'www.creatis.insa-lyon.fr/site/creatools'
+               CreateDirectory '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Developer_Tools'
+               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Developer_Tools\\\\creaNewProject.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat'  'creaNewProject.exe'
+               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Developer_Tools\\\\bbStudio.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat'  'bbStudio.exe'
+               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Developer_Tools\\\\bbi.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat'  'bbi.exe'
+               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Developer_Tools\\\\Readme.txt.lnk' '${CREATOOLS_DIRBIN}\\\\start.bat'  'bin\\\\data\\\\README_DeveloperTools.txt'
                CreateDirectory '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos'
-               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos\\\\creatisFilter01.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat'  'bbi.exe demo\\\\appli\\\\demoFiltering1.bbs'
-               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos\\\\creatisViewing01.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat' 'bbi.exe demo\\\\appli\\\\demoViewing1.bbs'
-               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos\\\\creatisShowNPoints.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat' 'bbi.exe bbs\\\\creaMaracasVisu\\\\appli\\\\ExampleShowNPoints.bbs'
+               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos\\\\Filter01.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat'  'bbi.exe demo\\\\appli\\\\demoFiltering1.bbs'
+               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos\\\\Viewing01.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat' 'bbi.exe demo\\\\appli\\\\demoViewing1.bbs'
+               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos\\\\ShowNPoints.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat' 'bbi.exe bbs\\\\creaMaracasVisu\\\\appli\\\\ExampleShowNPoints.bbs'
+               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos\\\\Readme.txt.lnk' '${CREATOOLS_DIRBIN}\\\\start.bat'  'bin\\\\data\\\\README_Demos.txt'
+               CreateDirectory '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Image_Tools'
+               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Image_Tools\\\\RigidRegistration.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat'  'bbi.exe bbs\\\\PackRecalage\\\\appli\\\\Recalage.bbs'
+               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Image_Tools\\\\RenderingViewing.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat'  'bbi.exe bbs\\\\creaMaracasVisu\\\\appli\\\\ExampleRenderingViewer.bbs'
+               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Image_Tools\\\\Contours.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat'  'wxContourGUIExample.exe'
+               CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Image_Tools\\\\Readme.txt.lnk' '${CREATOOLS_DIRBIN}\\\\start.bat'  'bin\\\\data\\\\README_ImageTools.txt'
 
                WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'CREATOOLS_DIRS' '${CREATOOLS_DIRS}'
-               
-#              WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '${TTH_DIRBIN}' 
-#              WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'BOOST_ROOT' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_BOOST_LYBRARY}' 
-#              WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'GDCM_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_GDCM_LYBRARY}\\\\lib\\\\gdcm' 
-#              WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'ITK_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_ITK_LYBRARY}\\\\lib\\\\InsightToolkit' 
-#              WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'QTDIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_QT_LYBRARY}' 
-#              WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'VTK_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_VTK_LYBRARY}\\\\lib\\\\vtk-5.4' 
-#              WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'WXWIN' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_WXWIN_LYBRARY}' 
-               
+                               
                SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000        
                
                SetShellVarContext current
@@ -141,18 +140,26 @@ IF(WIN32 AND NOT UNIX)
        
        
                !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\creatisNewProject.lnk'
-               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\creatisContours.lnk'
-               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\creatisStudio.lnk'
-               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\creatisInterpreter.lnk'
-               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\creatisCartography.lnk'
+               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\CreaTools_HomePage.lnk'
+               
+               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Developer_Tools\\\\creaNewProject.lnk'
+               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Developer_Tools\\\\bbStudio.lnk'
+               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Developer_Tools\\\\bbi.lnk'
+               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Developer_Tools\\\\Readme.txt.lnk'
+               
+               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Demos\\\\Filter01.lnk'
+               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Demos\\\\Viewing01.lnk'
+               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Demos\\\\ShowNPoints.lnk'
+               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Demos\\\\Readme.txt.lnk'
+
+               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Image_Tools\\\\RigidRegistration.lnk'
+               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Image_Tools\\\\RenderingViewing.lnk'
+               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Image_Tools\\\\Contours.lnk'
+               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Image_Tools\\\\Readme.txt.lnk'
+
+        StrCpy $MUI_TEMP '$SMPROGRAMS\\\\$MUI_TEMP'
+               RMDir /r $MUI_TEMP
                
-               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Demos\\\\creatisFilter01.lnk'
-               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Demos\\\\creatisViewing01.lnk'
-               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Demos\\\\creatisShowNPoints.lnk'
-        StrCpy $MUI_TEMP '$SMPROGRAMS\\\\$MUI_TEMP\\\\Demos'
-               RMDir $MUI_TEMP
-
                !define Uninstall_EnvStr_RegKey 'HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\"'                 
                WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'CREATOOLS_DIRS' ''             
                SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 
@@ -188,15 +195,17 @@ IF (WIN32)
 #INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_THIRDPARTY_DLLS}\\\\bin/                         DESTINATION "${CREATOOLS_DESTINATION_PATH}/bin" )
 #INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_THIRDPARTY_LIBRARIES}\\\\Library/        DESTINATION ${CREATOOLS_DESTINATION_PATH} )
 
-INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BASE}/                                                    DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
-INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BBTK}/                                                    DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
-INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_IMAGEIO}/                                                 DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
-INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_MARACASVISU}/                                             DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
-INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_CONTOURS}/                                                DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
-INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_ENVIRIONMENT}/                                    DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
-INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_RECALAGE}/                                                DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
-INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BRUKER}/                                                  DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
-INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_IRM}/                                                     DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
+INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/bin/                                                   DESTINATION bin  )
+INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/data/                                                  DESTINATION bin/data  )
+INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BASE}/                    DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
+INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BBTK}/                    DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
+INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_IMAGEIO}/                         DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
+INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_MARACASVISU}/             DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
+INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_CONTOURS}/                DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
+INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_ENVIRIONMENT}/    DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
+INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_RECALAGE}/                DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
+INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BRUKER}/                  DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
+INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_IRM}/                             DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 ENDIF (WIN32)