Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on May 27, 2014
  1. Sascha Zelzer

    Merge branch 'qt5'

    saschazelzer authored
    * qt5:
      Fix Qt5 dependencies in case only CTK_BUILD_ALL is enabled.
      Use Qt5 compatible qRestAPI version.
      Make more libs and apps compatible with Qt5.
      Do not assume a specific Qt5 install structure.
      Qt5 compatibility for almost all libraries.
      Use Qt5 CMake 2.8.12 features.
      Add support for Qt5
      This commit enables Qt5 support for the CTK Core library, issue #277.
      First set of build system patches for Qt5 support.
  2. Sascha Zelzer
Commits on May 16, 2014
  1. Jean-Christophe Fillion-Robin

    Do not set unused CMake build function parameter INCLUDE_DIRECTORIES

    jcfr authored
    Following previous commit, the INCLUDE_DIRECTORIES parameter
    has no effect.
Commits on May 7, 2014
  1. Sascha Zelzer

    Merge remote-tracking branch 'j2/add-qt5-support' into qt5

    saschazelzer authored
    Conflicts:
    	CMake/CTKConfig.cmake.in
    	CMake/ctkMacroBuildLib.cmake
    	CMake/ctkMacroBuildPlugin.cmake
    	CMake/ctkMacroBuildQtPlugin.cmake
    	CMake/ctkMacroGenerateMocs.cmake
    	CMake/ctkMacroSetupQt.cmake
    	CMake/ctkMacroWrapPythonQt.cmake
    	CMake/ctkScriptWrapPythonQt_Light.cmake
    	CMakeExternals/PythonQt.cmake
    	CMakeExternals/VTK.cmake
    	Libs/Core/Testing/Cpp/CMakeLists.txt
    	Libs/Core/Testing/Cpp/ctkAbstractLibraryFactoryTest1.cpp
    	Libs/Core/ctkAbstractLibraryFactory.h
    	Libs/Core/ctkAbstractLibraryFactory.tpp
    	Libs/Core/ctkCheckableModelHelper.cpp
    	Libs/Core/ctkErrorLogQtMessageHandler.cpp
    	Libs/Core/ctkErrorLogQtMessageHandler.h
    	Libs/Testing/ctkTest.h
    	Libs/Widgets/Testing/Cpp/CMakeLists.txt
    	Libs/Widgets/ctkCoordinatesWidget.h
    	Libs/Widgets/ctkMaterialPropertyPreviewLabel.cpp
    	Libs/Widgets/ctkPopupWidget.cpp
    	SuperBuild.cmake
Commits on Nov 4, 2013
  1. Marco Nolden
Commits on Sep 20, 2013
  1. Julien Finet

    Add support for Qt5

    finetjul authored
    Todo:
    * Test with Qt4
    * Make sure ctkMacroWrapPythonQt.cmake works correctly
Commits on May 23, 2013
  1. Marco Nolden
Commits on May 21, 2013
  1. Ivo Wolf

    Merge branch 'dah'

    ivowolf authored
    * dah: (64 commits)
      Show something in case of non-DICOM data is received
      Class with example logic for a simple host
      Allow transfer of nrrd files
      Fix getAbsolutePosition() providing position for hosted app
      Allow access to HostInterface
      Adapted to changed interface of CommandLineModule
      Do not send the same AvailableData more than once
      Clean incoming data when other side is gone
      Fix namespace-related compile error in hosting types
      First demo of successful processing by ctkCLIModuleTour inside hosted app
      WIP calling ctkCLIModuleTour from DAH app
      Call to publishSelectedData must be queued because it calls hosted app
      Fixed type of acceptableTransferSyntaxUIDs
      GUI changes
      Temporary fix of return value
      Initial try to pass received data to CLModule
      Hosted app encapsulating CommandLineModules
      Do not try to exit app which has already exited unexpectedly
      Pass additional args to plugins in dah.args property
      Allow providing which DicomAppInterface plugin is to be used
      ...
Commits on May 5, 2013
  1. Steve Pieper
Commits on Apr 21, 2013
  1. Sascha Zelzer
  2. Sascha Zelzer

    Fixed Windows warnings.

    saschazelzer authored
Commits on Apr 19, 2013
  1. Sascha Zelzer
  2. Sascha Zelzer
Commits on Apr 16, 2013
  1. Miklos Espak
Commits on Dec 14, 2012
  1. Ivo Wolf
  2. Ivo Wolf
Commits on Dec 13, 2012
  1. Ivo Wolf

    Allow transfer of nrrd files

    ivowolf authored
  2. Steve Pieper

    Fix namespace-related compile error in hosting types

    pieper authored
    On mac, with clang, operators need to be inside namespace
    in order to compile.
    
    #83 CTK-superbuild $ /usr/bin/c++ --version
    Apple clang version 4.0 (tags/Apple/clang-421.0.60) (based on LLVM 3.1svn)
    Target: x86_64-apple-darwin12.2.0
    Thread model: posix
  3. Ivo Wolf
  4. Ivo Wolf

    Allow access to HostInterface

    ivowolf authored
  5. Ivo Wolf
Commits on Dec 11, 2012
  1. Ivo Wolf

    Merge commit 'f25f19e5' into dah

    ivowolf authored
    Conflicts:
    	Libs/CommandLineModules/Core/ctkCmdLineModuleInstance.cpp
    	Libs/CommandLineModules/Core/ctkCmdLineModuleInstance.h
    	Libs/CommandLineModules/Testing/Modules/Tour/ctkCmdLineModuleTour.cpp
  2. Ivo Wolf
  3. Ivo Wolf
  4. Steve Pieper

    Fix namespace-related compile error in hosting types

    pieper authored
    On mac, with clang, operators need to be inside namespace
    in order to compile.
    
    #83 CTK-superbuild $ /usr/bin/c++ --version
    Apple clang version 4.0 (tags/Apple/clang-421.0.60) (based on LLVM 3.1svn)
    Target: x86_64-apple-darwin12.2.0
    Thread model: posix
Commits on Sep 1, 2012
  1. Sascha Zelzer
Commits on Jul 15, 2012
  1. Ivo Wolf
Commits on Jul 13, 2012
  1. Ivo Wolf
Commits on Jul 12, 2012
  1. Ivo Wolf
  2. Ivo Wolf
  3. Ivo Wolf

    GUI changes

    ivowolf authored
  4. Ivo Wolf
Commits on Jul 11, 2012
  1. Ivo Wolf
  2. Ivo Wolf
Commits on Jul 10, 2012
  1. Sascha Zelzer

    Merge remote-tracking branch 'origin/cli-module-support' into dah

    saschazelzer authored
    Conflicts:
    	CMakeLists.txt
    	Libs/DICOM/Widgets/ctkDICOMAppWidget.h
    	Plugins/org.commontk.dah.core/CMakeLists.txt
    	Plugins/org.commontk.dah.core/ctkDicomObjectLocatorCache.cpp
    	Plugins/org.commontk.dah.exampleapp/CMakeLists.txt
    	Plugins/org.commontk.dah.exampleapp/manifest_headers.cmake
    	Plugins/org.commontk.dah.examplehost/CMakeLists.txt
    	Plugins/org.commontk.dah.examplehost/ctkExampleDicomHost.h
    	Plugins/org.commontk.dah.hostedapp/CMakeLists.txt
    	Plugins/org.commontk.dah.hostedapp/ctkDicomAppPlugin.cpp
Something went wrong with that request. Please try again.