[med-svn] [Git][med-team/ctk][master] fix incorrect upstream injection in previous commit

[Fernando Hueso (@ferdymercury)]

Fernando Hueso pushed to branch master at Debian Med / ctk


Commits:
85feef65 by Fernando Hueso at 2026-09-03T10:12:12+02:00
fix incorrect upstream injection in previous commit

- - - - -


8 changed files:

- CMakeExternals/DCMTK.cmake
- Libs/DICOM/Core/ctkDICOMQuery.h
- Libs/DICOM/Widgets/ctkDICOMQueryRetrieveWidget.cpp
- Libs/Visualization/VTK/Core/Testing/Cpp/vtkLightBoxRendererManagerTest1.cpp
- Libs/Visualization/VTK/Widgets/Testing/Cpp/ctkVTKAbstractViewTest1.cpp
- Libs/Visualization/VTK/Widgets/Testing/Cpp/ctkVTKScalarsToColorsComboBoxTest1.cpp
- Libs/Widgets/ctkBasePopupWidget.cpp
- Plugins/org.commontk.eventadmin/util/ctkEALogTracker.cpp


Changes:

=====================================
CMakeExternals/DCMTK.cmake
=====================================
@@ -44,6 +44,12 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
                       GIT_TAG ${revision_tag})
   endif()
 
+  # DCMTK uses its own container classes by default. With this option its
+  # OFList, OFMap and friends become aliases of the corresponding STL types,
+  # which changes the headers that CTK and its users compile against.
+  option(DCMTK_ENABLE_STL "Build DCMTK with STL containers" OFF)
+  mark_as_advanced(DCMTK_ENABLE_STL)
+
   set(EXTERNAL_PROJECT_OPTIONAL_CMAKE_CACHE_ARGS)
 
   if(UNIX)
@@ -77,6 +83,7 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
       -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS:BOOL=OFF
       -DDCMTK_DEFAULT_DICT:STRING=builtin
       -DDCMTK_ENABLE_PRIVATE_TAGS:BOOL=ON
+      -DDCMTK_ENABLE_STL:BOOL=${DCMTK_ENABLE_STL}
 
       ${EXTERNAL_PROJECT_OPTIONAL_CMAKE_CACHE_ARGS}
     DEPENDS


=====================================
Libs/DICOM/Core/ctkDICOMQuery.h
=====================================
@@ -30,6 +30,11 @@
 // ctkCore includes
 #include <ctkPimpl.h>
 
+// DCMTK includes
+// OFList cannot be forward declared: when DCMTK is built with DCMTK_ENABLE_STL
+// it is a macro that aliases std::list.
+#include <dcmtk/ofstd/oflist.h>
+
 // ctkDICOMCore includes
 #include "ctkDICOMCoreExport.h"
 #include "ctkDICOMDatabase.h"
@@ -37,7 +42,6 @@
 class ctkDICOMQueryPrivate;
 class ctkDICOMJobResponseSet;
 class QRResponse;
-template <typename T> class OFList;
 
 /// \ingroup DICOM_Core
 class CTK_DICOM_CORE_EXPORT ctkDICOMQuery : public QObject


=====================================
Libs/DICOM/Widgets/ctkDICOMQueryRetrieveWidget.cpp
=====================================
@@ -505,7 +505,7 @@ void ctkDICOMQueryRetrieveWidget::updateRetrieveProgress(int value)
     d->ProgressDialog->resize(targetWidth, d->ProgressDialog->height());
   }
   d->ProgressDialog->setValue( value );
-  logger.error(QString("setting value to %1").arg(value) );
+  logger.debug(QString("setting value to %1").arg(value) );
   QApplication::processEvents();
 }
 


=====================================
Libs/Visualization/VTK/Core/Testing/Cpp/vtkLightBoxRendererManagerTest1.cpp
=====================================
@@ -39,6 +39,7 @@
 
 // STD includes
 #include <cstdlib>
+#include <iostream>
 
 //----------------------------------------------------------------------------
 int vtkLightBoxRendererManagerTest1(int argc, char* argv[])


=====================================
Libs/Visualization/VTK/Widgets/Testing/Cpp/ctkVTKAbstractViewTest1.cpp
=====================================
@@ -40,6 +40,7 @@
 #else
 #include <time.h>
 #endif
+#include <iostream>
 
 void sleep_ms(int ms)
 {


=====================================
Libs/Visualization/VTK/Widgets/Testing/Cpp/ctkVTKScalarsToColorsComboBoxTest1.cpp
=====================================
@@ -32,6 +32,7 @@
 #include <vtkPiecewiseFunction.h>
 
 // STD includes
+#include <iostream>
 
 //-----------------------------------------------------------------------------
 int ctkVTKScalarsToColorsComboBoxTest1(int argc, char * argv [] )


=====================================
Libs/Widgets/ctkBasePopupWidget.cpp
=====================================
@@ -20,6 +20,11 @@
 
 // Qt includes
 #include <QApplication>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+#include <QScreen>
+#else
+#include <QDesktopWidget>
+#endif
 #include <QDebug>
 #include <QDir>
 #include <QEvent>
@@ -419,6 +424,33 @@ QRect ctkBasePopupWidgetPrivate::desiredOpenGeometry(QRect baseGeometry)const
   {
     geometry.moveTop((topLeft.y() + bottomRight.y()) / 2 - size.height() / 2);
   }
+
+  // Keep the popup visible on the screen: if the base widget is close to a screen
+  // edge then the popup would be cut off, move it back to the visible area instead.
+  if (!this->BaseWidget.isNull())
+  {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+    QRect available = this->BaseWidget->screen()->availableGeometry();
+#else
+    QRect available = QApplication::desktop()->availableGeometry(this->BaseWidget);
+#endif
+    if (geometry.right() > available.right())
+    {
+      geometry.moveRight(available.right());
+    }
+    if (geometry.left() < available.left())
+    {
+      geometry.moveLeft(available.left());
+    }
+    if (geometry.bottom() > available.bottom())
+    {
+      geometry.moveBottom(available.bottom());
+    }
+    if (geometry.top() < available.top())
+    {
+      geometry.moveTop(available.top());
+    }
+  }
   return geometry;
 }
 


=====================================
Plugins/org.commontk.eventadmin/util/ctkEALogTracker.cpp
=====================================
@@ -25,7 +25,7 @@
 #include <QDateTime>
 
 ctkEALogTracker::ctkEALogTracker(ctkPluginContext* context, QIODevice* out)
-  : ctkServiceTracker<ctkLogService*>(context), out(out), logLevel(std::numeric_limits<int>::max())
+  : ctkServiceTracker<ctkLogService*>(context), out(out), logLevel(ctkLogService::LOG_INFO)
 {
 
 }



View it on GitLab: https://salsa.debian.org/med-team/ctk/-/commit/85feef657e1342a9c66e9af0d7f3a8ff5e4832a6

-- 
View it on GitLab: https://salsa.debian.org/med-team/ctk/-/commit/85feef657e1342a9c66e9af0d7f3a8ff5e4832a6
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260903/dae77241/attachment-0001.htm>