Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DCMTK] switch to version 3.6.7 #10

Draft
wants to merge 27 commits into
base: master
Choose a base branch
from
Draft

[DCMTK] switch to version 3.6.7 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
a14e5b5
Port to ITK5
Florent2305 Jul 5, 2019
85f79a8
Few modifications to obtain responses from pacs DCM4CHEE 5
Florent2305 Dec 13, 2019
d8475a3
continue
Florent2305 Dec 13, 2019
9e901d6
Correct signal emission for qtdcm
ocommowi Dec 13, 2019
076dadb
Remove unwanted debug bad traces
Florent2305 Dec 13, 2019
58ed10f
Merge pull request #1 from medInria/DicomStandarMoreComplient
Florent2305 Dec 14, 2019
f866679
Somme corrections:
Florent2305 Feb 13, 2020
9ec9b71
Improve support of long path or with non ASCII-7 characters on MS-Win…
Florent2305 Mar 20, 2020
61e256d
Merge pull request #2 from Florent2305/APHP
Florent2305 Mar 26, 2020
a3d850a
Avoid ambiguous constructor call
Florent2305 Mar 26, 2020
bfa1268
[FIX] Query Sintax + allow extended selection on patients/studies/series
juliencastelneau Dec 18, 2020
abac49f
[UPDATE UI + C-FIND]
juliencastelneau Jan 15, 2021
98df853
[UPDATE MOVE]
juliencastelneau Jan 15, 2021
d77cbdc
[FIX] - Default : Search study with StudyDate=
juliencastelneau Jan 25, 2021
75571ff
[FIX] - Dicom Range Matching http://dicom.nema.org/medical/Dicom/2017…
juliencastelneau Jan 25, 2021
bd49b3e
Merge pull request #4 from juliencastelneau/Fix_Query_APHP
Florent2305 Jan 25, 2021
5539d7a
[FIX] - C-FIND Series Level with Study Query Retrieve Information Mod…
juliencastelneau Jan 27, 2021
9995f42
Merge pull request #5 from juliencastelneau/FIX_QueryRetrieveInfoModel
Florent2305 Jan 27, 2021
4ea2054
1/ List dataToImport was too much cleared and there was not all the d…
juliencastelneau Feb 4, 2021
b69492c
Merge pull request #6 from juliencastelneau/MoveAndProgressBar
Florent2305 Feb 5, 2021
4540326
[DEV] - Send metadata from Find to external app (medInria for instanc…
juliencastelneau Mar 4, 2021
3321871
[NEW] Change trigger on textEdit Filters (seriesDesc, studyDesc, pati…
juliencastelneau Mar 4, 2021
685db15
[PR] Apply changes from Flo L.
juliencastelneau Mar 12, 2021
8c23dc3
Merge pull request #7 from juliencastelneau/FetchData
juliencastelneau Mar 12, 2021
92c6207
[DCMTK] adapt to DCMTK 3.6.7
mathildemerle Jul 3, 2023
9cd41d8
[QtDCM] dcmtk link 3.6.7
mathildemerle Jul 11, 2023
93a58b7
[DCMTK] include dir
mathildemerle Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.0.2)

project(QTDCM VERSION "2.1.1")
project(QTDCM VERSION "2.1.2")

option(BUILD_EXAMPLE "Build qtdcm example application" OFF)
option(BUILD_DOCUMENTATION "Build QtDcm Documentation (add a Documentation target)" OFF)
Expand Down
3 changes: 0 additions & 3 deletions cmake/FindDCMTK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,8 @@ endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(DCMTK DEFAULT_MSG
DCMTK_config_INCLUDE_DIR
DCMTK_ofstd_INCLUDE_DIR
DCMTK_ofstd_LIBRARY
DCMTK_dcmdata_INCLUDE_DIR
DCMTK_dcmdata_LIBRARY
DCMTK_dcmimgle_INCLUDE_DIR
DCMTK_dcmimgle_LIBRARY)

# Compatibility: This variable is deprecated
Expand Down
8 changes: 7 additions & 1 deletion externals/dcmtk.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ endif()
set(DCMTK_SOURCE_DIR "${DCMTK_SOURCE_DIR}" CACHE PATH "" FORCE)
set(DCMTK_DIR "${DCMTK_DIR}" CACHE PATH "" FORCE)

if (WIN32)
set(DCMTK_WIDE_CHAR_FILE_IO_FUNCTIONS ON)
else()
set(DCMTK_WIDE_CHAR_FILE_IO_FUNCTIONS OFF)
endif()

ExternalProject_Add(
dcmtk

Expand All @@ -19,7 +25,7 @@ ExternalProject_Add(

SOURCE_DIR "${DCMTK_SOURCE_DIR}"
BINARY_DIR "${DCMTK_DIR}"
CMAKE_ARGS -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_APPS:BOOL=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDCMTK_WITH_ZLIB:BOOL=OFF
CMAKE_ARGS -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_APPS:BOOL=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDCMTK_WITH_ZLIB:BOOL=OFF -DDCMTK_WIDE_CHAR_FILE_IO_FUNCTIONS:BOOL=${DCMTK_WIDE_CHAR_FILE_IO_FUNCTIONS}

INSTALL_COMMAND ""
TEST_COMMAND ""
Expand Down
23 changes: 21 additions & 2 deletions externals/itk.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,34 @@
message("${Esc}[32mConfiguring ITK external library${Esc}[m")

## #############################################################################
## Look for Git
## #############################################################################
find_program(GIT_BIN NAMES git)
if (NOT GIT_BIN)
find_package(Git)
if(Git_FOUND)
set(GIT_BIN ${GIT_EXECUTABLE})
else()
message(SEND_ERROR "You need to install Git and add it to the PATH environment variable.")
endif()
else()
mark_as_advanced(GIT_BIN)
endif()

if("${ITK_DIR}" STREQUAL "")
set(ITK_DIR ${PROJECT_BINARY_DIR}/externals/itk-build)
endif()

set(ITK_DIR "${ITK_DIR}" CACHE PATH "" FORCE)

set(git_url https://github.com/InsightSoftwareConsortium/ITK.git)
set(git_tag v5.0.0)

ExternalProject_Add(
itk

URL https://sourceforge.net/projects/itk/files/itk/4.13/InsightToolkit-4.13.0.tar.gz
GIT_REPOSITORY ${git_url}
GIT_TAG ${git_tag}

CMAKE_GENERATOR Ninja

Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ set(${PROJECT_NAME}_LIBRARIES
Qt5::Core
Qt5::Widgets
Qt5::Network
${DCMTK_LIBRARIES}
ITKIOImageBase
ITKCommon
ITKIOBMP
Expand All @@ -123,6 +122,7 @@ set(${PROJECT_NAME}_LIBRARIES
ITKIOGE
ITKIOGIPL
ITKIOJPEG
ITKIOJPEG2000
ITKIOLSM
ITKIOMeta
ITKIOMINC
Expand Down
Loading