ENH: ctkDICOMBrowser: Rename "onImportDir..." function to "importDir..."

To maintain backward compatibility, deprecates "onImportDirectory" in favor
of "importDirectory".

Libs/DICOM/Widgets/Testing/Cpp/ctkDICOMBrowserTest.cpp

@@ -42,9 +42,13 @@ private slots:
 
   void testDatabaseDirectory();
 
-  void testOnImportDirectories();
-  void testOnImportDirectories_data();
+  void testImportDirectories();
+  void testImportDirectories_data();
 
+  void testImportDirectory();
+  void testImportDirectory_data();
+
+  // Deprecated
   void testOnImportDirectory();
   void testOnImportDirectory_data();
 
@@ -131,7 +135,7 @@ void ctkDICOMBrowserTester::testDatabaseDirectory()
 }
 
 // ----------------------------------------------------------------------------
-void ctkDICOMBrowserTester::testOnImportDirectories()
+void ctkDICOMBrowserTester::testImportDirectories()
 {
   QFETCH(QStringList, directories);
   QFETCH(ctkDICOMBrowser::ImportDirectoryMode, importDirectoryMode);
@@ -141,7 +145,7 @@ void ctkDICOMBrowserTester::testOnImportDirectories()
   ctkDICOMBrowser browser;
 
   browser.setDisplayImportSummary(false);
-  browser.onImportDirectories(directories, /* mode= */ importDirectoryMode, /* confirm= */ false);
+  browser.importDirectories(directories, /* mode= */ importDirectoryMode, /* confirm= */ false);
 
   this->_testImportCommon(browser);
 }
@@ -194,13 +198,13 @@ void ctkDICOMBrowserTester::_testImportCommon(ctkDICOMBrowser& browser)
 }
 
 // ----------------------------------------------------------------------------
-void ctkDICOMBrowserTester::testOnImportDirectories_data()
+void ctkDICOMBrowserTester::testImportDirectories_data()
 {
-  this->testOnImportDirectory_data();
+  this->testImportDirectory_data();
 }
 
 // ----------------------------------------------------------------------------
-void ctkDICOMBrowserTester::testOnImportDirectory()
+void ctkDICOMBrowserTester::testImportDirectory()
 {
   QFETCH(QStringList, directories);
   QFETCH(ctkDICOMBrowser::ImportDirectoryMode, importDirectoryMode);
@@ -210,13 +214,13 @@ void ctkDICOMBrowserTester::testOnImportDirectory()
   ctkDICOMBrowser browser;
 
   browser.setDisplayImportSummary(false);
-  browser.onImportDirectory(directories[0], /* mode= */ importDirectoryMode, /* confirm= */ false);
+  browser.importDirectory(directories[0], /* mode= */ importDirectoryMode, /* confirm= */ false);
 
   this->_testImportCommon(browser);
 }
 
 // ----------------------------------------------------------------------------
-void ctkDICOMBrowserTester::testOnImportDirectory_data()
+void ctkDICOMBrowserTester::testImportDirectory_data()
 {
   QTest::addColumn<QStringList>("directories");
   QTest::addColumn<ctkDICOMBrowser::ImportDirectoryMode>("importDirectoryMode");
@@ -243,5 +247,27 @@ void ctkDICOMBrowserTester::testOnImportDirectory_data()
 }
 
 // ----------------------------------------------------------------------------
+void ctkDICOMBrowserTester::testOnImportDirectory()
+{
+  QFETCH(QStringList, directories);
+  QFETCH(ctkDICOMBrowser::ImportDirectoryMode, importDirectoryMode);
+
+  QSettings().setValue(ctkDICOMBrowser::databaseDirectorySettingsKey(), this->TemporaryDatabaseDirectoryName);
+
+  ctkDICOMBrowser browser;
+
+  browser.setDisplayImportSummary(false);
+  browser.onImportDirectory(directories[0], /* mode= */ importDirectoryMode, /* confirm= */ false);
+
+  this->_testImportCommon(browser);
+}
+
+// ----------------------------------------------------------------------------
+void ctkDICOMBrowserTester::testOnImportDirectory_data()
+{
+  this->testImportDirectory_data();
+}
+
+// ----------------------------------------------------------------------------
 CTK_TEST_MAIN(ctkDICOMBrowserTest)
 #include "moc_ctkDICOMBrowserTest.cpp"

Libs/DICOM/Widgets/Testing/Cpp/ctkDICOMBrowserTest1.cpp

@@ -74,7 +74,7 @@ int ctkDICOMBrowserTest1( int argc, char * argv [] )
   CHECK_INT(browser.importDirectoryMode(), static_cast<int>(ctkDICOMBrowser::ImportDirectoryCopy));
   CHECK_BOOL(browser.skipConfirmImportDirectory(), true);
 
-  browser.onImportDirectories(QStringList() << argv[1]);
+  browser.importDirectories(QStringList() << argv[1]);
 
   // reset to the original copy/import setting
   settings.setValue("MainWindow/DontConfirmCopyOnImport", settingsString);

Libs/DICOM/Widgets/ctkDICOMBrowser.cpp

@@ -713,7 +713,7 @@ void ctkDICOMBrowser::onImportDirectoriesSelected(QStringList directories)
     {
     return;
     }
-  this->onImportDirectories(directories, this->importDirectoryMode(), /* confirm= */ false);
+  this->importDirectories(directories, this->importDirectoryMode(), /* confirm= */ false);
 
   // Clear selection
   d->ImportDialog->clearSelection();
@@ -728,7 +728,7 @@ void ctkDICOMBrowser::onImportDirectoryComboBoxCurrentIndexChanged(int index)
 }
 
 //----------------------------------------------------------------------------
-void ctkDICOMBrowser::onImportDirectories(QStringList directories, ctkDICOMBrowser::ImportDirectoryMode mode, bool confirm)
+void ctkDICOMBrowser::importDirectories(QStringList directories, ctkDICOMBrowser::ImportDirectoryMode mode, bool confirm)
 {
   Q_D(ctkDICOMBrowser);
   if(confirm && !d->confirmDirectoryImport())
@@ -748,7 +748,7 @@ void ctkDICOMBrowser::onImportDirectories(QStringList directories, ctkDICOMBrows
 }
 
 //----------------------------------------------------------------------------
-void ctkDICOMBrowser::onImportDirectory(QString directory, ctkDICOMBrowser::ImportDirectoryMode mode, bool confirm)
+void ctkDICOMBrowser::importDirectory(QString directory, ctkDICOMBrowser::ImportDirectoryMode mode, bool confirm)
 {
   Q_D(ctkDICOMBrowser);
   if(confirm && !d->confirmDirectoryImport())
@@ -764,6 +764,12 @@ void ctkDICOMBrowser::onImportDirectory(QString directory, ctkDICOMBrowser::Impo
 }
 
 //----------------------------------------------------------------------------
+void ctkDICOMBrowser::onImportDirectory(QString directory, ctkDICOMBrowser::ImportDirectoryMode mode, bool confirm)
+{
+  this->importDirectory(directory, mode, confirm);
+}
+
+//----------------------------------------------------------------------------
 void ctkDICOMBrowserPrivate::importDirectory(QString directory, ctkDICOMBrowser::ImportDirectoryMode mode)
 {
   if (!QDir(directory).exists())

Libs/DICOM/Widgets/ctkDICOMBrowser.h

@@ -167,8 +167,8 @@ public Q_SLOTS:
   ///
   /// Setting \a confirm to false will skip the confirmation dialog.
   ///
-  /// \sa onImportDirectory(QString directory, int mode)
-  void onImportDirectories(QStringList directories, ctkDICOMBrowser::ImportDirectoryMode mode = ImportDirectoryAddLink, bool confirm = true);
+  /// \sa importDirectory(QString directory, int mode)
+  void importDirectories(QStringList directories, ctkDICOMBrowser::ImportDirectoryMode mode = ImportDirectoryAddLink, bool confirm = true);
 
   /// \brief Import a directory
   ///
@@ -177,6 +177,9 @@ public Q_SLOTS:
   /// By default, \a mode is ImportDirectoryMode::ImportDirectoryCopy and \a confirm is true.
   ///
   /// Setting \a confirm to false will skip the confirmation dialog.
+  void importDirectory(QString directory, ctkDICOMBrowser::ImportDirectoryMode mode = ImportDirectoryAddLink, bool confirm = true);
+
+  /// \deprecated importDirectory() should be used
   void onImportDirectory(QString directory, ctkDICOMBrowser::ImportDirectoryMode mode = ImportDirectoryAddLink, bool confirm = true);
 
   /// slots to capture status updates from the database during an
@@ -212,7 +215,7 @@ protected Q_SLOTS:
     /// This is used when user selected one or multiple
     /// directories from the Import Dialog.
     ///
-    /// \sa onImportDirectories(QString directory, int mode)
+    /// \sa importDirectories(QString directory, int mode)
     void onImportDirectoriesSelected(QStringList directories);
 
     void onImportDirectoryComboBoxCurrentIndexChanged(int index);