Fix mostly Qt incompatabilites and MITK berry updates.

ktbolt · May 16, 2024 · 14a3611 · 14a3611
1 parent ec3724c
commit 14a3611
Show file tree

Hide file tree

Showing 47 changed files with 393 additions and 308 deletions.
diff --git a/Code/Source/Application/SimVascular_Init_py.cxx b/Code/Source/Application/SimVascular_Init_py.cxx
@@ -44,7 +44,7 @@
 
 #include "SimVascular_Init_py.h"
 
-#include "vtkToolkits.h"
+//dp #include "vtkToolkits.h"
 
 #include "Geometry_PyModule.h"
 #include "Imaging_PyModule.h"

diff --git a/Code/Source/sv4gui/Plugins/org.sv.gui.qt.application/sv4gui_AboutDialog.cxx b/Code/Source/sv4gui/Plugins/org.sv.gui.qt.application/sv4gui_AboutDialog.cxx
@@ -37,7 +37,7 @@
 #include <QmitkModulesDialog.h>
 #include <mitkVersion.h>
 #include <itkConfigure.h>
-#include <vtkConfigure.h>
+//dp #include <vtkConfigure.h>
 #include <QPushButton>
 #include <vtkVersionMacros.h>
 

diff --git a/Code/Source/sv4gui/Plugins/org.sv.gui.qt.application/sv4gui_FileOpenProjectAction.cxx b/Code/Source/sv4gui/Plugins/org.sv.gui.qt.application/sv4gui_FileOpenProjectAction.cxx
@@ -39,8 +39,8 @@
 #include <QApplication>
 
 #include <berryPlatform.h>
-#include <berryIPreferences.h>
-#include <berryIPreferencesService.h>
+#include <mitkIPreferences.h>
+#include <mitkIPreferencesService.h>
 
 #include <mitkProgressBar.h>
 #include <mitkStatusBar.h>
@@ -111,21 +111,22 @@ void sv4guiFileOpenProjectAction::Run()
 
         mitk::DataStorage::Pointer dataStorage = dsRef->GetDataStorage();
 
-        berry::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
-        berry::IPreferences::Pointer prefs;
+        mitk::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
+        mitk::IPreferences* prefs;
+
        if (prefService)
        {
            prefs = prefService->GetSystemPreferences()->Node("/General");
        }
        else
        {
-           prefs = berry::IPreferences::Pointer(0);
+           prefs = nullptr; 
        }
 
        QString lastSVProjPath="";
-       if(prefs.IsNotNull())
+       if(prefs != nullptr)
        {
-           lastSVProjPath = prefs->Get("LastSVProjPath", prefs->Get("LastSVProjCreatParentPath", ""));
+           lastSVProjPath = QString::fromStdString(prefs->Get("LastSVProjPath", prefs->Get("LastSVProjCreatParentPath", "")));
        }
 
        if(lastSVProjPath=="")
@@ -157,9 +158,10 @@ void sv4guiFileOpenProjectAction::Run()
             mitk::ProgressBar::GetInstance()->Progress(2);
             mitk::StatusBar::GetInstance()->DisplayText("SV project loaded.");
             QApplication::restoreOverrideCursor();
-            if(prefs.IsNotNull())
+
+            if(prefs != nullptr)
             {
-                prefs->Put("LastSVProjPath", lastSVProjPath);
+                prefs->Put("LastSVProjPath", lastSVProjPath.toStdString());
                 prefs->Flush();
             }
         }else{

diff --git a/Code/Source/sv4gui/Plugins/org.sv.gui.qt.application/sv4gui_FileSaveProjectAsAction.cxx b/Code/Source/sv4gui/Plugins/org.sv.gui.qt.application/sv4gui_FileSaveProjectAsAction.cxx
@@ -41,8 +41,8 @@
 #include <berryPlatform.h>
 #include <berryPlatformUI.h>
 #include <berryISelectionService.h>
-#include <berryIPreferencesService.h>
-#include <berryIPreferences.h>
+#include <mitkIPreferencesService.h>
+#include <mitkIPreferences.h>
 
 #include <mitkProgressBar.h>
 #include <mitkStatusBar.h>
@@ -128,16 +128,16 @@ void sv4guiFileSaveProjectAsAction::Run()
 
         std::list< mitk::DataNode::Pointer > selectedList = nodeSelection->GetSelectedDataNodes();
 
-        berry::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
-        berry::IPreferences::Pointer prefs;
+        mitk::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
+        mitk::IPreferences* prefs;
 
         if (prefService)
         {
             prefs = prefService->GetSystemPreferences()->Node("/General");
         }
         else
         {
-            prefs = berry::IPreferences::Pointer(0);
+            prefs = nullptr; 
         }
 
 
@@ -154,9 +154,9 @@ void sv4guiFileSaveProjectAsAction::Run()
           }
 
           QString lastSVProjPath="";
-          if(prefs.IsNotNull())
+          if(prefs != nullptr)
           {
-              lastSVProjPath = prefs->Get("LastSVProjPath", prefs->Get("LastSVProjCreatParentPath", ""));
+              lastSVProjPath = QString::fromStdString(prefs->Get("LastSVProjPath", prefs->Get("LastSVProjCreatParentPath", "")));
           }
 
           if(lastSVProjPath=="")

diff --git a/Code/Source/sv4gui/Plugins/org.sv.gui.qt.application/sv4gui_ProjectCreate.cxx b/Code/Source/sv4gui/Plugins/org.sv.gui.qt.application/sv4gui_ProjectCreate.cxx
@@ -35,8 +35,8 @@
 #include "sv4gui_ProjectManager.h"
 
 #include <berryPlatform.h>
-#include <berryIPreferences.h>
-#include <berryIPreferencesService.h>
+#include <mitkIPreferences.h>
+#include <mitkIPreferencesService.h>
 
 #include <QMessageBox>
 #include <QFile>
@@ -53,20 +53,21 @@ sv4guiProjectCreate::sv4guiProjectCreate(mitk::DataStorage::Pointer dataStorage)
     connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(Cancel()));
     connect(ui->btnBrowse, SIGNAL(clicked()), this, SLOT(ChoosePath()));
 
-    berry::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
-    berry::IPreferences::Pointer prefs;
+    mitk::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
+    mitk::IPreferences* prefs;
+
    if (prefService)
    {
        prefs = prefService->GetSystemPreferences()->Node("/General");
    }
    else
    {
-       prefs = berry::IPreferences::Pointer(0);
+       prefs = nullptr; 
    }
 
-   if(prefs.IsNotNull())
+   if(prefs != nullptr)
    {
-       m_LastPath = prefs->Get("LastSVProjCreatParentPath", "");
+       m_LastPath = QString::fromStdString(prefs->Get("LastSVProjCreatParentPath", ""));
    }
 
    if(m_LastPath=="")
@@ -75,8 +76,6 @@ sv4guiProjectCreate::sv4guiProjectCreate(mitk::DataStorage::Pointer dataStorage)
    ui->lineEditDir->setText(m_LastPath);
 }
 
-
-
 sv4guiProjectCreate::~sv4guiProjectCreate()
 {
     delete ui;
@@ -117,19 +116,21 @@ void sv4guiProjectCreate::CreateNewProject()
     sv4guiProjectManager::AddProject(m_DataStorage, projName,projParentDir,true);
 
     m_LastPath=projParentDir;
-    berry::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
-    berry::IPreferences::Pointer prefs;
+    mitk::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
+    mitk::IPreferences* prefs;
+
     if (prefService)
     {
         prefs = prefService->GetSystemPreferences()->Node("/General");
     }
     else
     {
-        prefs = berry::IPreferences::Pointer(0);
+        prefs = nullptr; 
     }
-    if(prefs.IsNotNull())
+
+    if(prefs != nullptr)
     {
-        prefs->Put("LastSVProjCreatParentPath", m_LastPath);
+        prefs->Put("LastSVProjCreatParentPath", m_LastPath.toStdString());
         prefs->Flush();
     }
 

diff --git a/Code/Source/sv4gui/Plugins/org.sv.gui.qt.application/sv4gui_WorkbenchIntroPart.cxx b/Code/Source/sv4gui/Plugins/org.sv.gui.qt.application/sv4gui_WorkbenchIntroPart.cxx
@@ -36,8 +36,8 @@
 #include <berryIWorkbenchPage.h>
 #include <berryIPerspectiveRegistry.h>
 #include <berryWorkbenchPreferenceConstants.h>
-#include <berryIPreferences.h>
-#include <berryIPreferencesService.h>
+#include <mitkIPreferences.h>
+#include <mitkIPreferencesService.h>
 #include <berryPlatform.h>
 
 #include <berryIEditorReference.h>
@@ -78,7 +78,7 @@
 sv4guiWorkbenchIntroPart::sv4guiWorkbenchIntroPart()
     : m_Controls(nullptr)
 {
-    berry::IPreferences::Pointer workbenchPrefs = sv4guiApplicationPluginActivator::GetDefault()->GetPreferencesService()->GetSystemPreferences();
+    mitk::IPreferences* workbenchPrefs = sv4guiApplicationPluginActivator::GetDefault()->GetPreferencesService()->GetSystemPreferences();
     workbenchPrefs->PutBool(berry::WorkbenchPreferenceConstants::SHOW_INTRO, true);
     workbenchPrefs->Flush();
 }
@@ -88,13 +88,13 @@ sv4guiWorkbenchIntroPart::~sv4guiWorkbenchIntroPart()
     // if the workbench is not closing (that means, welcome screen was closed explicitly), set "Show_intro" false
     if (!this->GetIntroSite()->GetPage()->GetWorkbenchWindow()->GetWorkbench()->IsClosing())
     {
-        berry::IPreferences::Pointer workbenchPrefs = sv4guiApplicationPluginActivator::GetDefault()->GetPreferencesService()->GetSystemPreferences();
+        mitk::IPreferences* workbenchPrefs = sv4guiApplicationPluginActivator::GetDefault()->GetPreferencesService()->GetSystemPreferences();
         workbenchPrefs->PutBool(berry::WorkbenchPreferenceConstants::SHOW_INTRO, false);
         workbenchPrefs->Flush();
     }
     else
     {
-        berry::IPreferences::Pointer workbenchPrefs = sv4guiApplicationPluginActivator::GetDefault()->GetPreferencesService()->GetSystemPreferences();
+        mitk::IPreferences* workbenchPrefs = sv4guiApplicationPluginActivator::GetDefault()->GetPreferencesService()->GetSystemPreferences();
         workbenchPrefs->PutBool(berry::WorkbenchPreferenceConstants::SHOW_INTRO, true);
         workbenchPrefs->Flush();
     }

diff --git a/Code/Source/sv4gui/Plugins/org.sv.gui.qt.application/sv4gui_WorkbenchWindowAdvisor.cxx b/Code/Source/sv4gui/Plugins/org.sv.gui.qt.application/sv4gui_WorkbenchWindowAdvisor.cxx
@@ -77,7 +77,7 @@
 #include <berryIActionBarConfigurer.h>
 #include <berryIWorkbenchWindow.h>
 #include <berryIWorkbenchPage.h>
-#include <berryIPreferencesService.h>
+#include <mitkIPreferencesService.h>
 #include <berryIPerspectiveRegistry.h>
 #include <berryIPerspectiveDescriptor.h>
 #include <berryIProduct.h>
@@ -106,7 +106,7 @@
 #include <QmitkStdMultiWidget.h>
 
 #include <itkConfigure.h>
-#include <vtkConfigure.h>
+//dp #include <vtkConfigure.h>  what is this?
 #include <vtkVersionMacros.h>
 
 #include <mitkVersion.h>
@@ -581,15 +581,20 @@ void sv4guiWorkbenchWindowAdvisor::PostWindowCreate()
     searchPaths.push_front( QString(":/org_mitk_icons/icons/") );
     QIcon::setThemeSearchPaths( searchPaths );
 
-    berry::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
-    berry::IPreferences::Pointer stylePref = prefService->GetSystemPreferences()->Node(berry::QtPreferences::QT_STYLES_NODE);
-    //QString iconTheme = stylePref->Get(berry::QtPreferences::QT_ICON_THEME, "<<default>>");
-    QString iconTheme = stylePref->Get(berry::QtPreferences::QT_STYLES_NODE, "<<default>>");
-    if( iconTheme == QString( "<<default>>" ) )
+    mitk::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
+    mitk::IPreferences* stylePref = prefService->GetSystemPreferences()->Node(berry::QtPreferences::QT_STYLES_NODE);
+
+    auto iconTheme = stylePref->Get(berry::QtPreferences::QT_STYLES_NODE, "<<default>>");
+    //dp QString iconTheme = stylePref->Get(berry::QtPreferences::QT_STYLES_NODE, "<<default>>");
+
+    if( iconTheme == "<<default>>")
+    //dp if( iconTheme == QString( "<<default>>" ) )
     {
-        iconTheme = QString( "tango" );
+        iconTheme = "tango";
+        //dp iconTheme = QString( "tango" );
     }
-    QIcon::setThemeName( iconTheme );
+    QIcon::setThemeName( QString::fromStdString(iconTheme));
+    //dp QIcon::setThemeName( iconTheme );
 
     // ==== Application menu ============================
 
@@ -1174,7 +1179,8 @@ void sv4guiWorkbenchWindowAdvisor::ShowSVView()
     if(list.size()==0)
         return;
 
-    QList<mitk::DataNode::Pointer> nodes=QList<mitk::DataNode::Pointer>::fromStdList(list);
+    auto nodes = QList<mitk::DataNode::Pointer>(list.begin(), list.end());
+    //dp QList<mitk::DataNode::Pointer> nodes=QList<mitk::DataNode::Pointer>::fromStdList(list);
 
     if(nodes.size() < 1)
     {
@@ -1541,7 +1547,8 @@ void sv4guiWorkbenchWindowAdvisor::RemoveSelectedNodes( bool )
     if(list.size()==0)
         return;
 
-    QList<mitk::DataNode::Pointer> nodes=QList<mitk::DataNode::Pointer>::fromStdList(list);
+    auto nodes = QList<mitk::DataNode::Pointer>(list.begin(), list.end());
+    //dp QList<mitk::DataNode::Pointer> nodes=QList<mitk::DataNode::Pointer>::fromStdList(list);
 
     if(nodes.size() < 1)
     {
@@ -1639,7 +1646,8 @@ void sv4guiWorkbenchWindowAdvisor::RenameSelectedNode( bool )
     if(list.size()==0)
         return;
 
-    QList<mitk::DataNode::Pointer> nodes=QList<mitk::DataNode::Pointer>::fromStdList(list);
+    auto nodes = QList<mitk::DataNode::Pointer>(list.begin(), list.end());
+    //dp QList<mitk::DataNode::Pointer> nodes=QList<mitk::DataNode::Pointer>::fromStdList(list);
 
     if(nodes.size() < 1)
     {
@@ -1713,7 +1721,8 @@ void sv4guiWorkbenchWindowAdvisor::CopyDataNode( bool )
     if(list.size()==0)
         return;
 
-    QList<mitk::DataNode::Pointer> nodes=QList<mitk::DataNode::Pointer>::fromStdList(list);
+    auto nodes = QList<mitk::DataNode::Pointer>(list.begin(), list.end());
+    //dp QList<mitk::DataNode::Pointer> nodes=QList<mitk::DataNode::Pointer>::fromStdList(list);
 
     if(nodes.size() < 1)
     {
@@ -1738,7 +1747,8 @@ void sv4guiWorkbenchWindowAdvisor::PasteDataNode( bool )
     if(list.size()==0)
         return;
 
-    QList<mitk::DataNode::Pointer> nodes=QList<mitk::DataNode::Pointer>::fromStdList(list);
+    auto nodes = QList<mitk::DataNode::Pointer>(list.begin(), list.end());
+    //dp QList<mitk::DataNode::Pointer> nodes=QList<mitk::DataNode::Pointer>::fromStdList(list);
 
     if(nodes.size() < 1)
     {

diff --git a/Code/Source/sv4gui/Plugins/org.sv.gui.qt.application/sv4gui_WorkbenchWindowAdvisorHack.cxx b/Code/Source/sv4gui/Plugins/org.sv.gui.qt.application/sv4gui_WorkbenchWindowAdvisorHack.cxx
@@ -70,6 +70,7 @@
 #include <QLabel>
 #include <QInputDialog>
 #include <QLineEdit>
+#include <QRegularExpression>
 
 #include <ctkPluginException.h>
 #include <service/event/ctkEventAdmin.h>
@@ -79,7 +80,7 @@
 #include <berryIActionBarConfigurer.h>
 #include <berryIWorkbenchWindow.h>
 #include <berryIWorkbenchPage.h>
-#include <berryIPreferencesService.h>
+#include <mitkIPreferencesService.h>
 #include <berryIPerspectiveRegistry.h>
 #include <berryIPerspectiveDescriptor.h>
 #include <berryIProduct.h>
@@ -108,7 +109,7 @@
 #include <QmitkStdMultiWidget.h>
 
 #include <itkConfigure.h>
-#include <vtkConfigure.h>
+//dp #include <vtkConfigure.h>
 #include <vtkVersionMacros.h>
 
 #include <mitkVersion.h>
@@ -256,8 +257,8 @@ void sv4guiWorkbenchWindowAdvisorHack::onIntro()
             berry::PlatformUI::GetWorkbench()->GetIntroManager()->HasIntro();
     if (!hasIntro)
     {
-        QRegExp reg("(.*)<title>(\\n)*");
-        QRegExp reg2("(\\n)*</title>(.*)");
+        QRegularExpression reg("(.*)<title>(\\n)*");
+        QRegularExpression reg2("(\\n)*</title>(.*)");
         QFile file(":/org.mitk.gui.qt.ext/index.html");
         file.open(QIODevice::ReadOnly | QIODevice::Text); //text file only for reading
 
@@ -337,6 +338,7 @@ void sv4guiWorkbenchWindowAdvisorHack::onHelpOpenHelpPerspective()
 
 void sv4guiWorkbenchWindowAdvisorHack::onAbout()
 {
-    auto   aboutDialog = new sv4guiAboutDialog(QApplication::activeWindow(),nullptr);
+    Qt::WindowFlags wflags = {};
+    auto   aboutDialog = new sv4guiAboutDialog(QApplication::activeWindow(), wflags);
     aboutDialog->open();
 }