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

Add Visual DICOM Browser | ⚠️ Authorship of integration commit changed #1165

Merged
merged 73 commits into from
Jan 19, 2024
Merged

Add Visual DICOM Browser | ⚠️ Authorship of integration commit changed #1165

merged 73 commits into from
Jan 19, 2024

Commits on Jan 18, 2024

  1. ENH: Add visual DICOM browser 

    COMP: Fix Windows build

Co-authored-by: Andras Lasso <[email protected]>

COMP: Fix Windows build

Co-authored-by: Andras Lasso <[email protected]>

COMP: Fix Windows build

Co-authored-by: Andras Lasso <[email protected]>

BUG: Use port 104 as default for www.dicomserver.co.uk

STYLE: Strip trailing spaces of new files
    @Punzo @jcfr
    Punzo authored and jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    cf6c99d View commit details
    Browse the repository at this point in the history

  2. BUG: Fix query bugs and warning background of query filters widget

    @Punzo @jcfr
    Punzo authored and jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    4dddac2 View commit details
    Browse the repository at this point in the history

  3. ENH: Minor improvements for the visual DICOM browser

    @Punzo @jcfr
    Punzo authored and jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    eb372e4 View commit details
    Browse the repository at this point in the history

  4. BUG: Fix ctkDICOMSchedulerTest1 test

    @Punzo @jcfr
    Punzo authored and jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    bd1f8fb View commit details
    Browse the repository at this point in the history

  5. COMP: Fix -Wcatch-value in ctkDICOMVisualBrowserWidget

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    7eb3a65 View commit details
    Browse the repository at this point in the history

  6. COMP: Fix deprecated use of QFileDialog::DirectoryOnly in ctkDICOMVis… 

    …ualBrowserWidget

Apply fix similar to 724c154 ("COMP: Fix deprecated use of QFileDialog::DirectoryOnly
in ctkFileDialogTest1", 2023-06-14)
    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    104e2ed View commit details
    Browse the repository at this point in the history

  7. COMP: Fix -Wsign-promo in ctkDICOMVisualBrowserWidget 

    Apply fix similar to 757b21d ("COMP: Fix -Wsign-promo in Widgets &
DICOMWidgets", 2023-04-14)
    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    d103df2 View commit details
    Browse the repository at this point in the history

  8. BUG: Fix -Wint-in-bool-context in ctkDICOMPatientItemWidget 

    This commit addresses the following warning:

/path/to/CTK/Libs/DICOM/Widgets/ctkDICOMPatientItemWidget.cpp:791:35: warning: enum constant in boolean context [-Wint-in-bool-context]
  791 |       (Qt::ControlModifier || Qt::ShiftModifier))
      |                                   ^~~~~~~~~~~~~
    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    610ac8f View commit details
    Browse the repository at this point in the history

  9. COMP: Fix compilation of tests to account for API changes

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    25c9518 View commit details
    Browse the repository at this point in the history

  10. BUG: Fix logging

    @Punzo @jcfr
    Punzo authored and jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    5befcd1 View commit details
    Browse the repository at this point in the history

  11. COMP: Update newly introduced ctor/dtor to use "default" keyword if e… 

    …mpty
    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    a181270 View commit details
    Browse the repository at this point in the history

  12. COMP: Update newly introduced "extendable" private dtor to be virtual

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    4643cbd View commit details
    Browse the repository at this point in the history

  13. DOC: Group docstrings of newly introduced methods

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    0ce2b98 View commit details
    Browse the repository at this point in the history

  14. COMP: Fix constness of newly introduced DICOM methods accepting POD type

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    91a6fc6 View commit details
    Browse the repository at this point in the history

  15. COMP: Declare as "override" newly introduced virtual DICOM methods

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    983edf3 View commit details
    Browse the repository at this point in the history

  16. COMP: Fix constness of ctkDICOMScheduler method accepting QString param

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    18b8f16 View commit details
    Browse the repository at this point in the history

  17. COMP: Remove re-declaration of virtual pure methods in DICOM worker

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    02ad815 View commit details
    Browse the repository at this point in the history

  18. STYLE: Rename DICOM property from "TypeOfJob" to "jobType"

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    c7dc6b8 View commit details
    Browse the repository at this point in the history

  19. STYLE: Rename DICOMDatabase ivar from "typeOfTask" to "jobType"

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    94d29fb View commit details
    Browse the repository at this point in the history

  20. COMP: Rename "ctkJobDetail" to "ctkDICOMJobDetail"

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    06d1305 View commit details
    Browse the repository at this point in the history

  21. COMP: Update DICOM scheduler API to use QString for server connection… 

    … name
    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    90e889c View commit details
    Browse the repository at this point in the history

  22. COMP: Fix ctkDICOMJobDetail wrapping renaming JobUID -> jobUID, addin… 

    …g jobClass
    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    4c84f02 View commit details
    Browse the repository at this point in the history

  23. COMP: Remove invalid declaration from ctkDICOMScheduler.cpp

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    b228ae4 View commit details
    Browse the repository at this point in the history

  24. COMP: Fix clazy-range-loop-detach warning in ctkDICOMJobResponseSet

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    fbda0f1 View commit details
    Browse the repository at this point in the history

  25. COMP: Explicitly exclude abstract job/scheduler/worker from wrapping

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    df9faf8 View commit details
    Browse the repository at this point in the history

  26. COMP: Manage jobs and workers as abstract objects 

    Remove redefinition of "ctkDICOMJob::createWorker" pure virtual method
relying on the fact ctkDICOMJob and ctkAbtractJob are covariant (see [1])
and managed jobs and workers as abstract object anticipating the integration
of ctkAbstractSchedulerPrivate holding the collection of worker and job.

Move abstract definition of "loggerReport" from ctkDICOMJob to ctkAbtractJob

Add "jobToDetail" virtual function to ctkAbstractScheduler

[1]: https://en.wikipedia.org/wiki/Covariant_return_type
    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    316980c View commit details
    Browse the repository at this point in the history

  27. COMP: Relocate onJob<Status> from DICOM to Abstract scheduler

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    c53acee View commit details
    Browse the repository at this point in the history

  28. COMP: Relocate Workers and JobsQueue map to abstract scheduler

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    3772564 View commit details
    Browse the repository at this point in the history

  29. COMP: Simplify initialization of ctkDICOMJobDetails

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    a5b8baf View commit details
    Browse the repository at this point in the history

  30. COMP: Add ctkJobDetail

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    efad661 View commit details
    Browse the repository at this point in the history

  31. COMP: Rename "jobResponseSetToDetail()" to "toVariant()"

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    868bfb9 View commit details
    Browse the repository at this point in the history

  32. COMP: Remove scheduler "jobToDetail" and add "toVariant()" job function

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    ac8c843 View commit details
    Browse the repository at this point in the history

  33. COMP: Move "generateCopy" from ctkDICOMJob to ctkAbstractJob

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    b074c3e View commit details
    Browse the repository at this point in the history

  34. COMP: Rename ctkAbstractJob "generateCopy()" to "clone()"

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    3adca6f View commit details
    Browse the repository at this point in the history

  35. COMP: Move startNextJob/onJobCanceled to ctkAbstractWorker

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    3147c37 View commit details
    Browse the repository at this point in the history

  36. BUG: Adding missing jobUID and jobType to ctkDICOMJobDetail from resp… 

    …onseSet
    @Punzo @jcfr
    Punzo authored and jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    6e77c25 View commit details
    Browse the repository at this point in the history

  37. BUG: Fix loggerReport for the ctkDICOMInserterJob

    @Punzo @jcfr
    Punzo authored and jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    9fbc04b View commit details
    Browse the repository at this point in the history

  38. COMP: Improve argument parsing in newly added DICOM tests

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    6ebab36 View commit details
    Browse the repository at this point in the history

  39. STYLE: Remove unused includes, fix include comment, remove extra EOF … 

    …line

STYLE: Re-order includes & fix include comments of newly added DICOM classes
    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    f003815 View commit details
    Browse the repository at this point in the history

  40. COMP: Ensure DICOM Query, Retrieve and Schedule tests use a different DB

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    0540c88 View commit details
    Browse the repository at this point in the history

  41. COMP: Add "dcmqrscp" resource lock to CTK DICOM Echo and Scheduler tests

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    ef1bc89 View commit details
    Browse the repository at this point in the history

  42. ENH: Improve Browser and VisualBrowser test output to include testname

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    315af4c View commit details
    Browse the repository at this point in the history

  43. BUG: Fix ctkDICOMVisualBrowserWidgetTest1 argument parsing

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    19d3faf View commit details
    Browse the repository at this point in the history

  44. BUG: Update ctkDICOMVisualBrowserWidgetTest1 to use its own DB directory 

    Do not reuse "ctkDICOMBrowserTest1-db" already associated with ctkDICOMBrowserTest1
    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    e9b51c2 View commit details
    Browse the repository at this point in the history

  45. COMP: Update DICOMWidget CMakeLists.txt to include "Svg"

    @Punzo @jcfr
    Punzo authored and jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    742cc83 View commit details
    Browse the repository at this point in the history

  46. COMP: Update DICOM job "createWorker" function to return ctkAbstractJob

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    537501f View commit details
    Browse the repository at this point in the history

  47. COMP: Simplify setting Finished status in retrieve and storageListene… 

    …r worker
    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    c096ffa View commit details
    Browse the repository at this point in the history

  48. COMP: Simplify worker API marking setJob with shared pointer param vi… 

    …rtual
    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    75955c0 View commit details
    Browse the repository at this point in the history

  49. COMP: Add ctkDICOMInserterWorkerPrivate::setInserterParameters 

    The Inserter worker organization matches the three other ones: StorageListener,
Retrieve and Query.
    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    83e078a View commit details
    Browse the repository at this point in the history

  50. COMP: Fix constness of ctkDICOMServer method accepting QString param

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    2ae3772 View commit details
    Browse the repository at this point in the history

  51. COMP: Fix constness of ctkDICOMScheduler methods for inserting respon… 

    …seSet
    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    3ad6394 View commit details
    Browse the repository at this point in the history

  52. COMP: Prefer qSharedPointerObjectCast instead of qobject_cast<QShared… 

    …Pointer
    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    9d5272f View commit details
    Browse the repository at this point in the history

  53. COMP: Fix more constness of introduced DICOM methods accepting POD type

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    d7fd6be View commit details
    Browse the repository at this point in the history

  54. COMP: Remove used of "const int" for ivars in ctkDICOMServerNodeWidget2

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    4a4421b View commit details
    Browse the repository at this point in the history

  55. COMP: Fix constness of ctkDICOMJobResponseSet::setDatasets

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    fbba856 View commit details
    Browse the repository at this point in the history

  56. COMP: Fix constness of ctkDICOMJob::(copy|set)JobResponseSets

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    9b0bc8a View commit details
    Browse the repository at this point in the history

  57. COMP: Fix more constness in new DICOM widgets accepting QVariant

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    bf28636 View commit details
    Browse the repository at this point in the history

  58. COMP: Fix more constness in DICOM ctkDICOMVisualBrowserWidget methods

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    007982f View commit details
    Browse the repository at this point in the history

  59. STYLE: Fix spacing, remove extra EOF lines

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    2873a57 View commit details
    Browse the repository at this point in the history

  60. COMP: Fix constness of connectionName param in API for set/remove server

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    749d128 View commit details
    Browse the repository at this point in the history

  61. COMP: Remove "const bool&" in DICOM SeriesItem and VisualBrowser widgets

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    57d92c1 View commit details
    Browse the repository at this point in the history

  62. COMP: Fix more constness in DICOM ctkDICOMVisualBrowserWidget methods

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    bbab77b View commit details
    Browse the repository at this point in the history

  63. DOC: Group docstrings of newly introduced methods in VisualBrowserWidget

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    8d1a470 View commit details
    Browse the repository at this point in the history

  64. COMP: Remove deprecated ctkDICOMVisualBrowserWidget::onImportDirectory

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    0ae38b7 View commit details
    Browse the repository at this point in the history

  65. COMP: Fix constness of ctkDICOMStorageListener::done() signal

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    7694c2a View commit details
    Browse the repository at this point in the history

  66. COMP: Rename ctkAbstractScheduler to ctkJobScheduler

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    81940a8 View commit details
    Browse the repository at this point in the history

  67. COMP: Rename ctkAbstractScheduler files to ctkJobScheduler

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    71ed8f0 View commit details
    Browse the repository at this point in the history

  68. COMP: Simplify copy of JobResponseSet introducing clone()

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    f8bf2f3 View commit details
    Browse the repository at this point in the history

  69. DOC: Add comment in ctkDICOMItem::Clone()

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    92ebce8 View commit details
    Browse the repository at this point in the history

  70. STYLE: Cleanup includes

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    3040abc View commit details
    Browse the repository at this point in the history

  71. STYLE: Fix line endings

    @jcfr
    jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    3e025b8 View commit details
    Browse the repository at this point in the history

  72. STYLE: Remove ctkDICOMWorker class

    @Punzo @jcfr
    Punzo authored and jcfr committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    61f8d36 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. STYLE: Seletively apply clang reformatting 

    As a step toward automating styling in CTK & Slicer, the most common
styling practices accross CTK & Slicer code base have been applied.
    @jcfr
    jcfr committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    e1f97cb View commit details
    Browse the repository at this point in the history