Mercurial > hg > orthanc-stone
changeset 1029:0f100d0b9caf
merge
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 04 Oct 2019 21:58:30 +0200 |
parents | 6d5382fa45e1 (diff) 7912de3a15e0 (current diff) |
children | 7b89e88bb66e |
files | |
diffstat | 3 files changed, 22 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/Framework/Toolbox/DicomInstanceParameters.cpp Fri Oct 04 17:47:31 2019 +0200 +++ b/Framework/Toolbox/DicomInstanceParameters.cpp Fri Oct 04 21:58:30 2019 +0200 @@ -339,11 +339,11 @@ Orthanc::ImageProcessing::Convert(*converted, pixelData); // Correct rescale slope/intercept if need be - data_.ApplyRescale(*converted, (pixelData.GetFormat() == Orthanc::PixelFormat_Grayscale32)); + //data_.ApplyRescale(*converted, (pixelData.GetFormat() == Orthanc::PixelFormat_Grayscale32)); + data_.ApplyRescale(*converted, false); return converted.release(); } - TextureBaseSceneLayer* DicomInstanceParameters::CreateTexture
--- a/Resources/CMake/OrthancStoneConfiguration.cmake Fri Oct 04 17:47:31 2019 +0200 +++ b/Resources/CMake/OrthancStoneConfiguration.cmake Fri Oct 04 21:58:30 2019 +0200 @@ -106,7 +106,7 @@ if (ENABLE_SDL AND ENABLE_QT) - message("SDL and QT may not be defined together") + message("SDL and QT cannot not be enabled together") elseif(ENABLE_SDL) message("SDL is enabled") include(${CMAKE_CURRENT_LIST_DIR}/SdlConfiguration.cmake) @@ -267,10 +267,13 @@ endif() if (ENABLE_SDL OR ENABLE_QT) - list(APPEND APPLICATIONS_SOURCES - ${ORTHANC_STONE_ROOT}/Applications/Generic/NativeStoneApplicationRunner.cpp - ${ORTHANC_STONE_ROOT}/Applications/Generic/NativeStoneApplicationContext.cpp - ) + if (ENABLE_STONE_DEPRECATED) + list(APPEND APPLICATIONS_SOURCES + ${ORTHANC_STONE_ROOT}/Applications/Generic/NativeStoneApplicationRunner.cpp + ${ORTHANC_STONE_ROOT}/Applications/Generic/NativeStoneApplicationContext.cpp + ) + endif() + if (ENABLE_SDL) list(APPEND APPLICATIONS_SOURCES ${ORTHANC_STONE_ROOT}/Applications/Sdl/SdlCairoSurface.cpp
--- a/Resources/CMake/QtConfiguration.cmake Fri Oct 04 17:47:31 2019 +0200 +++ b/Resources/CMake/QtConfiguration.cmake Fri Oct 04 21:58:30 2019 +0200 @@ -58,17 +58,26 @@ endif() + list(APPEND QT_SOURCES ${ORTHANC_STONE_ROOT}/Applications/Qt/QCairoWidget.cpp - ${ORTHANC_STONE_ROOT}/Applications/Qt/QtStoneApplicationRunner.cpp - ${ORTHANC_STONE_ROOT}/Applications/Qt/QStoneMainWindow.cpp ) ORTHANC_QT_WRAP_CPP(QT_SOURCES ${ORTHANC_STONE_ROOT}/Applications/Qt/QCairoWidget.h - ${ORTHANC_STONE_ROOT}/Applications/Qt/QStoneMainWindow.h ) +if (ENABLE_STONE_DEPRECATED) + list(APPEND QT_SOURCES + ${ORTHANC_STONE_ROOT}/Applications/Qt/QtStoneApplicationRunner.cpp + ${ORTHANC_STONE_ROOT}/Applications/Qt/QStoneMainWindow.cpp + ) + + ORTHANC_QT_WRAP_CPP(QT_SOURCES + ${ORTHANC_STONE_ROOT}/Applications/Qt/QStoneMainWindow.h + ) +endif() + # NB: Including CMAKE_CURRENT_BINARY_DIR is mandatory, as the CMake # macros for Qt will put their result in that directory, which cannot