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

Removed thumbnail generator related code from indexer

Marco Nolden преди 13 години
родител
ревизия
dcd9652d95
променени са 3 файла, в които са добавени 0 реда и са изтрити 23 реда
  1. 0 14
      Libs/DICOM/Core/ctkDICOMIndexer.cpp
  2. 0 8
      Libs/DICOM/Core/ctkDICOMIndexer.h
  3. 0 1
      Libs/DICOM/Widgets/ctkDICOMAppWidget.cpp

+ 0 - 14
Libs/DICOM/Core/ctkDICOMIndexer.cpp

@@ -36,7 +36,6 @@
 // ctkDICOM includes
 // ctkDICOM includes
 #include "ctkLogger.h"
 #include "ctkLogger.h"
 #include "ctkDICOMIndexer.h"
 #include "ctkDICOMIndexer.h"
-#include "ctkDICOMAbstractThumbnailGenerator.h"
 
 
 // DCMTK includes
 // DCMTK includes
 #include <dcmtk/dcmdata/dcfilefo.h>
 #include <dcmtk/dcmdata/dcfilefo.h>
@@ -72,7 +71,6 @@ public:
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 ctkDICOMIndexerPrivate::ctkDICOMIndexerPrivate()
 ctkDICOMIndexerPrivate::ctkDICOMIndexerPrivate()
 {
 {
-    this->thumbnailGenerator = NULL;
 }
 }
 
 
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
@@ -194,15 +192,3 @@ void ctkDICOMIndexer::refreshDatabase(ctkDICOMDatabase& ctkDICOMDatabase, const
   */ 
   */ 
   }
   }
 
 
-//------------------------------------------------------------------------------
-void ctkDICOMIndexer::setThumbnailGenerator(ctkDICOMAbstractThumbnailGenerator *generator){
-    Q_D(ctkDICOMIndexer);
-    d->thumbnailGenerator = generator;
-}
-
-//------------------------------------------------------------------------------
-ctkDICOMAbstractThumbnailGenerator* ctkDICOMIndexer::thumbnailGenerator(){
-    Q_D(ctkDICOMIndexer);
-    return d->thumbnailGenerator;
-}
-

+ 0 - 8
Libs/DICOM/Core/ctkDICOMIndexer.h

@@ -29,7 +29,6 @@
 #include "ctkDICOMDatabase.h"
 #include "ctkDICOMDatabase.h"
 
 
 class ctkDICOMIndexerPrivate;
 class ctkDICOMIndexerPrivate;
-class ctkDICOMAbstractThumbnailGenerator;
 
 
 ///
 ///
 /// \brief Indexes DICOM images located in local directory into an Sql database
 /// \brief Indexes DICOM images located in local directory into an Sql database
@@ -65,13 +64,6 @@ public:
 
 
   Q_INVOKABLE void refreshDatabase(ctkDICOMDatabase& database, const QString& directoryName);
   Q_INVOKABLE void refreshDatabase(ctkDICOMDatabase& database, const QString& directoryName);
 
 
-  ///
-  /// set thumbnail generator object
-  void setThumbnailGenerator(ctkDICOMAbstractThumbnailGenerator* generator);
-  ///
-  /// get thumbnail genrator object
-  ctkDICOMAbstractThumbnailGenerator* thumbnailGenerator();
-
 signals:
 signals:
   void foundFilesToIndex(int);
   void foundFilesToIndex(int);
   void indexingFileNumber(int);
   void indexingFileNumber(int);

+ 0 - 1
Libs/DICOM/Widgets/ctkDICOMAppWidget.cpp

@@ -97,7 +97,6 @@ ctkDICOMAppWidgetPrivate::ctkDICOMAppWidgetPrivate(ctkDICOMAppWidget* parent): q
   ThumbnailGenerator = QSharedPointer <ctkDICOMThumbnailGenerator> (new ctkDICOMThumbnailGenerator);
   ThumbnailGenerator = QSharedPointer <ctkDICOMThumbnailGenerator> (new ctkDICOMThumbnailGenerator);
   DICOMDatabase->setThumbnailGenerator(ThumbnailGenerator.data());
   DICOMDatabase->setThumbnailGenerator(ThumbnailGenerator.data());
   DICOMIndexer = QSharedPointer<ctkDICOMIndexer> (new ctkDICOMIndexer);
   DICOMIndexer = QSharedPointer<ctkDICOMIndexer> (new ctkDICOMIndexer);
-  DICOMIndexer->setThumbnailGenerator(ThumbnailGenerator.data());
 }
 }
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------