瀏覽代碼

Simplified indexer interface (WIP)

Still not totally clear how to handle target directories
Marco Nolden 13 年之前
父節點
當前提交
02caf00205
共有 2 個文件被更改,包括 11 次插入15 次删除
  1. 9 11
      Libs/DICOM/Core/ctkDICOMIndexer.cpp
  2. 2 4
      Libs/DICOM/Core/ctkDICOMIndexer.h

+ 9 - 11
Libs/DICOM/Core/ctkDICOMIndexer.cpp

@@ -97,30 +97,28 @@ ctkDICOMIndexer::~ctkDICOMIndexer()
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 void ctkDICOMIndexer::addFile(ctkDICOMDatabase& ctkDICOMDatabase, 
 void ctkDICOMIndexer::addFile(ctkDICOMDatabase& ctkDICOMDatabase, 
                                    const QString& filePath,
                                    const QString& filePath,
-                                   const QString& destinationDirectoryName,
-                                   bool createHierarchy,
-                                   bool createThumbnails)
+                                   const QString& destinationDirectoryName)
+                                   
 {
 {
   // Q_D(ctkDICOMIndexer);
   // Q_D(ctkDICOMIndexer);
 
 
   logger.setDebug();
   logger.setDebug();
 
 
-
-
+  if (!destinationDirectoryName.isEmpty())
+  {
+    logger.warn("Ignoring destinationDirectoryName parameter, just taking it as indication we should copy!");
+  }
 
 
   emit indexingFilePath(filePath);
   emit indexingFilePath(filePath);
 
 
-  
-  ctkDICOMDatabase.insert(filePath, false, true);
+  ctkDICOMDatabase.insert(filePath, !destinationDirectoryName.isEmpty(), true);
 
 
 }
 }
 
 
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 void ctkDICOMIndexer::addDirectory(ctkDICOMDatabase& ctkDICOMDatabase, 
 void ctkDICOMIndexer::addDirectory(ctkDICOMDatabase& ctkDICOMDatabase, 
                                    const QString& directoryName,
                                    const QString& directoryName,
-                                   const QString& destinationDirectoryName,
-                                   bool createHierarchy,
-                                   bool createThumbnails)
+                                   const QString& destinationDirectoryName)
 {
 {
   const std::string src_directory(directoryName.toStdString());
   const std::string src_directory(directoryName.toStdString());
 
 
@@ -148,7 +146,7 @@ void ctkDICOMIndexer::addDirectory(ctkDICOMDatabase& ctkDICOMDatabase,
   {
   {
     emit indexingFileNumber(++fileNumber);
     emit indexingFileNumber(++fileNumber);
     QString filePath((*iter).c_str());
     QString filePath((*iter).c_str());
-    this->addFile(ctkDICOMDatabase, filePath, destinationDirectoryName, createHierarchy, createThumbnails);
+    this->addFile(ctkDICOMDatabase, filePath, destinationDirectoryName);
     ++iter;
     ++iter;
   }
   }
 }
 }

+ 2 - 4
Libs/DICOM/Core/ctkDICOMIndexer.h

@@ -48,8 +48,7 @@ public:
   /// DICOM images accordingly.
   /// DICOM images accordingly.
   ///
   ///
   Q_INVOKABLE void addDirectory(ctkDICOMDatabase& database, const QString& directoryName,
   Q_INVOKABLE void addDirectory(ctkDICOMDatabase& database, const QString& directoryName,
-                    const QString& destinationDirectoryName = "",
-                    bool createHierarchy = true, bool createThumbnails = true);
+                    const QString& destinationDirectoryName = "");
 
 
   ///
   ///
   /// \brief Adds a file to database and optionally copies the file to
   /// \brief Adds a file to database and optionally copies the file to
@@ -59,8 +58,7 @@ public:
   /// DICOM fields accordingly.
   /// DICOM fields accordingly.
   ///
   ///
   Q_INVOKABLE void addFile(ctkDICOMDatabase& database, const QString& filePath,
   Q_INVOKABLE void addFile(ctkDICOMDatabase& database, const QString& filePath,
-                    const QString& destinationDirectoryName = "",
-                    bool createHierarchy = true, bool createThumbnails = true);
+                    const QString& destinationDirectoryName = "");
 
 
   Q_INVOKABLE void refreshDatabase(ctkDICOMDatabase& database, const QString& directoryName);
   Q_INVOKABLE void refreshDatabase(ctkDICOMDatabase& database, const QString& directoryName);