Fix Qt4/C++98 build #1005
Fix Qt4/C++98 build #1005
Conversation
Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorStudyNumberOfSeriesRule.h
Show resolved
Hide resolved
|
@jcfr Do you think you would be able to finalize the last changes based on the comments here? Then per your comment #947 (comment), we can proceed with removing Qt4 support (#1006) and proceed supporting Qt5 and Qt6. |
|
CircleCI checks passed. The CommitCheck status check reminded me we could probably change to the GitHub action like we use in the Slicer repo https://github.com/Slicer/Slicer/blob/main/.github/workflows/commit-message.yml |
|
Re: commit check Re: status |
|
I assume Qt4 support is no longer needed. I'm closing this to clean up the pull request list. |
|
@lassoan It appeared @jcfr had plans (see #947 (comment)) to make Qt4 work one last time before it was to be removed in #1006. Then the goal was to enable Qt 6 support. |
|
Thanks for the note. I closed the pull request because I saw was open since November 2021. I did not notice that the last update was relatively recent. The branch is still there, so @jcfr can still reopen the pull request, but it is hard to imagine a scenario where investing into better Qt4 support makes sense (especially if it delays the transition to Qt6). |
|
The branch has been updated and is in its final round of QA. Currently building locally CTK with all options enabled against Qt4/VTK8 and Qt5/VTK9, I will follow up once this is completed. |
jcfr
force-pushed
the
fix-qt4-build
branch
2 times, most recently
from
43a9b01
to
e13d520
Compare
jcfr
force-pushed
the
fix-qt4-build
branch
2 times, most recently
from
56c7963
to
42d36c7
Compare
jamesobutler
force-pushed
the
fix-qt4-build
branch
from
42d36c7
to
714117a
Compare
…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
^
…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.
This commit updates the implementation to account for changes introduced in PR commontk#1002 (ENH: Add API to select items in the DICOM browser)
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.
…= 8.90 Adapted from CTK@48e4a3f38 (COMP: Add support for building against VTK >= 8.90)
This commit re-introduces the QVTKWidget implementation inadvertently removed in 48e4a3f (COMP: Add support for building against VTK >= 8.90).
This commit fixes a regression introduced in 58f4038 (ENH: Add access to render window in ctkVTKChartView)
…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.
… 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.
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 [...]
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
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();
^
…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] == "_") ^
|
I plan on merging this tomorrow (July 13th), then I will proceed with:
This means that support for C++98, Qt4 and associated compatibility macros will be removed. |
|
Awesome, thank you, it'll be great that we won't need to worry about qt4 compatibility anymore. |
|
To follow-up, I just updated the Next:
Footnotes |
Notes regarding Qt4 build:
ctkDICOMQueryRetrieveWidgetclass will not be availablectkDICOMTableViewis not supportedPBRmode inctkVTKSurfaceMaterialPropertyWidgetis not available when building against VTK8. Attempting to set the Metallic or Roughness property will display a warning.