From: Benoît Presles Date: Thu, 7 Mar 2013 10:09:48 +0000 (+0100) Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk X-Git-Tag: v1.4.0~239^2~2 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a38cbef785cec049a583cdfe98dacf4eed8bac0f;hp=9f81c263e76128ccf1e1eb993b090191448bf77d;p=clitk.git Merge branch 'master' of git.creatis.insa-lyon.fr:clitk --- diff --git a/common/clitkEsrfHstImageIO.cxx b/common/clitkEsrfHstImageIO.cxx index 8023ddd..e9b8fdf 100644 --- a/common/clitkEsrfHstImageIO.cxx +++ b/common/clitkEsrfHstImageIO.cxx @@ -79,7 +79,7 @@ bool clitk::EsrfHstImageIO::CanReadFile(const char* FileNameToRead) std::string firstLine; std::getline(is, firstLine); - if(firstLine != std::string("") ) + if(firstLine.find( std::string("") ) == std::string::npos) return false; return true; diff --git a/registration/CMakeLists.txt b/registration/CMakeLists.txt index 64b55dc..1bf1bf5 100644 --- a/registration/CMakeLists.txt +++ b/registration/CMakeLists.txt @@ -44,7 +44,6 @@ IF(CLITK_BUILD_REGISTRATION) TARGET_LINK_LIBRARIES(clitkConvertBSplineDeformableTransformToVF clitkCommon ${ITK_LIBRARIES}) SET(REGISTRATION_INSTALL ${REGISTRATION_INSTALL} clitkConvertBSplineDeformableTransformToVF) -# SET_TARGET_PROPERTIES(${REGISTRATION_INSTALL} PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}" ) INSTALL (TARGETS ${REGISTRATION_INSTALL} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) ENDIF(CLITK_BUILD_REGISTRATION) diff --git a/segmentation/CMakeLists.txt b/segmentation/CMakeLists.txt index 2e1ddac..64adbd9 100644 --- a/segmentation/CMakeLists.txt +++ b/segmentation/CMakeLists.txt @@ -50,7 +50,6 @@ IF(CLITK_BUILD_SEGMENTATION) ADD_EXECUTABLE(clitkRegionGrowing clitkRegionGrowing.cxx ${clitkRegionGrowing_GGO_C} ${clitkRelativePosition_GGO_C}) TARGET_LINK_LIBRARIES(clitkRegionGrowing clitkCommon ${ITK_LIBRARIES}) -# SET_TARGET_PROPERTIES(${SEGMENTATION_INSTALL} PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}" ) INSTALL (TARGETS ${SEGMENTATION_INSTALL} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) ENDIF(CLITK_BUILD_SEGMENTATION) diff --git a/superbuild/CMakeLists.txt b/superbuild/CMakeLists.txt index e62c630..df23773 100644 --- a/superbuild/CMakeLists.txt +++ b/superbuild/CMakeLists.txt @@ -62,6 +62,7 @@ ExternalProject_Add( -no-libtiff -no-libjpeg -no-libmng + -no-glib INSTALL_COMMAND "" ) SET(qmake_executable "${build_prefix}/QT/bin/qmake") diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 7193772..862148a 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -223,6 +223,11 @@ IF (CLITK_BUILD_TOOLS) TARGET_LINK_LIBRARIES(clitkTransformLandmarks clitkCommon ${ITK_LIBRARIES}) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkTransformLandmarks) + WRAP_GGO(clitkMaskLandmarks_GGO_C clitkMaskLandmarks.ggo) + ADD_EXECUTABLE(clitkMaskLandmarks clitkMaskLandmarks.cxx ${clitkMaskLandmarks_GGO_C}) + TARGET_LINK_LIBRARIES(clitkMaskLandmarks clitkCommon ${ITK_LIBRARIES}) + SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMaskLandmarks) + ADD_EXECUTABLE(clitkMakeSphereImage clitkMakeSphereImage.cxx) # clitkLineProfileGenericFilter.cxx ${clitkLineProfile_GGO_C}) TARGET_LINK_LIBRARIES(clitkMakeSphereImage clitkCommon ${ITK_LIBRARIES}) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMakeSphereImage) @@ -268,7 +273,6 @@ IF (CLITK_BUILD_TOOLS) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDicomRTPlan2Gate) ENDIF(ITK_VERSION_MAJOR VERSION_LESS 4) -# SET_TARGET_PROPERTIES(${TOOLS_INSTALL} PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}" ) INSTALL (TARGETS ${TOOLS_INSTALL} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDIF(CLITK_BUILD_TOOLS) diff --git a/tools/clitkBinarizeImage.ggo b/tools/clitkBinarizeImage.ggo index c99af0f..dfc37b8 100644 --- a/tools/clitkBinarizeImage.ggo +++ b/tools/clitkBinarizeImage.ggo @@ -14,6 +14,6 @@ option "upper" u "Upper intensity (default=max), fg is lower than this va option "fg" - "Foreground (FG) or 'inside' value" double no default="1" option "bg" - "Background (BG) or 'ouside' value" double no default="0" -option "mode" - "Use FG and/or BG values (if FG, the BG is replaced by the input image values)" values="FG","BG","both" default="both" +option "mode" - "Use FG and/or BG values (if FG, the BG is replaced by the input image values)" values="FG","BG","both" no default="both" diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt index c37c3f6..0f95400 100644 --- a/vv/CMakeLists.txt +++ b/vv/CMakeLists.txt @@ -235,25 +235,8 @@ TARGET_LINK_LIBRARIES(vv vvLib) #========================================================= # Install options (also used by CPack) -IF(UNIX OR APPLE) -# SET_TARGET_PROPERTIES(vv -# PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}") - INSTALL (TARGETS vv DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) - # INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION .) +INSTALL (TARGETS vv DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) - #QT - #FOREACH(LIB QtCore QtGui QtOpenGL QtNetwork QtSql) - # INSTALL(FILES "${QT_LIBRARY_DIR}/lib${LIB}.so.${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}" - # RENAME "lib${LIB}.so.${QT_VERSION_MAJOR}" - # DESTINATION .) - #ENDFOREACH(LIB) -ENDIF(UNIX OR APPLE) - -IF(WIN32) - #INCLUDE(InstallRequiredSystemLibraries) - INSTALL(TARGETS vv DESTINATION bin) - #INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION .) -ENDIF(WIN32) #========================================================= #========================================================= @@ -267,7 +250,11 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/License.txt") SET(CPACK_PACKAGE_VERSION_MAJOR "1") SET(CPACK_PACKAGE_VERSION_MINOR "3") SET(CPACK_PACKAGE_VERSION_PATCH "0") -SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv") +IF(NIGHTLY) + SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv-nightly") +ELSE(NIGHTLY) + SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv") +ENDIF(NIGHTLY) SET(CPACK_STRIP_FILES TRUE) IF(WIN32) @@ -275,11 +262,15 @@ IF(WIN32) # sure there is at least one set of four (4) backlasshes. SET(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\icons\\\\ducky.ico") SET(CPACK_NSIS_INSTALLED_ICON_NAME "vv.exe") +IF(NIGHTLY) + SET(CPACK_NSIS_DISPLAY_NAME "vv - The 4D slicer (nightly)") +ELSE(NIGHTLY) SET(CPACK_NSIS_DISPLAY_NAME "vv - The 4D slicer") +ENDIF(NIGHTLY) SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/rio/vv") SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/rio") SET(CPACK_NSIS_CONTACT "vv@creatis.insa-lyon.fr") - SET(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\vv.lnk\\\" \\\"$INSTDIR\\\\vv.exe\\\" ") + SET(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\vv.lnk\\\" \\\"$INSTDIR\\\\bin\\\\vv.exe\\\" ") SET(CPACK_NSIS_DELETE_ICONS_EXTRA "Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\vv.lnk\\\" ") #SET(CPACK_NSIS_MODIFY_PATH ON) SR: buggy, wait for cmake updates for a fix #SET(CPACK_BINARY_ZIP ON) diff --git a/vv/qt_ui/vvMainWindow.ui b/vv/qt_ui/vvMainWindow.ui index 67a467d..b80a782 100644 --- a/vv/qt_ui/vvMainWindow.ui +++ b/vv/qt_ui/vvMainWindow.ui @@ -441,7 +441,7 @@ - 1 + 0 diff --git a/vv/vvSlicer.cxx b/vv/vvSlicer.cxx index 30a8f10..ed53d2c 100644 --- a/vv/vvSlicer.cxx +++ b/vv/vvSlicer.cxx @@ -155,6 +155,7 @@ vvSlicer::vvSlicer() mConcatenatedTransform = vtkSmartPointer::New(); mConcatenatedFusionTransform = vtkSmartPointer::New(); mConcatenatedOverlayTransform = vtkSmartPointer::New(); + mFirstSetSliceOrientation = true; } //------------------------------------------------------------------------------ @@ -853,15 +854,17 @@ void vvSlicer::SetSliceOrientation(int orientation) // DDV(cursorPos, 3); // SetCurrentPosition(cursorPos[0],cursorPos[1],cursorPos[2],cursorPos[3]); - if (this->Renderer && this->GetInput()) { + if (mFirstSetSliceOrientation) { + int *range = this->GetSliceRange(); + if (range) + this->Slice = static_cast((range[0] + range[1]) * 0.5); + mFirstSetSliceOrientation = false; + } + else if (this->Renderer && this->GetInput()) { double s = mCursor[orientation]; double sCursor = (s - this->GetInput()->GetOrigin()[orientation])/this->GetInput()->GetSpacing()[orientation]; this->Slice = static_cast(sCursor); } - -// int *range = this->GetSliceRange(); -// if (range) -// this->Slice = static_cast((range[0] + range[1]) * 0.5); this->UpdateOrientation(); this->UpdateDisplayExtent(); diff --git a/vv/vvSlicer.h b/vv/vvSlicer.h index 570c43d..0bffd1f 100644 --- a/vv/vvSlicer.h +++ b/vv/vvSlicer.h @@ -297,5 +297,6 @@ private: bool mOverlayVisibility; bool mFusionVisibility; bool mVFVisibility; + bool mFirstSetSliceOrientation; }; #endif