Fix build with vtk 9.4.1 and Qt6

Author: fspindle

modules/ustk_grabber/CMakeLists.txt

@@ -55,24 +55,16 @@ if(USE_VTK)
   # Instruct CMake to run moc automatically when needed.
   set(CMAKE_AUTOMOC ON)
 
-    # Find Qt version corresponding to the Qt version used to compile VTK (4 or 5)
+  # Find Qt version corresponding to the Qt version used to compile VTK (4, 5 or 6)
   if(VTK_QT_VERSION VERSION_EQUAL "6")
-    find_package(Qt6 REQUIRED COMPONENTS Widgets Network QUIET)
-    qt6_wrap_ui(UI_Srcs ${UIs})
+    find_package(Qt6 COMPONENTS Core Widgets Network REQUIRED QUIET)
 
-    list(APPEND opt_incs "${Qt6Widgets_INCLUDE_DIRS}")
-    list(APPEND opt_incs "${Qt6Network_INCLUDE_DIRS}")
+    set(Qt6_COMPONENTS ${Qt6Core_LIBRARIES} ${Qt6Widgets_LIBRARIES} ${Qt6Network_LIBRARIES})
 
-    # The following line allows to build visp, but doesn't allow to build a project that uses
-    # visp as 3rd party:
-    # list(APPEND opt_libs ${Qt6Widgets_LIBRARIES} ${Qt6Network_LIBRARIES})
-    # Instead we get the corresponding interface link libraries that we can propagate with visp
-    #  when visp is used as a 3rd party:
-    set(Qt6_COMPONENTS ${Qt6Widgets_LIBRARIES} ${Qt6Network_LIBRARIES})
+    vp_get_interface_include_dirs(Qt6_COMPONENTS qt6_include_dirs_)
     vp_get_interface_link_libraries(Qt6_COMPONENTS qt6_link_libraries_)
+    list(APPEND opt_incs ${qt6_include_dirs_})
     list(APPEND opt_libs ${qt6_link_libraries_})
-
-  # Find Qt version corresponding to the Qt version used to compile VTK (4 or 5)
   elseif(VTK_QT_VERSION VERSION_EQUAL "5") # Qt5 not working yet
     find_package(Qt5 COMPONENTS Core Widgets Network REQUIRED QUIET)
 

modules/ustk_gui/CMakeLists.txt

@@ -41,26 +41,15 @@ if(USE_VTK)
 
   # Instruct CMake to run moc automatically when needed.
   set(CMAKE_AUTOMOC ON)
-  # Find Qt version corresponding to the Qt version used to compile VTK (4 or 5 or 6)
+  # Find Qt version corresponding to the Qt version used to compile VTK (4, 5 or 6)
   if(VTK_QT_VERSION VERSION_EQUAL "6")
-    find_package(Qt6 COMPONENTS Gui Widgets QuickWidgets REQUIRED QUIET)
-    qt6_wrap_ui(UI_Srcs ${UIs})
+    find_package(Qt6 COMPONENTS Core Gui OpenGL Quick QuickWidgets Widgets REQUIRED QUIET)
 
-    #qt6_add_resources(UI_RESOURCES resources/resources.qrc)
-
-    list(APPEND opt_incs "${Qt6Gui_INCLUDE_DIRS}")
-    list(APPEND opt_incs "${Qt6Widgets_INCLUDE_DIRS}")
-    list(APPEND opt_incs "${Qt6QuickWidgets_INCLUDE_DIRS}")
-
-    # The following line allows to build visp, but doesn't allow to build a project that uses
-    # visp as 3rd party:
-    # list(APPEND opt_libs ${Qt6Widgets_LIBRARIES} ${Qt6Gui_LIBRARIES} ${Qt6QuickWidgets_LIBRARIES})
-    # Instead we get the corresponding interface link libraries that we can propagate with visp
-    # when visp is used as a 3rd party:
-    set(Qt6_COMPONENTS ${Qt6Widgets_LIBRARIES} ${Qt6Gui_LIBRARIES} ${Qt6QuickWidgets_LIBRARIES})
+    set(Qt6_COMPONENTS ${Qt6Core_LIBRARIES} ${Qt6Gui_LIBRARIES} ${Qt6OpenGL_LIBRARIES} ${Qt6Quick_LIBRARIES} ${Qt6QuickWidgets_LIBRARIES} ${Qt6Widgets_LIBRARIES} )
+    vp_get_interface_include_dirs(Qt6_COMPONENTS qt6_include_dirs_)
     vp_get_interface_link_libraries(Qt6_COMPONENTS qt6_link_libraries_)
+    list(APPEND opt_incs ${qt6_include_dirs_})
     list(APPEND opt_libs ${qt6_link_libraries_})
-
   elseif(VTK_QT_VERSION VERSION_EQUAL "5")
     find_package(Qt5 COMPONENTS Core Gui Widgets Quick QuickWidgets REQUIRED QUIET)
 

modules/ustk_gui/include/visp3/ustk_gui/us3DSceneSlicing.h

@@ -64,7 +64,7 @@
 #include <QtGui/QMainWindow>
 #include <QtGui/QPushButton>
 #include <QtGui/QSlider>
-#elif defined(USTK_HAVE_VTK_QT5)
+#elif defined(USTK_HAVE_VTK_QT5) || defined(USTK_HAVE_VTK_QT6)
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QGridLayout>
 #include <QtWidgets/QMainWindow>
@@ -84,7 +84,7 @@ class VISP_EXPORT us3DSceneSlicing : public QMainWindow
 public:
   // Constructor/Destructor
   us3DSceneSlicing(std::string imageFileName);
-  ~us3DSceneSlicing() {}
+  ~us3DSceneSlicing() { }
 
   void resizeEvent(QResizeEvent *event);
 

modules/ustk_gui/include/visp3/ustk_gui/usUltrasonixClientWidget.h

@@ -89,9 +89,13 @@ private slots:
   QLineEdit *ipTextEdit;
   QComboBox *probeSelectComboBox;
 
+#if defined(USTK_HAVE_VTK_QT6)
+  QRegularExpressionValidator *ipValidator;
+#else
   QRegExpValidator *ipValidator;
+#endif
 
-  // Layouts
+// Layouts
   QGridLayout *Layout;
 
   QHostAddress hostAddress;

modules/ustk_gui/src/us2DSceneWidget.cpp

@@ -44,6 +44,8 @@
 #include <visp3/ustk_core/usImagePostScan2D.h>
 #include <visp3/ustk_gui/us2DSceneWidget.h>
 
+#include <QWheelEvent>
+
 /**
 * Constructor.
 * @param parent The QWidget parent.
@@ -321,7 +323,8 @@ void us2DSceneWidget::keyPressEvent(QKeyEvent *event)
 {
   if (event->key() == Qt::Key_H) {
     m_rPressed = true;
-  } else if (event->key() == Qt::Key_P) {
+  }
+  else if (event->key() == Qt::Key_P) {
     m_pPressed = true;
   }
   event->accept();
@@ -334,7 +337,8 @@ void us2DSceneWidget::keyReleaseEvent(QKeyEvent *event)
 {
   if (event->key() == Qt::Key_H) {
     m_rPressed = false;
-  } else if (event->key() == Qt::Key_P) {
+  }
+  else if (event->key() == Qt::Key_P) {
     m_pPressed = false;
   }
   event->accept();
@@ -383,8 +387,9 @@ void us2DSceneWidget::mouseMoveEvent(QMouseEvent *event)
     m_lastmouserPosX = event->pos().x();
     m_lastmouserPosY = event->pos().y();
     event->accept();
-  } else {
-    // propagate event to allow colormap change in vtk
+  }
+  else {
+ // propagate event to allow colormap change in vtk
     usViewerWidget::mouseMoveEvent(event);
   }
 }
@@ -450,7 +455,8 @@ void us2DSceneWidget::mousePressEvent(QMouseEvent *event)
       std::cout << "Picked value = " << vector.data[0] << " " << vector.data[1] << " " << vector.data[2] << std::endl;
       m_pickedVoxel = vector;
       emit(voxelPicked(vector));
-    } else
+    }
+    else
       std::cout << "Pick out of image" << std::endl;
   }
   usViewerWidget::mousePressEvent(event);

modules/ustk_gui/src/us3DSceneSlicing.cpp

@@ -80,7 +80,11 @@
 
 #include <vtkHomogeneousTransform.h>
 
-#include <QDesktopWidget>
+#if defined(USTK_HAVE_VTK_QT6)
+#include <QScreen>
+#else
+#include <QDesktopWidget> // deprecated in Qt5 and removed in Qt6
+#endif
 #include <QResizeEvent>
 
 /**
@@ -163,7 +167,11 @@ void us3DSceneSlicing::Render()
 void us3DSceneSlicing::setupUi()
 {
   this->setMinimumSize(640, 480);
+#if defined(USTK_HAVE_VTK_QT6)
+  QRect screenRect = QGuiApplication::primaryScreen()->geometry();
+#else
   QRect screenRect = QApplication::desktop()->screenGeometry();
+#endif
   this->resize(screenRect.size());
 
   gridLayoutWidget = new QWidget(this);

modules/ustk_gui/src/usMedicalImageViewer.cpp

@@ -78,7 +78,11 @@
 #include <vtkResliceImageViewer.h>
 #include <vtkResliceImageViewerMeasurements.h>
 
-#include <QDesktopWidget>
+#if defined(USTK_HAVE_VTK_QT6)
+#include <QScreen>
+#else
+#include <QDesktopWidget> // deprecated in Qt5 and removed in Qt6
+#endif
 #include <QResizeEvent>
 
 #if !(USTK_HAVE_VTK_VERSION < 0x090000)
@@ -103,7 +107,7 @@ class vtkResliceCursorCallback : public vtkCommand
     widget3D->update();
   }
 
-  vtkResliceCursorCallback() : widget3D(), RIW() {}
+  vtkResliceCursorCallback() : widget3D(), RIW() { }
   us3DSceneWidget *widget3D;
   vtkResliceImageViewer *RIW[3];
 };
@@ -151,7 +155,7 @@ usMedicalImageViewer::usMedicalImageViewer(std::string imageFileName)
   for (int i = 0; i < 3; i++) {
     // make them all share the same reslice cursor object.
     vtkResliceCursorLineRepresentation *rep =
-        vtkResliceCursorLineRepresentation::SafeDownCast(riw[i]->GetResliceCursorWidget()->GetRepresentation());
+      vtkResliceCursorLineRepresentation::SafeDownCast(riw[i]->GetResliceCursorWidget()->GetRepresentation());
     riw[i]->SetResliceCursor(riw[0]->GetResliceCursor());
 
     rep->GetResliceCursorActor()->GetCursorAlgorithm()->SetReslicePlaneNormal(i);
@@ -226,14 +230,14 @@ void usMedicalImageViewer::ResetColorMap()
 */
 void usMedicalImageViewer::Render()
 {
-#if USTK_HAVE_VTK_VERSION < 0x090000
-  this->view1->GetRenderWindow()->Render();
-  this->view2->GetRenderWindow()->Render();
-  this->view3->GetRenderWindow()->Render();
-#else
+#if defined(USTK_HAVE_VTK_QT6)
   this->view1->renderWindow()->Render();
   this->view2->renderWindow()->Render();
   this->view3->renderWindow()->Render();
+#else
+  this->view1->GetRenderWindow()->Render();
+  this->view2->GetRenderWindow()->Render();
+  this->view3->GetRenderWindow()->Render();
 #endif
 
   this->view1->update();
@@ -288,10 +292,10 @@ void usMedicalImageViewer::AddDistanceMeasurementToView(int i)
 void usMedicalImageViewer::setupUi()
 {
   this->setMinimumSize(640, 480);
-#if USTK_HAVE_VTK_VERSION < 0x090000
-  QRect screenRect = QApplication::desktop()->screenGeometry();
+#if defined(USTK_HAVE_VTK_QT6)
+  QRect screenRect = QGuiApplication::primaryScreen()->geometry();
 #else
-  QRect screenRect = QApplication::screens()[0]->geometry();
+  QRect screenRect = QApplication::desktop()[0]->screenGeometry();
 #endif
   this->resize(screenRect.size());
 

modules/ustk_gui/src/usResliceMatrixViewer.cpp

@@ -73,7 +73,11 @@
 
 #include <vtkHomogeneousTransform.h>
 
-#include <QDesktopWidget>
+#if defined(USTK_HAVE_VTK_QT6)
+#include <QScreen>
+#else
+#include <QDesktopWidget> // deprecated in Qt5 and removed in Qt6
+#endif
 #include <QFileDialog>
 #include <QResizeEvent>
 
@@ -248,10 +252,17 @@ void usResliceMatrixViewer::ResetViews()
 */
 void usResliceMatrixViewer::Render()
 {
+#if defined(USTK_HAVE_VTK_QT6)
+  this->view1->renderWindow()->Render();
+  this->view2->renderWindow()->Render();
+  this->view3->renderWindow()->Render();
+  this->view4->renderWindow()->Render();
+#else
   this->view1->GetRenderWindow()->Render();
   this->view2->GetRenderWindow()->Render();
   this->view3->GetRenderWindow()->Render();
   this->view4->GetRenderWindow()->Render();
+#endif
 }
 
 /**
@@ -260,7 +271,11 @@ void usResliceMatrixViewer::Render()
 void usResliceMatrixViewer::setupUi()
 {
   this->setMinimumSize(640, 480);
-  QRect screenRect = QApplication::desktop()->screenGeometry();
+#if defined(USTK_HAVE_VTK_QT6)
+  QRect screenRect = QGuiApplication::primaryScreen()->geometry();
+#else
+  QRect screenRect = QApplication::desktop()[0]->screenGeometry();
+#endif
   this->resize(screenRect.size());
 
   gridLayoutWidget = new QWidget(this);

modules/ustk_gui/src/usUltrasonixClientWidget.cpp

@@ -21,8 +21,14 @@ usUltrasonixClientWidget::usUltrasonixClientWidget()
 
   // ip validation
   QString ipRange = "(?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])";
+#if defined(USTK_HAVE_VTK_QT6)
+  QRegularExpression ipRegex("^" + ipRange + "\\." + ipRange + "\\." + ipRange + "\\." + ipRange + "$");
+  ipValidator = new QRegularExpressionValidator(ipRegex, this);
+#else
   QRegExp ipRegex("^" + ipRange + "\\." + ipRange + "\\." + ipRange + "\\." + ipRange + "$");
   ipValidator = new QRegExpValidator(ipRegex, this);
+#endif
+
   ipTextEdit->setValidator(ipValidator);
 
   // layout
@@ -71,10 +77,12 @@ void usUltrasonixClientWidget::initAcquisitionSlot()
   if (probeSelectComboBox->currentIndex() == 0) { // 4DC7
     initHeader.probeId = 15;
     emit(initAcquisition(initHeader));
-  } else if (probeSelectComboBox->currentIndex() == 1) { // C5-2
+  }
+  else if (probeSelectComboBox->currentIndex() == 1) { // C5-2
     initHeader.probeId = 10;
     emit(initAcquisition(initHeader));
-  } else {
+  }
+  else {
     QMessageBox msgBox;
     msgBox.setText("Wrong probe selection !");
     msgBox.exec();