Merge remote branch 'noldenCTK/dicom-database' into retrieve-to-database

Libs/DICOM/Core/ctkDICOMDatabase.cpp

@@ -149,6 +149,17 @@ const QString ctkDICOMDatabase::GetDatabaseFilename() const {
 }
 
 //------------------------------------------------------------------------------
+const QString ctkDICOMDatabase::GetDatabaseDirectory() const {
+  Q_D(const ctkDICOMDatabase);
+  QString databaseFile = GetDatabaseFilename();
+  if (!QFileInfo(databaseFile).isAbsolute())
+  {
+    databaseFile.prepend(QDir::currentPath() + "/");
+  }
+  return QFileInfo ( databaseFile ).absoluteDir().path();
+}
+
+//------------------------------------------------------------------------------
 const QSqlDatabase& ctkDICOMDatabase::database() const {
   Q_D(const ctkDICOMDatabase);
   return d->Database;

Libs/DICOM/Core/ctkDICOMDatabase.h

@@ -41,6 +41,7 @@ public:
   const QSqlDatabase& database() const;
   const QString GetLastError() const;
   const QString GetDatabaseFilename() const;
+  const QString GetDatabaseDirectory() const;
 
   ///
   /// open the SQLite database in @param file. If the file does not

Libs/DICOM/Core/ctkDICOMIndexer.cpp

@@ -397,13 +397,7 @@ void ctkDICOMIndexer::addDirectory(ctkDICOMDatabase& database, const QString& di
 
     if (createThumbnails)
     {
-      QString databaseFile = database.GetDatabaseFilename();
-      if (!QFileInfo(databaseFile).isAbsolute())
-      {
-        databaseFile.prepend(QDir::currentPath() + "/");
-      }
-
-      QString thumbnailBaseDir = QFileInfo ( databaseFile ).absoluteDir().path() + "/thumbs/";
+      QString thumbnailBaseDir =  database.GetDatabaseDirectory() + "/thumbs/";
       QString thumbnailFilename = thumbnailBaseDir + "/" + studySeriesDirectory + "/" + sopInstanceUID.c_str() + ".png";
       QFileInfo thumbnailInfo(thumbnailFilename);
       if ( ! ( thumbnailInfo.exists() && thumbnailInfo.lastModified() < QFileInfo(qfilename).lastModified() ) )