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

Jump to bottom

Fix Qt4/C++98 build #1005

Merged
merged 28 commits into from
Jul 13, 2023
Merged

Fix Qt4/C++98 build #1005

merged 28 commits into from
Jul 13, 2023

Commits on Jul 11, 2023

  1. COMP: Update ctkCompilerDetections_p.h to include CTK_OVERRIDE

    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    677876c View commit details
    Browse the repository at this point in the history

  2. COMP: Fix Qt4/C++98 build updating Widget & DICOM libraries to use CT… 

    …K_OVERRIDE
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    a1f07fc View commit details
    Browse the repository at this point in the history

  3. COMP: Fix Qt4/C++98 build using '> >' instead of '>>' in nested templ… 

    …ates

This commit fixes build errors like the following:

  /path/to/CTK/Libs/DICOM/Core/ctkDICOMQuery.cpp:243:28: error: ‘>>’ should be ‘> >’ within a nested template argument list
   QList<QPair<QString,QString>> ctkDICOMQuery::studyAndSeriesInstanceUIDQueried()const
                              ^
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    83b6046 View commit details
    Browse the repository at this point in the history

  4. COMP: Update ctkWrapPythonQt script to consider CTK_NULLPTR

    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    6c97b7b View commit details
    Browse the repository at this point in the history

  5. COMP: Fix Qt4/C++98 build using CTK_NULLPTR instead of nullptr

    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    098f45f View commit details
    Browse the repository at this point in the history

  6. COMP: Fix Qt4/C++98 ctkDICOMBrowser build error using ctk::isDirEmpty 

    The function "QDir::isEmpty" was introduced in Qt 5.9.
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    6a8635c View commit details
    Browse the repository at this point in the history

  7. COMP: Fix Qt4/C++98 build using explicit trivial destructor implement… 

    …ation
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    a76e200 View commit details
    Browse the repository at this point in the history

  8. COMP: Fix Qt4 ctkDICOMQuery build error simplifying setting of Q_PROP… 

    …ERTY

See https://stackoverflow.com/questions/12689162/qt-q-property-with-template-accessors
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    15b8371 View commit details
    Browse the repository at this point in the history

  9. COMP: Fix Qt4/C++98 build of DICOMCore using Q_FOREACH

    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    2c97eed View commit details
    Browse the repository at this point in the history

  10. COMP: Fix Qt4/C++98 ctkDICOMIndexerPrivate build using literal signal… 

    …/slot
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    a0b3944 View commit details
    Browse the repository at this point in the history

  11. COMP: Fix Qt4/C++98 ctkDICOMTableView build error due to missing QJso… 

    …nObject

This commit exclude the parsing of "formatForField" and instead reported
the warning indicating that the specified format string failed to be
decoded from json.
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    85943cc View commit details
    Browse the repository at this point in the history

  12. COMP: Fix Qt4 ctkDICOMTableView build error using setResizeMode

    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    d29dc0f View commit details
    Browse the repository at this point in the history

  13. COMP: Fix Qt4 ctkDICOMBrowser build error using QStringLiteral

    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    f553aee View commit details
    Browse the repository at this point in the history

  14. COMP: Fix Qt4/C++98 ctkDICOMBrowser and ctkDICOMTableView 

    This commit updates the implementation to account for changes introduced
in PR commontk#1002 (ENH: Add API to select items in the DICOM browser)
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    f37ccdd View commit details
    Browse the repository at this point in the history

  15. COMP: Update ITK to support building against C++98 

    Conditionally select ITK version based on selected CMAKE_CXX_STANDARD.
If CMAKE_CXX_STANDARD is C++98, set revision tag to v4.13.3 as it is
the latest version supporting it.
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    5648eed View commit details
    Browse the repository at this point in the history

  16. COMP: Update ctkVTKMagnifyViewTest1 to support building against VTK >… 

    …= 8.90

Adapted from CTK@48e4a3f38 (COMP: Add support for building against VTK >= 8.90)
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    5517b2f View commit details
    Browse the repository at this point in the history

  17. COMP: Update ctkVTKOpenGLNativeWidget to fix build against VTK 8 

    This commit re-introduces the QVTKWidget implementation inadvertently
removed in 48e4a3f (COMP: Add support for building against VTK >= 8.90).
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    5e2f232 View commit details
    Browse the repository at this point in the history

  18. COMP: Update ctkVTKChartView to fix build against VTK 8 

    This commit fixes a regression introduced in 58f4038 (ENH: Add access
to render window in ctkVTKChartView)
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    6db997e View commit details
    Browse the repository at this point in the history

  19. COMP: Update external projects to consistently display revision_tag

    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    08cb4d7 View commit details
    Browse the repository at this point in the history

  20. COMP: Update (qImageToVTK|qImageTo)VTKImageData to fix build against … 

    …VTK8/Qt4

This commit fixes a regression introduced in 0a1f9c1 (ENH: Add
qImageToVTKImageData to ctkVTKWidgetsUtils) by reporting a warning
if a 4-component image is being converted.
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    9e7b7ae View commit details
    Browse the repository at this point in the history

  21. COMP: Update ctkVTKSurfaceMaterialPropertyWidget to fix build against… 

    … VTK8/Qt4

This commit fixes a regression introduced in 7b48c48 (ENH: Add support
for PBR material properties in material property widgets) by reporting
a warning if Metallic or Roughness properties are set.
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    a2c6e3e View commit details
    Browse the repository at this point in the history

  22. COMP: Display name and value of CTK library options during configuration 

    For example:

[...]
-- CTK_LIB_Core_WITH_BFD_SHARED is OFF
-- CTK_LIB_Core_WITH_BFD_STATIC is OFF
-- CTK_LIB_Visualization/VTK/Widgets_USE_TRANSFER_FUNCTION_CHARTS is ON
[...]
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    69b52e5 View commit details
    Browse the repository at this point in the history

  23. COMP: Update ctkDICOMQueryRetrieveWidget to fix build against Qt4/C++98 

    Since C++98 doesn't support the auto keyword or lambdas, the following
workarounds are implemented:

1. The type of the currentStudyAndSeriesUIDPair variable is explicitly
   specified as StudyAndSeriesInstanceUIDPairList::iterator.

2. The macro Q_FOREACH macro is used instead of the "for-each loop".

3. A struct called FindBySeriesUID is introduced to be used a functor
   representing the predicate used in std::find_if.

4. Ensure compatibility with across C++ standard using QList, QPair
   and qMakePair
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    f97694e View commit details
    Browse the repository at this point in the history

  24. COMP: Fix Qt4/C++98 ctkDICOMBrowser build error due to protected signal 

    Fixes the following error:

  /path/to/CTK/Libs/DICOM/Core/ctkDICOMDatabase.h: In member function ‘void ctkDICOMBrowser::onRepairAction()’:
  /path/to/CTK/Libs/DICOM/Core/ctkDICOMDatabase.h:425:8: error: ‘void ctkDICOMDatabase::databaseChanged()’ is protected
     void databaseChanged();
          ^
  /path/to/CTK/Libs/DICOM/Widgets/ctkDICOMBrowser.cpp:928:37: error: within this context
     d->DICOMDatabase->databaseChanged();
                                       ^
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    a73dfdd View commit details
    Browse the repository at this point in the history

  25. COMP: Fix Qt4/C++98 build for ctkDICOM(ThumbnailGenerator|ObjectListW… 

    …idget)
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    d93e4fa View commit details
    Browse the repository at this point in the history

  26. COMP: Update ctkVTKAbstractViewTest1 to fix build against VTK 8

    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    981d69d View commit details
    Browse the repository at this point in the history

  27. COMP: Fix Qt4/C++98 ctkPythonConsole build by explicitly comparing wi… 

    …th QChar

This commit fixes errors like the following introduced
in 08461b3 (ENH: Improve Python autocomplete list ordering)

Error:

  /path/to/CTK/Libs/Scripting/Python/Widgets/ctkPythonConsole.cpp:379:18: error: conversion from ‘const char [2]’ to ‘QChar’ is ambiguous
       if (s1[0] != "_" && s2[0] == "_")
                    ^
    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    1fb68d7 View commit details
    Browse the repository at this point in the history

  28. COMP: Fix Qt4/C++98 build updating ctkPythonConsole to use CTK_OVERRIDE

    @jcfr
    jcfr committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    3ab450d View commit details
    Browse the repository at this point in the history