BUG: Fix DICOM browser test

Get database folder settings key from ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey().
commontk · Sep 3, 2019 · 5f6bf67 · 5f6bf67
1 parent f24eca8
commit 5f6bf67
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 29 deletions.
diff --git a/Applications/ctkDICOM/ctkDICOMMain.cpp b/Applications/ctkDICOM/ctkDICOMMain.cpp
@@ -29,6 +29,7 @@
 #include <ctkDICOMAppWidget.h>
 
 // ctkDICOMCore includes
+#include "ctkDICOMBrowser.h"
 #include "ctkDICOMDatabase.h"
 #include "ctkDICOMModel.h"
 
@@ -56,17 +57,17 @@ int main(int argc, char** argv)
   if (argc > 1)
   {
     QString directory(argv[1]);
-    settings.setValue("DatabaseDirectory", directory);
+    settings.setValue(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), directory);
     settings.sync();
   }
 
-  if ( settings.value("DatabaseDirectory", "") == "" )
+  if ( settings.value(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), "") == "" )
   {
     databaseDirectory = QString("./ctkDICOM-Database");
     std::cerr << "No DatabaseDirectory on command line or in settings.  Using \"" << databaseDirectory.toLatin1().data() << "\".\n";
   } else
   {
-    databaseDirectory = settings.value("DatabaseDirectory", "").toString();
+    databaseDirectory = settings.value(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), "").toString();
   }
 
   QDir qdir(databaseDirectory);

diff --git a/Applications/ctkDICOM2/ctkDICOM2Main.cpp b/Applications/ctkDICOM2/ctkDICOM2Main.cpp
@@ -56,17 +56,17 @@ int main(int argc, char** argv)
   if (argc > 1)
   {
     QString directory(argv[1]);
-    settings.setValue("DatabaseDirectory", directory);
+    settings.setValue(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), directory);
     settings.sync();
   }
 
-  if ( settings.value("DatabaseDirectory", "") == "" )
+  if ( settings.value(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), "") == "" )
   {
     databaseDirectory = QString("./ctkDICOM-Database");
     std::cerr << "No DatabaseDirectory on command line or in settings.  Using \"" << databaseDirectory.toLatin1().data() << "\".\n";
   } else
   {
-    databaseDirectory = settings.value("DatabaseDirectory", "").toString();
+    databaseDirectory = settings.value(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), "").toString();
   }
 
   QDir qdir(databaseDirectory);

diff --git a/Applications/ctkDICOMHost/ctkDICOMHostMain.cpp b/Applications/ctkDICOMHost/ctkDICOMHostMain.cpp
@@ -128,17 +128,17 @@ int main(int argc, char** argv)
   if (argc > 1)
   {
     QString directory(argv[1]);
-    settings.setValue("DatabaseDirectory", directory);
+    settings.setValue(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), directory);
     settings.sync();
   }
 
-  if ( settings.value("DatabaseDirectory", "") == "" )
+  if ( settings.value(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), "") == "" )
   {
     databaseDirectory = QString("./ctkDICOM-Database");
     std::cerr << "No DatabaseDirectory on command line or in settings.  Using \"" << databaseDirectory.toLatin1().data() << "\".\n";
   } else
   {
-    databaseDirectory = settings.value("DatabaseDirectory", "").toString();
+    databaseDirectory = settings.value(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), "").toString();
   }
 
   QDir qdir(databaseDirectory);

diff --git a/Applications/ctkDICOMQueryRetrieve/ctkDICOMQueryRetrieveMain.cpp b/Applications/ctkDICOMQueryRetrieve/ctkDICOMQueryRetrieveMain.cpp
@@ -56,17 +56,17 @@ int main(int argc, char** argv)
   if (argc > 1)
   {
     QString directory(argv[1]);
-    settings.setValue("DatabaseDirectory", directory);
+    settings.setValue(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), directory);
     settings.sync();
   }
 
-  if ( settings.value("DatabaseDirectory", "") == "" )
+  if ( settings.value(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), "") == "" )
   {
     databaseDirectory = QString("./ctkDICOM-Database");
     std::cerr << "No DatabaseDirectory on command line or in settings.  Using \"" << databaseDirectory.toLatin1().data() << "\".\n";
   } else
   {
-    databaseDirectory = settings.value("DatabaseDirectory", "").toString();
+    databaseDirectory = settings.value(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), "").toString();
   }
 
   QDir qdir(databaseDirectory);

diff --git a/Libs/DICOM/Widgets/Testing/Cpp/ctkDICOMBrowserTest.cpp b/Libs/DICOM/Widgets/Testing/Cpp/ctkDICOMBrowserTest.cpp
@@ -95,15 +95,15 @@ void ctkDICOMBrowserTester::init()
 void ctkDICOMBrowserTester::testDefaults()
 {
   // Clear left over settings
-  QSettings().remove(ctkDICOMBrowser::databaseDirectorySettingsKey());
+  QSettings().remove(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey());
 
   ctkDICOMBrowser browser;
 
   QVERIFY(QFileInfo("./ctkDICOM-Database").isDir());
   QVERIFY(QFileInfo("./ctkDICOM-Database/ctkDICOM.sql").isFile());
   QVERIFY(QFileInfo("./ctkDICOM-Database/ctkDICOMTagCache.sql").isFile());
 
-  QCOMPARE(ctkDICOMBrowser::databaseDirectorySettingsKey(), QString("DatabaseDirectory"));
+  QCOMPARE(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), QString("DatabaseDirectory"));
 
   QCOMPARE(browser.databaseDirectory(), QString("./ctkDICOM-Database"));
   QVERIFY(browser.database() != 0);
@@ -126,7 +126,7 @@ void ctkDICOMBrowserTester::testDatabaseDirectory()
 {
   // Check that value from setting is picked up
   {
-  QSettings().setValue(ctkDICOMBrowser::databaseDirectorySettingsKey(), this->TemporaryDatabaseDirectoryName);
+  QSettings().setValue(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), this->TemporaryDatabaseDirectoryName);
   QCOMPARE(QFileInfo(this->TemporaryDatabaseDirectoryName).isDir(), false);
 
   ctkDICOMBrowser browser;
@@ -140,7 +140,7 @@ void ctkDICOMBrowserTester::testDatabaseDirectory()
 // ----------------------------------------------------------------------------
 void ctkDICOMBrowserTester::testImportDirectoryMode()
 {
-  QSettings().setValue(ctkDICOMBrowser::databaseDirectorySettingsKey(), this->TemporaryDatabaseDirectoryName);
+  QSettings().setValue(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), this->TemporaryDatabaseDirectoryName);
 
   ctkDICOMBrowser browser;
 
@@ -165,7 +165,7 @@ void ctkDICOMBrowserTester::testImportDirectories()
   QFETCH(QStringList, directories);
   QFETCH(ctkDICOMBrowser::ImportDirectoryMode, importDirectoryMode);
 
-  QSettings().setValue(ctkDICOMBrowser::databaseDirectorySettingsKey(), this->TemporaryDatabaseDirectoryName);
+  QSettings().setValue(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), this->TemporaryDatabaseDirectoryName);
 
   ctkDICOMBrowser browser;
 
@@ -234,7 +234,7 @@ void ctkDICOMBrowserTester::testImportDirectory()
   QFETCH(QStringList, directories);
   QFETCH(ctkDICOMBrowser::ImportDirectoryMode, importDirectoryMode);
 
-  QSettings().setValue(ctkDICOMBrowser::databaseDirectorySettingsKey(), this->TemporaryDatabaseDirectoryName);
+  QSettings().setValue(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), this->TemporaryDatabaseDirectoryName);
 
   ctkDICOMBrowser browser;
 
@@ -277,7 +277,7 @@ void ctkDICOMBrowserTester::testOnImportDirectory()
   QFETCH(QStringList, directories);
   QFETCH(ctkDICOMBrowser::ImportDirectoryMode, importDirectoryMode);
 
-  QSettings().setValue(ctkDICOMBrowser::databaseDirectorySettingsKey(), this->TemporaryDatabaseDirectoryName);
+  QSettings().setValue(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), this->TemporaryDatabaseDirectoryName);
 
   ctkDICOMBrowser browser;
 

diff --git a/Libs/DICOM/Widgets/ctkDICOMAppWidget.cpp b/Libs/DICOM/Widgets/ctkDICOMAppWidget.cpp
@@ -44,6 +44,7 @@
 #include "ctkFileDialog.h"
 
 // ctkDICOMCore includes
+#include "ctkDICOMBrowser.h"
 #include "ctkDICOMDatabase.h"
 #include "ctkDICOMFilterProxyModel.h"
 #include "ctkDICOMIndexer.h"
@@ -277,13 +278,13 @@ ctkDICOMAppWidget::ctkDICOMAppWidget(QWidget* _parent):Superclass(_parent),
 
   //initialize directory from settings, then listen for changes
   QSettings settings;
-  if ( settings.value("DatabaseDirectory", "") == "" )
+  if ( settings.value(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), "") == "" )
     {
     QString directory = QString("./ctkDICOM-Database");
-    settings.setValue("DatabaseDirectory", directory);
+    settings.setValue(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), directory);
     settings.sync();
     }
-  QString databaseDirectory = settings.value("DatabaseDirectory").toString();
+  QString databaseDirectory = settings.value(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey()).toString();
   this->setDatabaseDirectory(databaseDirectory);
   d->DirectoryButton->setDirectory(databaseDirectory);
 
@@ -392,7 +393,7 @@ void ctkDICOMAppWidget::setDatabaseDirectory(const QString& directory)
   Q_D(ctkDICOMAppWidget);
 
   QSettings settings;
-  settings.setValue("DatabaseDirectory", directory);
+  settings.setValue(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey(), directory);
   settings.sync();
 
   //close the active DICOM database
@@ -433,7 +434,7 @@ void ctkDICOMAppWidget::setDatabaseDirectory(const QString& directory)
 QString ctkDICOMAppWidget::databaseDirectory() const
 {
   QSettings settings;
-  return settings.value("DatabaseDirectory").toString();
+  return settings.value(ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey()).toString();
 }
 
 //----------------------------------------------------------------------------

diff --git a/Libs/DICOM/Widgets/ctkDICOMBrowser.cpp b/Libs/DICOM/Widgets/ctkDICOMBrowser.cpp
@@ -166,7 +166,7 @@ ctkDICOMBrowserPrivate::ctkDICOMBrowserPrivate(ctkDICOMBrowser* parent, QString
 {
   if (this->DatabaseDirectorySettingsKey.isEmpty())
   {
-    this->DatabaseDirectorySettingsKey = "DatabaseDirectory";
+    this->DatabaseDirectorySettingsKey = ctkDICOMBrowser::defaultDatabaseDirectorySettingsKey();
   }
 }
 
@@ -592,14 +592,14 @@ void ctkDICOMBrowser::setDatabaseDirectory(const QString& directory)
   }
 
   // update the database schema if needed and provide progress
-  QString udpatedDatabaseDirectory = this->updateDatabaseSchemaIfNeeded();
-  if (!udpatedDatabaseDirectory.isEmpty())
+  QString updatedDatabaseDirectory = this->updateDatabaseSchemaIfNeeded();
+  if (!updatedDatabaseDirectory.isEmpty())
   {
     // close the active DICOM database, which needed to be updated
     d->DICOMDatabase->closeDatabase();
 
     // open DICOM database on the directory
-    QString updatedDatabaseFileName = udpatedDatabaseDirectory + QString("/ctkDICOM.sql");
+    QString updatedDatabaseFileName = updatedDatabaseDirectory + QString("/ctkDICOM.sql");
     try
     {
       d->DICOMDatabase->openDatabase( updatedDatabaseFileName );
@@ -612,7 +612,7 @@ void ctkDICOMBrowser::setDatabaseDirectory(const QString& directory)
     }
   }
 
-  QString currentDatabaseDirectory(!udpatedDatabaseDirectory.isEmpty() ? udpatedDatabaseDirectory : directory);
+  QString currentDatabaseDirectory(!updatedDatabaseDirectory.isEmpty() ? updatedDatabaseDirectory : directory);
 
   // Save new database directory in settings.
   QSettings settings;

diff --git a/Libs/DICOM/Widgets/ctkDICOMBrowser.h b/Libs/DICOM/Widgets/ctkDICOMBrowser.h
@@ -83,6 +83,8 @@ class CTK_DICOM_WIDGETS_EXPORT ctkDICOMBrowser : public QWidget
   /// Return settings key used to store the directory.
   Q_INVOKABLE QString databaseDirectorySettingsKey() const;
 
+  Q_INVOKABLE static QString defaultDatabaseDirectorySettingsKey() { return QString("DatabaseDirectory"); };
+
   /// See ctkDICOMDatabase for description - these accessors
   /// delegate to the corresponding routines of the internal
   /// instance of the database.