Преглед на файлове

Add connection name option to dicom database

Allow dicom query database connection to exist alongside
main database connection.
Steve Pieper преди 14 години
родител
ревизия
f80f865291
променени са 3 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 2 2
      Libs/DICOM/Core/ctkDICOMDatabase.cpp
  2. 1 1
      Libs/DICOM/Core/ctkDICOMDatabase.h
  3. 1 1
      Libs/DICOM/Widgets/ctkDICOMQueryRetrieveWidget.cpp

+ 2 - 2
Libs/DICOM/Core/ctkDICOMDatabase.cpp

@@ -95,10 +95,10 @@ ctkDICOMDatabasePrivate::~ctkDICOMDatabasePrivate()
 }
 
 //------------------------------------------------------------------------------
-void ctkDICOMDatabase::openDatabase(const QString databaseFile)
+void ctkDICOMDatabase::openDatabase(const QString databaseFile, const QString& connectionName )
 {
   Q_D(ctkDICOMDatabase);
-  d->Database = QSqlDatabase::addDatabase("QSQLITE","DICOM-DB");
+  d->Database = QSqlDatabase::addDatabase("QSQLITE",connectionName);
   d->Database.setDatabaseName(databaseFile);
   if ( ! (d->Database.open()) )
     {

+ 1 - 1
Libs/DICOM/Core/ctkDICOMDatabase.h

@@ -47,7 +47,7 @@ public:
   /// open the SQLite database in @param file. If the file does not
   /// exist, a new database is created and initialized with the
   /// default schema
-  virtual void openDatabase(const QString file);
+  virtual void openDatabase(const QString databaseFile, const QString& connectionName = "DICOM-DB" );
 
   ///
   /// close the database. It must not be used afterwards.

+ 1 - 1
Libs/DICOM/Widgets/ctkDICOMQueryRetrieveWidget.cpp

@@ -76,7 +76,7 @@ void ctkDICOMQueryRetrieveWidget::processQuery()
   d->RetrieveButton->setEnabled(false);
   
   // create a database in memory to hold query results
-  try { d->QueryResultDatabase.openDatabase( ":memory:" ); }
+  try { d->QueryResultDatabase.openDatabase( ":memory:", "QUERY-DB" ); }
   catch (std::exception e)
   {
     logger.error ( "Database error: " + d->QueryResultDatabase.lastError() );