Renamed ctkDICOMDataset to ctkDICOMItem

Applications/ctkDICOMObjectViewer/ctkDICOMObjectViewerMain.cpp

@@ -23,7 +23,7 @@
 #include "iostream"
 
 // CTK Widgets
-#include "ctkDICOMDatasetView.h"
+#include "ctkDICOMItemView.h"
 
 // DCMTK includes
 #include <dcmimage.h>
@@ -61,7 +61,7 @@ int main(int argv, char** argc)
 
   DicomImage dcmImage( s.toStdString().c_str() );
 
-  ctkDICOMDatasetView imageView;
+  ctkDICOMItemView imageView;
   imageView.addImage( dcmImage );
   imageView.show();
   imageView.raise();

Libs/DICOM/Core/CMakeLists.txt

@@ -30,7 +30,7 @@ set(KIT_SRCS
   ctkDICOMAbstractThumbnailGenerator.h
   ctkDICOMDatabase.cpp
   ctkDICOMDatabase.h
-  ctkDICOMDataset.h
+  ctkDICOMItem.h
   ctkDICOMFilterProxyModel.cpp
   ctkDICOMFilterProxyModel.h
   ctkDICOMIndexer.cpp

Libs/DICOM/Core/Testing/Cpp/CMakeLists.txt

@@ -6,7 +6,7 @@ create_test_sourcelist(Tests ${KIT}CppTests.cpp
   ctkDICOMDatabaseTest2.cpp
   ctkDICOMDatabaseTest3.cpp
   ctkDICOMDatabaseTest4.cpp
-  ctkDICOMDatasetTest1.cpp
+  ctkDICOMItemTest1.cpp
   ctkDICOMIndexerTest1.cpp
   ctkDICOMModelTest1.cpp
   ctkDICOMPersonNameTest1.cpp
@@ -37,7 +37,7 @@ SIMPLE_TEST(ctkDICOMDatabaseTest3
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Resources/dicom-unversioned-schema.sql
   )
 SIMPLE_TEST(ctkDICOMDatabaseTest4 ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA)
-SIMPLE_TEST(ctkDICOMDatasetTest1)
+SIMPLE_TEST(ctkDICOMItemTest1)
 SIMPLE_TEST(ctkDICOMIndexerTest1 )
 
 # ctkDICOMModel

Libs/DICOM/Core/Testing/Cpp/ctkDICOMDatasetTest1.cpp

@@ -19,16 +19,16 @@
 =========================================================================*/
 
 // ctkDICOMCore includes
-#include "ctkDICOMDataset.h"
+#include "ctkDICOMItem.h"
 
 // STD includes
 #include <iostream>
 
-int ctkDICOMDatasetTest1( int argc, char * argv [] )
+int ctkDICOMItemTest1( int argc, char * argv [] )
 {
   Q_UNUSED(argc);
   Q_UNUSED(argv);
-  ctkDICOMDataset dataset;
+  ctkDICOMItem dataset;
   dataset.InitializeFromItem(0);
   dataset.InitializeFromFile(QString());
   try
@@ -37,7 +37,7 @@ int ctkDICOMDatasetTest1( int argc, char * argv [] )
     }
   catch(...)
     {
-    std::cout << "ctkDICOMDataset::Serialize() throws exceptions" << std::endl;
+    std::cout << "ctkDICOMItem::Serialize() throws exceptions" << std::endl;
     //return EXIT_FAILURE;
     }
   try
@@ -46,7 +46,7 @@ int ctkDICOMDatasetTest1( int argc, char * argv [] )
     }
   catch(...)
     {
-    std::cout << "ctkDICOMDataset::Deserialize() throws exceptions"
+    std::cout << "ctkDICOMItem::Deserialize() throws exceptions"
               << std::endl;
     //return EXIT_FAILURE;
     }
@@ -57,7 +57,7 @@ int ctkDICOMDatasetTest1( int argc, char * argv [] )
     }
   catch(...)
     {
-    std::cout << "ctkDICOMDataset::EnsureDcmDataSetIsInitialized() throws"
+    std::cout << "ctkDICOMItem::EnsureDcmDataSetIsInitialized() throws"
               << " exceptions" << std::endl;
     //return EXIT_FAILURE;
     }
@@ -70,23 +70,23 @@ int ctkDICOMDatasetTest1( int argc, char * argv [] )
   QString decode = dataset.Decode(DcmTag(),OFString());
   if (!decode.isEmpty())
     {
-    std::cerr << "ctkDICOMDataset::Decode() failed: "
+    std::cerr << "ctkDICOMItem::Decode() failed: "
               << qPrintable(decode) << std::endl;
     return EXIT_FAILURE;
     }
   OFString encode = dataset.Encode(DcmTag(), decode);
   DcmElement* element = 0;
   OFCondition condition = dataset.findAndGetElement(DcmTag(), element);
-  if (ctkDICOMDataset::CheckCondition(condition))
+  if (ctkDICOMItem::CheckCondition(condition))
     {
-    std::cerr << "ctkDICOMDataset::findAndGetElement() failed" << std::endl;
+    std::cerr << "ctkDICOMItem::findAndGetElement() failed" << std::endl;
     return EXIT_FAILURE;
     }
   OFString string;
   condition = dataset.findAndGetOFString(DcmTag(), string);
-  if (ctkDICOMDataset::CheckCondition(condition))
+  if (ctkDICOMItem::CheckCondition(condition))
     {
-    std::cerr << "ctkDICOMDataset::findAndGetOFString() failed" << std::endl;
+    std::cerr << "ctkDICOMItem::findAndGetOFString() failed" << std::endl;
     return EXIT_FAILURE;
     }
    try
@@ -129,15 +129,15 @@ int ctkDICOMDatasetTest1( int argc, char * argv [] )
     }
   catch(...)
     {
-    std::cout << "ctkDICOMDataset::GetElementValueAsXXX() throws exceptions"
+    std::cout << "ctkDICOMItem::GetElementValueAsXXX() throws exceptions"
               << std::endl;
     //return EXIT_FAILURE;
     }
-  ctkDICOMDataset::TranslateDefinedTermPatientPosition(QString());
-  ctkDICOMDataset::TranslateDefinedTermModality(QString());
-  ctkDICOMDataset::TagKey(DcmTag());
-  ctkDICOMDataset::TagDescription(DcmTag());
-  ctkDICOMDataset::TagVR(DcmTag());
+  ctkDICOMItem::TranslateDefinedTermPatientPosition(QString());
+  ctkDICOMItem::TranslateDefinedTermModality(QString());
+  ctkDICOMItem::TagKey(DcmTag());
+  ctkDICOMItem::TagDescription(DcmTag());
+  ctkDICOMItem::TagVR(DcmTag());
   
   return EXIT_SUCCESS;
 }

Libs/DICOM/Core/ctkDICOMDatabase.cpp

@@ -36,7 +36,7 @@
 // ctkDICOM includes
 #include "ctkDICOMDatabase.h"
 #include "ctkDICOMAbstractThumbnailGenerator.h"
-#include "ctkDICOMDataset.h"
+#include "ctkDICOMItem.h"
 
 #include "ctkLogger.h"
 
@@ -95,7 +95,7 @@ public:
 
   // dataset must be set always
   // filePath has to be set if this is an import of an actual file
-  void insert ( const ctkDICOMDataset& ctkDataset, const QString& filePath, bool storeFile = true, bool generateThumbnail = true);
+  void insert ( const ctkDICOMItem& ctkDataset, const QString& filePath, bool storeFile = true, bool generateThumbnail = true);
 
   ///
   /// copy the complete list of files to an extra table
@@ -142,9 +142,9 @@ public:
   QStringList TagsToPrecache;
   void precacheTags( const QString sopInstanceUID );
 
-  int insertPatient(const ctkDICOMDataset& ctkDataset);
-  void insertStudy(const ctkDICOMDataset& ctkDataset, int dbPatientID);
-  void insertSeries( const ctkDICOMDataset& ctkDataset, QString studyInstanceUID);
+  int insertPatient(const ctkDICOMItem& ctkDataset);
+  void insertStudy(const ctkDICOMItem& ctkDataset, int dbPatientID);
+  void insertSeries( const ctkDICOMItem& ctkDataset, QString studyInstanceUID);
 };
 
 //------------------------------------------------------------------------------
@@ -791,7 +791,7 @@ QString ctkDICOMDatabase::fileValue(const QString fileName, const unsigned short
   // here is where the real lookup happens
   // - first we check the tagCache to see if the value exists for this instance tag
   // If not,
-  // - for now we create a ctkDICOMDataset and extract the value from there
+  // - for now we create a ctkDICOMItem and extract the value from there
   // - then we convert to the appropriate type of string
   //
   //As an optimization we could consider
@@ -813,7 +813,7 @@ QString ctkDICOMDatabase::fileValue(const QString fileName, const unsigned short
     return value;
     }
 
-  ctkDICOMDataset dataset;
+  ctkDICOMItem dataset;
   dataset.InitializeFromFile(fileName);
 
   DcmTagKey tagKey(group, element);
@@ -855,11 +855,11 @@ void ctkDICOMDatabase::insert( DcmItem *item, bool storeFile, bool generateThumb
     {
       return;
     }
-  ctkDICOMDataset ctkDataset;
+  ctkDICOMItem ctkDataset;
   ctkDataset.InitializeFromItem(item, false /* do not take ownership */);
   this->insert(ctkDataset,storeFile,generateThumbnail);
 }
-void ctkDICOMDatabase::insert( const ctkDICOMDataset& ctkDataset, bool storeFile, bool generateThumbnail)
+void ctkDICOMDatabase::insert( const ctkDICOMItem& ctkDataset, bool storeFile, bool generateThumbnail)
 {
   Q_D(ctkDICOMDatabase);
   d->insert(ctkDataset, QString(), storeFile, generateThumbnail);
@@ -885,7 +885,7 @@ void ctkDICOMDatabase::insert ( const QString& filePath, bool storeFile, bool ge
   std::string filename = filePath.toStdString();
 
   DcmFileFormat fileformat;
-  ctkDICOMDataset ctkDataset;
+  ctkDICOMItem ctkDataset;
 
   ctkDataset.InitializeFromFile(filePath);
   if ( ctkDataset.IsInitialized() )
@@ -899,7 +899,7 @@ void ctkDICOMDatabase::insert ( const QString& filePath, bool storeFile, bool ge
 }
 
 //------------------------------------------------------------------------------
-int ctkDICOMDatabasePrivate::insertPatient(const ctkDICOMDataset& ctkDataset)
+int ctkDICOMDatabasePrivate::insertPatient(const ctkDICOMItem& ctkDataset)
 {
   int dbPatientID;
 
@@ -950,7 +950,7 @@ int ctkDICOMDatabasePrivate::insertPatient(const ctkDICOMDataset& ctkDataset)
 }
 
 //------------------------------------------------------------------------------
-void ctkDICOMDatabasePrivate::insertStudy(const ctkDICOMDataset& ctkDataset, int dbPatientID)
+void ctkDICOMDatabasePrivate::insertStudy(const ctkDICOMItem& ctkDataset, int dbPatientID)
 {
   QString studyInstanceUID(ctkDataset.GetElementAsString(DCM_StudyInstanceUID) );
   QSqlQuery checkStudyExistsQuery (Database);
@@ -1000,7 +1000,7 @@ void ctkDICOMDatabasePrivate::insertStudy(const ctkDICOMDataset& ctkDataset, int
 }
 
 //------------------------------------------------------------------------------
-void ctkDICOMDatabasePrivate::insertSeries(const ctkDICOMDataset& ctkDataset, QString studyInstanceUID)
+void ctkDICOMDatabasePrivate::insertSeries(const ctkDICOMItem& ctkDataset, QString studyInstanceUID)
 {
   QString seriesInstanceUID(ctkDataset.GetElementAsString(DCM_SeriesInstanceUID) );
   QSqlQuery checkSeriesExistsQuery (Database);
@@ -1078,7 +1078,7 @@ void ctkDICOMDatabasePrivate::precacheTags( const QString sopInstanceUID )
 {
   Q_Q(ctkDICOMDatabase);
 
-  ctkDICOMDataset dataset;
+  ctkDICOMItem dataset;
   QString fileName = q->fileForInstance(sopInstanceUID);
   dataset.InitializeFromFile(fileName);
 
@@ -1097,7 +1097,7 @@ void ctkDICOMDatabasePrivate::precacheTags( const QString sopInstanceUID )
 }
 
 //------------------------------------------------------------------------------
-void ctkDICOMDatabasePrivate::insert( const ctkDICOMDataset& ctkDataset, const QString& filePath, bool storeFile, bool generateThumbnail)
+void ctkDICOMDatabasePrivate::insert( const ctkDICOMItem& ctkDataset, const QString& filePath, bool storeFile, bool generateThumbnail)
 {
   Q_Q(ctkDICOMDatabase);
 

Libs/DICOM/Core/ctkDICOMDatabase.h

@@ -26,7 +26,7 @@
 #include <QStringList>
 #include <QSqlDatabase>
 
-#include "ctkDICOMDataset.h"
+#include "ctkDICOMItem.h"
 #include "ctkDICOMCoreExport.h"
 
 class QDateTime;
@@ -177,7 +177,7 @@ public:
   ///                  does only make sense if a full object is received.
   /// @param @generateThumbnail If true, a thumbnail is generated.
   ///
-  Q_INVOKABLE void insert( const ctkDICOMDataset& ctkDataset,
+  Q_INVOKABLE void insert( const ctkDICOMItem& ctkDataset,
                               bool storeFile, bool generateThumbnail);
   void insert ( DcmItem *item,
                               bool storeFile = true, bool generateThumbnail = true);

Libs/DICOM/Core/ctkDICOMDataset.h

@@ -1,9 +1,9 @@
 #ifndef CTK_DICOM_DATASET_H
 #define CTK_DICOM_DATASET_H
 #if defined _MSC_VER
-  #pragma message ( "Deprecated header ctkDICOMDataset.h included. Please use ctkDICOMItem.h!" )
+  #pragma message ( "Deprecated header ctkDICOMItem.h included. Please use ctkDICOMItem.h!" )
 #elif defined __GNUC__
-  #warning "Deprecated header ctkDICOMDataset.h included. Please use ctkDICOMItem.h!"
+  #warning "Deprecated header ctkDICOMItem.h included. Please use ctkDICOMItem.h!"
 #endif
 #include "ctkDICOMItem.h"
 #endif

Libs/DICOM/Core/ctkDICOMItem.h

@@ -61,7 +61,7 @@ class ctkDICOMItemPrivate;
 ///  is stored in a base64 encoded string. For deserialization we decode the string and use DcmDataset::read(..).
 class ctkDICOMItem;
 
-typedef ctkDICOMItem ctkDICOMDataset;
+typedef ctkDICOMItem ctkDICOMItem;
 
 class CTK_DICOM_CORE_EXPORT ctkDICOMItem
 {

Libs/DICOM/Widgets/CMakeLists.txt

@@ -11,14 +11,14 @@ set(KIT_export_directive "CTK_DICOM_WIDGETS_EXPORT")
 set(KIT_SRCS
   ctkDICOMAppWidget.cpp
   ctkDICOMAppWidget.h
-  ctkDICOMDatasetView.cpp
-  ctkDICOMDatasetView.h
   ctkDICOMDirectoryListWidget.cpp
   ctkDICOMDirectoryListWidget.h
   ctkDICOMImage.cpp
   ctkDICOMImage.h
   ctkDICOMImportWidget.cpp
   ctkDICOMImportWidget.h
+  ctkDICOMItemView.cpp
+  ctkDICOMItemView.h
   ctkDICOMListenerWidget.cpp
   ctkDICOMListenerWidget.h
   ctkDICOMQueryResultsTabWidget.cpp
@@ -38,7 +38,7 @@ set(KIT_SRCS
 # Headers that should run through moc
 set(KIT_MOC_SRCS
   ctkDICOMAppWidget.h
-  ctkDICOMDatasetView.h
+  ctkDICOMItemView.h
   ctkDICOMDirectoryListWidget.h
   ctkDICOMImage.h
   ctkDICOMImportWidget.h

Libs/DICOM/Widgets/Resources/UI/ctkDICOMAppWidget.ui

@@ -419,7 +419,7 @@
          </layout>
         </item>
         <item>
-         <widget class="ctkDICOMDatasetView" name="ImagePreview" native="true">
+         <widget class="ctkDICOMItemView" name="ImagePreview" native="true">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
             <horstretch>0</horstretch>
@@ -543,9 +543,9 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>ctkDICOMDatasetView</class>
+   <class>ctkDICOMItemView</class>
    <extends>QWidget</extends>
-   <header location="global">ctkDICOMDatasetView.h</header>
+   <header location="global">ctkDICOMItemView.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

Libs/DICOM/Widgets/Testing/Cpp/CMakeLists.txt

@@ -2,7 +2,7 @@ set(KIT ${PROJECT_NAME})
 
 create_test_sourcelist(Tests ${KIT}CppTests.cpp
   ctkDICOMAppWidgetTest1.cpp
-  ctkDICOMDatasetViewTest1.cpp
+  ctkDICOMItemViewTest1.cpp
   ctkDICOMDirectoryListWidgetTest1.cpp
   ctkDICOMImageTest1.cpp
   ctkDICOMImportWidgetTest1.cpp
@@ -27,7 +27,7 @@ target_link_libraries(${KIT}CppTests ${LIBRARY_NAME})
 #
 
 SIMPLE_TEST(ctkDICOMAppWidgetTest1)
-SIMPLE_TEST(ctkDICOMDatasetViewTest1 ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA)
+SIMPLE_TEST(ctkDICOMItemViewTest1 ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA)
 SIMPLE_TEST(ctkDICOMDirectoryListWidgetTest1)
 SIMPLE_TEST(ctkDICOMImageTest1 ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA)
 SIMPLE_TEST(ctkDICOMImportWidgetTest1)

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

@@ -25,7 +25,7 @@
 #include <QTimer>
 
 // ctkDICOMCore includes
-#include "ctkDICOMDatasetView.h"
+#include "ctkDICOMItemView.h"
 
 // DCMTK includes
 #include <dcmimage.h>
@@ -34,15 +34,15 @@
 #include <iostream>
 
 /* Test from build directory:
- ./CTK-build/bin/CTKDICOMWidgetsCxxTests ctkDICOMDatasetViewTest1 test.db ../CTK/Libs/DICOM/Core/Resources/dicom-sample.sql
+ ./CTK-build/bin/CTKDICOMWidgetsCxxTests ctkDICOMItemViewTest1 test.db ../CTK/Libs/DICOM/Core/Resources/dicom-sample.sql
 */
 
-int ctkDICOMDatasetViewTest1( int argc, char * argv [] )
+int ctkDICOMItemViewTest1( int argc, char * argv [] )
 {
   QApplication app(argc, argv);
   if (argc < 2)
     {
-    std::cerr << "Usage: ctkDICOMDatasetViewTest1 dcmimage [-I]" << std::endl;
+    std::cerr << "Usage: ctkDICOMItemViewTest1 dcmimage [-I]" << std::endl;
     return EXIT_FAILURE;
     }
   
@@ -50,7 +50,7 @@ int ctkDICOMDatasetViewTest1( int argc, char * argv [] )
   QImage image;
   QImage image2(200, 200, QImage::Format_RGB32);
   
-  ctkDICOMDatasetView datasetView;
+  ctkDICOMItemView datasetView;
   datasetView.addImage(img);
   datasetView.addImage(image);
   datasetView.addImage(image2);

Libs/DICOM/Widgets/ctkDICOMDatasetView.cpp

@@ -33,7 +33,7 @@
 #include "ctkDICOMModel.h"
 
 // ctkDICOMWidgets includex
-#include "ctkDICOMDatasetView.h"
+#include "ctkDICOMItemView.h"
 
 // Qt includes
 #include <QDebug>
@@ -46,17 +46,17 @@
 #include <QPainter>
 #include <QResizeEvent>
 
-static ctkLogger logger("org.commontk.DICOM.Widgets.ctkDICOMDatasetView");
+static ctkLogger logger("org.commontk.DICOM.Widgets.ctkDICOMItemView");
 
 //--------------------------------------------------------------------------
-class ctkDICOMDatasetViewPrivate 
+class ctkDICOMItemViewPrivate 
 {
 
-  Q_DECLARE_PUBLIC( ctkDICOMDatasetView );
+  Q_DECLARE_PUBLIC( ctkDICOMItemView );
 
 public:
 
-  ctkDICOMDatasetViewPrivate( ctkDICOMDatasetView& object );
+  ctkDICOMItemViewPrivate( ctkDICOMItemView& object );
 
   QString DatabaseDirectory;
   QModelIndex CurrentImageIndex;
@@ -75,23 +75,23 @@ public:
   void onImageModelSelected(const QModelIndex& index);
 
 protected:
-  ctkDICOMDatasetView* const q_ptr;
+  ctkDICOMItemView* const q_ptr;
 
 private:
-  Q_DISABLE_COPY( ctkDICOMDatasetViewPrivate );
+  Q_DISABLE_COPY( ctkDICOMItemViewPrivate );
 };
 
 //--------------------------------------------------------------------------
-ctkDICOMDatasetViewPrivate::ctkDICOMDatasetViewPrivate(
-  ctkDICOMDatasetView& object )
+ctkDICOMItemViewPrivate::ctkDICOMItemViewPrivate(
+  ctkDICOMItemView& object )
   : q_ptr( & object )
 {
 }
 
 //--------------------------------------------------------------------------
-void ctkDICOMDatasetViewPrivate::init()
+void ctkDICOMItemViewPrivate::init()
 {
-  Q_Q( ctkDICOMDatasetView );
+  Q_Q( ctkDICOMItemView );
 
   q->setMouseTracking(true);
 
@@ -111,8 +111,8 @@ void ctkDICOMDatasetViewPrivate::init()
 }
 
 // -------------------------------------------------------------------------
-void ctkDICOMDatasetViewPrivate::setImage(const QModelIndex &imageIndex, bool defaultIntensity){
-    Q_Q(ctkDICOMDatasetView);
+void ctkDICOMItemViewPrivate::setImage(const QModelIndex &imageIndex, bool defaultIntensity){
+    Q_Q(ctkDICOMItemView);
 
     ctkDICOMModel* model = const_cast<ctkDICOMModel*>(qobject_cast<const ctkDICOMModel*>(imageIndex.model()));
 
@@ -140,8 +140,8 @@ void ctkDICOMDatasetViewPrivate::setImage(const QModelIndex &imageIndex, bool de
 }
 
 // -------------------------------------------------------------------------
-void ctkDICOMDatasetViewPrivate::onPatientModelSelected(const QModelIndex &index){
-    Q_Q(ctkDICOMDatasetView);
+void ctkDICOMItemViewPrivate::onPatientModelSelected(const QModelIndex &index){
+    Q_Q(ctkDICOMItemView);
 
     ctkDICOMModel* model = const_cast<ctkDICOMModel*>(qobject_cast<const ctkDICOMModel*>(index.model()));
 
@@ -162,8 +162,8 @@ void ctkDICOMDatasetViewPrivate::onPatientModelSelected(const QModelIndex &index
 }
 
 // -------------------------------------------------------------------------
-void ctkDICOMDatasetViewPrivate::onStudyModelSelected(const QModelIndex &index){
-    Q_Q(ctkDICOMDatasetView);
+void ctkDICOMItemViewPrivate::onStudyModelSelected(const QModelIndex &index){
+    Q_Q(ctkDICOMItemView);
 
     ctkDICOMModel* model = const_cast<ctkDICOMModel*>(qobject_cast<const ctkDICOMModel*>(index.model()));
 
@@ -182,8 +182,8 @@ void ctkDICOMDatasetViewPrivate::onStudyModelSelected(const QModelIndex &index){
 }
 
 // -------------------------------------------------------------------------
-void ctkDICOMDatasetViewPrivate::onSeriesModelSelected(const QModelIndex &index){
-    Q_Q(ctkDICOMDatasetView);
+void ctkDICOMItemViewPrivate::onSeriesModelSelected(const QModelIndex &index){
+    Q_Q(ctkDICOMItemView);
 
     ctkDICOMModel* model = const_cast<ctkDICOMModel*>(qobject_cast<const ctkDICOMModel*>(index.model()));
 
@@ -200,8 +200,8 @@ void ctkDICOMDatasetViewPrivate::onSeriesModelSelected(const QModelIndex &index)
 }
 
 // -------------------------------------------------------------------------
-void ctkDICOMDatasetViewPrivate::onImageModelSelected(const QModelIndex &index){
-    Q_Q(ctkDICOMDatasetView);
+void ctkDICOMItemViewPrivate::onImageModelSelected(const QModelIndex &index){
+    Q_Q(ctkDICOMItemView);
 
     ctkDICOMModel* model = const_cast<ctkDICOMModel*>(qobject_cast<const ctkDICOMModel*>(index.model()));
 
@@ -219,53 +219,53 @@ void ctkDICOMDatasetViewPrivate::onImageModelSelected(const QModelIndex &index){
 }
 
 // -------------------------------------------------------------------------
-ctkDICOMDatasetView::ctkDICOMDatasetView( QWidget* _parent )
+ctkDICOMItemView::ctkDICOMItemView( QWidget* _parent )
   : Superclass( _parent ),
-    d_ptr( new ctkDICOMDatasetViewPrivate( *this ) )
+    d_ptr( new ctkDICOMItemViewPrivate( *this ) )
 {
-  Q_D( ctkDICOMDatasetView );
+  Q_D( ctkDICOMItemView );
   d->init();
 }
 
 // -------------------------------------------------------------------------
-ctkDICOMDatasetView::ctkDICOMDatasetView(
-  ctkDICOMDatasetViewPrivate& pvt,
+ctkDICOMItemView::ctkDICOMItemView(
+  ctkDICOMItemViewPrivate& pvt,
   QWidget* _parent)
   : Superclass(_parent), d_ptr(&pvt)
 {
-  Q_D(ctkDICOMDatasetView);
+  Q_D(ctkDICOMItemView);
   d->init();
 }
 
 // -------------------------------------------------------------------------
-ctkDICOMDatasetView::~ctkDICOMDatasetView()
+ctkDICOMItemView::~ctkDICOMItemView()
 {
 }
 
 // -------------------------------------------------------------------------
-void ctkDICOMDatasetView::setDatabaseDirectory(const QString &directory){
-    Q_D(ctkDICOMDatasetView);
+void ctkDICOMItemView::setDatabaseDirectory(const QString &directory){
+    Q_D(ctkDICOMItemView);
 
     d->DatabaseDirectory = directory;
 }
 
 // -------------------------------------------------------------------------
-QModelIndex ctkDICOMDatasetView::currentImageIndex(){
-    Q_D(ctkDICOMDatasetView);
+QModelIndex ctkDICOMItemView::currentImageIndex(){
+    Q_D(ctkDICOMItemView);
 
     return d->CurrentImageIndex;
 }
 
 // -------------------------------------------------------------------------
-void ctkDICOMDatasetView::addImage( const QImage & image )
+void ctkDICOMItemView::addImage( const QImage & image )
 {
   Superclass::addImage( image );
 }
 
 // -------------------------------------------------------------------------
-void ctkDICOMDatasetView::addImage( DicomImage & dcmImage, bool defaultIntensity )
+void ctkDICOMItemView::addImage( DicomImage & dcmImage, bool defaultIntensity )
 {
-    Q_D(ctkDICOMDatasetView);
+    Q_D(ctkDICOMItemView);
     QImage image;
     // Check whether we have a valid image
     EI_Status result = dcmImage.getStatus();
@@ -334,23 +334,23 @@ void ctkDICOMDatasetView::addImage( DicomImage & dcmImage, bool defaultIntensity
 }
 
 // -------------------------------------------------------------------------
-void ctkDICOMDatasetView::update( bool zoomChanged,
+void ctkDICOMItemView::update( bool zoomChanged,
   bool sizeChanged )
 {
   Superclass::update( zoomChanged, sizeChanged );
 }
 
 // -------------------------------------------------------------------------
-void ctkDICOMDatasetView::mousePressEvent(QMouseEvent* event){
-    Q_D(ctkDICOMDatasetView);
+void ctkDICOMItemView::mousePressEvent(QMouseEvent* event){
+    Q_D(ctkDICOMItemView);
 
     event->accept();
     d->OldMousePos = event->pos();
 }
 
 // -------------------------------------------------------------------------
-void ctkDICOMDatasetView::mouseMoveEvent(QMouseEvent* event){
-    Q_D(ctkDICOMDatasetView);
+void ctkDICOMItemView::mouseMoveEvent(QMouseEvent* event){
+    Q_D(ctkDICOMItemView);
 
     if(event->buttons() == Qt::RightButton){
         event->accept();
@@ -386,8 +386,8 @@ void ctkDICOMDatasetView::mouseMoveEvent(QMouseEvent* event){
 }
 
 // -------------------------------------------------------------------------
-void ctkDICOMDatasetView::onModelSelected(const QModelIndex &index){
-    Q_D(ctkDICOMDatasetView);
+void ctkDICOMItemView::onModelSelected(const QModelIndex &index){
+    Q_D(ctkDICOMItemView);
 
     ctkDICOMModel* model = const_cast<ctkDICOMModel*>(qobject_cast<const ctkDICOMModel*>(index.model()));
 
@@ -407,8 +407,8 @@ void ctkDICOMDatasetView::onModelSelected(const QModelIndex &index){
 }
 
 // -------------------------------------------------------------------------
-void ctkDICOMDatasetView::displayImage(int imageIndex){
-  Q_D(ctkDICOMDatasetView);
+void ctkDICOMItemView::displayImage(int imageIndex){
+  Q_D(ctkDICOMItemView);
 
   if(d->CurrentImageIndex.isValid())
     {
@@ -430,7 +430,7 @@ void ctkDICOMDatasetView::displayImage(int imageIndex){
 }
 
 // -------------------------------------------------------------------------
-void ctkDICOMDatasetView::emitImageDisplayedSignal(int imageID, int count){
+void ctkDICOMItemView::emitImageDisplayedSignal(int imageID, int count){
   emit imageDisplayed(imageID, count);
 }
 

Libs/DICOM/Widgets/ctkDICOMDatasetView.h

@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __ctkDICOMDatasetView_h
-#define __ctkDICOMDatasetView_h
+#ifndef __ctkDICOMItemView_h
+#define __ctkDICOMItemView_h
 
 /// Qt includes
 #include <QWidget>
@@ -31,13 +31,13 @@
 #include "ctkPimpl.h"
 #include "ctkDICOMWidgetsExport.h"
 
-class ctkDICOMDatasetViewPrivate;
+class ctkDICOMItemViewPrivate;
 class DicomImage;
 
 /// \ingroup DICOM_Widgets
 ///
-/// ctkDICOMDatasetView is the base class of image viewer widgets.
-class CTK_DICOM_WIDGETS_EXPORT ctkDICOMDatasetView
+/// ctkDICOMItemView is the base class of image viewer widgets.
+class CTK_DICOM_WIDGETS_EXPORT ctkDICOMItemView
 : public ctkQImageView
 {
 
@@ -49,10 +49,10 @@ public:
   typedef ctkQImageView Superclass;
 
   /// Constructor
-  ctkDICOMDatasetView( QWidget * parent = 0 );
+  ctkDICOMItemView( QWidget * parent = 0 );
   
   /// Destructor
-  virtual ~ctkDICOMDatasetView( void );
+  virtual ~ctkDICOMItemView( void );
 
   void setDatabaseDirectory(const QString& directory);
 
@@ -80,7 +80,7 @@ public Q_SLOTS:
 protected:
 
   /// protected constructor to derive private implementations
-  ctkDICOMDatasetView( ctkDICOMDatasetViewPrivate & pvt,
+  ctkDICOMItemView( ctkDICOMItemViewPrivate & pvt,
     QWidget* parent=0 );
 
   /// re-implemented QWidget event functions
@@ -89,11 +89,11 @@ protected:
 
 private:
 
-  QScopedPointer< ctkDICOMDatasetViewPrivate > d_ptr;
+  QScopedPointer< ctkDICOMItemViewPrivate > d_ptr;
 
-  Q_DECLARE_PRIVATE( ctkDICOMDatasetView );
+  Q_DECLARE_PRIVATE( ctkDICOMItemView );
 
-  Q_DISABLE_COPY( ctkDICOMDatasetView );
+  Q_DISABLE_COPY( ctkDICOMItemView );
 
   void emitImageDisplayedSignal(int imageID, int count);
 

Plugins/org.commontk.dah.core/ctkDicomAvailableDataHelper.cpp

@@ -23,7 +23,7 @@
 #include "ctkDicomAvailableDataHelper.h"
 #include "ctkDicomAvailableDataHelper.h"
 #include "ctkDicomObjectLocatorCache.h"
-#include <ctkDICOMDataset.h>
+#include <ctkDICOMItem.h>
 
 // DCMTK includes
 #include <dcmtk/dcmdata/dcdeftag.h>
@@ -206,7 +206,7 @@ bool addNonDICOMToAvailableData(ctkDicomAppHosting::AvailableData& data,
 
 bool addToAvailableData(ctkDicomAppHosting::AvailableData& data, 
                         ctkDicomObjectLocatorCache* objectLocatorCache, 
-                        const ctkDICOMDataset& dataset, 
+                        const ctkDICOMItem& dataset, 
                         long length, 
                         long offset, 
                         const QString& uri)
@@ -305,7 +305,7 @@ bool addToAvailableData(ctkDicomAppHosting::AvailableData& data,
       return addNonDICOMToAvailableData(data, objectLocatorCache, fileinfo.size(), 0, uri);
   }
   //this could be a DICOM file then
-  ctkDICOMDataset ctkdataset;
+  ctkDICOMItem ctkdataset;
   ctkdataset.InitializeFromFile(filename, EXS_Unknown, EGL_noChange, 400);
 
   return addToAvailableData(data, objectLocatorCache, ctkdataset, fileinfo.size(), 0, uri);

Plugins/org.commontk.dah.core/ctkDicomAvailableDataHelper.h

@@ -33,7 +33,7 @@
 #include <ctkDicomAppHostingTypes.h>
 
 class ctkDicomObjectLocatorCache;
-class ctkDICOMDataset;
+class ctkDICOMItem;
 
 namespace ctkDicomAvailableDataHelper {
 
@@ -81,7 +81,7 @@ private:
 //----------------------------------------------------------------------------
 bool org_commontk_dah_core_EXPORT addToAvailableData(ctkDicomAppHosting::AvailableData& data, 
                         ctkDicomObjectLocatorCache* objectLocatorCache, 
-                        const ctkDICOMDataset& dataset, 
+                        const ctkDICOMItem& dataset, 
                         long length, 
                         long offset, 
                         const QString& uri);
@@ -94,7 +94,7 @@ bool org_commontk_dah_core_EXPORT addToAvailableData(ctkDicomAppHosting::Availab
 //----------------------------------------------------------------------------
 bool org_commontk_dah_core_EXPORT addNonDICOMToAvailableData(ctkDicomAppHosting::AvailableData& data, 
                         ctkDicomObjectLocatorCache* objectLocatorCache, 
-                        const ctkDICOMDataset& dataset, 
+                        const ctkDICOMItem& dataset, 
                         long length, 
                         long offset, 
                         const QString& uri);