ctkDICOMModelObject class and a test added

Libs/DICOM/Core/CMakeLists.txt

@@ -40,6 +40,8 @@ set(KIT_SRCS
   ctkDICOMItem.h
   ctkDICOMModel.cpp
   ctkDICOMModel.h
+  ctkDICOMModelObject.cpp
+  ctkDICOMModelObject.h
   ctkDICOMPersonName.cpp
   ctkDICOMPersonName.h
   ctkDICOMQuery.cpp
@@ -48,6 +50,7 @@ set(KIT_SRCS
   ctkDICOMRetrieve.h
   ctkDICOMTester.cpp
   ctkDICOMTester.h
+
 )
 
 if(DCMTK_VERSION_IS_360)

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

@@ -0,0 +1,79 @@
+/*==========================================================================
+
+  Library: CTK
+
+  Copyright (c) University of Sheffield
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+==========================================================================*/
+
+// STD includes
+#include <iostream>
+#include <algorithm>
+#include <limits>
+
+// CTK Core
+#include "ctkDICOMModelObject.h"
+
+
+
+// Qt includes
+#include <QApplication>
+#include <QFileDialog>
+#include <QString>
+#include <QTreeView>
+#include <QHeaderView>
+
+
+
+
+int main(int argv, char** argc)
+{
+  QApplication app(argv, argc);
+
+  qApp->setOrganizationName("CTK");
+  qApp->setOrganizationDomain("commontk.org");
+  qApp->setApplicationName("ctkDICOMHeaderViewer");
+
+  QString fileName;
+
+  if( QApplication::argc() > 1)
+    {
+      fileName = QApplication::argv()[1];
+    }
+  else
+    {
+      fileName = QFileDialog::getOpenFileName( 0,
+       "Choose an image file", ".",
+       "DCM (*)" 
+       );
+      if( fileName.size() == 0 )
+	{
+	  return EXIT_SUCCESS;
+	}
+    }
+  
+  ctkDICOMModelObject dcmInfoModel;
+  dcmInfoModel.setFile(fileName);
+ 
+  QTreeView *viewer = new QTreeView();
+  viewer->setModel( &dcmInfoModel);
+  viewer->expandAll();
+  viewer->resizeColumnToContents(1);
+  viewer->resizeColumnToContents(2);
+  viewer->header()->setResizeMode( QHeaderView::Stretch);
+  viewer->show();
+  viewer->raise();
+  return app.exec();
+}

Libs/DICOM/Core/ctkDICOMModelObject.cpp

@@ -0,0 +1,287 @@
+/*=============================================================================
+
+  Library: CTK
+
+  Copyright (c) University of Sheffield
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+=============================================================================*/
+
+// Qt include
+#include <QSharedData>
+#include <QStandardItem>
+#include <QString>
+#include <QStringList>
+
+// DCMTK includes
+#include "dcmtk/dcmdata/dcfilefo.h"
+#include "dcmtk/dcmdata/dcmetinf.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcdatset.h"
+#include "dcmtk/dcmdata/dcitem.h"
+#include "dcmtk/ofstd/ofcond.h"
+#include "dcmtk/ofstd/ofstring.h"
+#include "dcmtk/ofstd/ofstd.h"        /* for class OFStandard */
+
+// CTK DICOM Core
+#include "ctkDICOMModelObject.h"
+
+//------------------------------------------------------------------------------
+class ctkDICOMModelObjectPrivate
+{
+  
+  Q_DECLARE_PUBLIC(ctkDICOMModelObject);
+protected:
+  ctkDICOMModelObject* const q_ptr;
+
+public:
+  ctkDICOMModelObjectPrivate(ctkDICOMModelObject&);
+  virtual ~ctkDICOMModelObjectPrivate();
+  void init();
+  void ctkDICOMModelObjectPrivate::itemInsert( DcmItem *dataset, QStandardItem *parent);
+  void ctkDICOMModelObjectPrivate::seqInsert( DcmSequenceOfItems *dataset, QStandardItem *parent);
+
+  DcmFileFormat fileFormat;
+  QStandardItem *rootItem;
+};
+//------------------------------------------------------------------------------
+ctkDICOMModelObjectPrivate::ctkDICOMModelObjectPrivate(ctkDICOMModelObject& o):q_ptr(&o)
+{
+
+}
+
+//------------------------------------------------------------------------------
+ctkDICOMModelObjectPrivate::~ctkDICOMModelObjectPrivate()
+{
+
+}
+//------------------------------------------------------------------------------
+void ctkDICOMModelObjectPrivate::init()
+{
+Q_Q(ctkDICOMModelObject);
+QStringList horizontalHeaderLabels;
+horizontalHeaderLabels.append( QString("Tag"));
+horizontalHeaderLabels.append( QString("Value"));
+q->setHorizontalHeaderLabels(horizontalHeaderLabels);
+	
+}
+//------------------------------------------------------------------------------
+#undef max
+#undef min
+void ctkDICOMModelObjectPrivate::itemInsert( DcmItem *dataset, QStandardItem *parent)
+{
+  DcmStack stack;
+  dataset->nextObject( stack, OFTrue);
+
+  for( ; stack.top(); dataset->nextObject( stack, OFFalse))
+    {
+      DcmObject *dO =  stack.top();
+      // DcmElement *dcmElem = dataset->getElement( idx);
+      DcmElement *dcmElem = dynamic_cast<DcmElement *> (dO);
+      QString tagValue = "";
+
+      DcmTag tag = dO->getTag();
+      QString tagName = tag.getTagName();
+      if( tag.getXTag() == DCM_SequenceDelimitationItem
+	  || tag.getXTag() == DCM_ItemDelimitationItem
+	  || "Item" == tagName)
+	{
+	  return;
+	}
+
+      //      std::cerr << "node is dcmElem=" << dcmElem << "\n";
+
+      if( dcmElem)
+	{
+	  std::ostringstream value;
+	  OFString part;
+	  std::string sep;
+	  int mult = dcmElem->getVM();
+	  int pos;
+	  if( mult>1)
+	    {
+	      value << "[" << mult << "] ";
+	    }
+	  // TODO define max elem per line
+	  for( pos=0; pos < std::min(mult,10); pos++)
+	    {
+	      value << sep;
+	      OFCondition status = dcmElem->getOFString( part, pos);
+	      if( status.good())
+		{
+		  value << part.c_str();
+		  sep = ", ";
+		}
+	    }
+	  if( pos < mult-1)
+	    {
+	      value << " ...";
+	    }
+	  tagValue = value.str().c_str();
+	}
+      // create items ...
+      QStandardItem *tagItem = new QStandardItem( tagName);
+      QStandardItem *valItem = new QStandardItem( tagValue);
+      // ... and insert them
+      QList<QStandardItem *> modelRow;
+      modelRow.append( tagItem);
+      modelRow.append( valItem);
+      parent->appendRow( modelRow);
+
+
+      //      std::cerr << "    "
+      //		<< tagName.toStdString() << " " << tagValue.toStdString();
+
+
+      if( dcmElem)
+	{
+	  // 	  std::cerr << " >> l=" << dcmElem->isLeaf() 
+	  //		    << "  nx=" << dataset->nextInContainer( dcmElem);
+	  if( !dcmElem->isLeaf())
+	    {
+	      // now dcmElem  points to a sequenceOfItems
+	      ctkDICOMModelObjectPrivate::seqInsert( dynamic_cast<DcmSequenceOfItems*> (dcmElem), tagItem);	 
+	    }
+	}
+
+      //      std::cerr  << "\n";
+    }
+
+}
+
+//------------------------------------------------------------------------------
+void ctkDICOMModelObjectPrivate::seqInsert( DcmSequenceOfItems *dataset, QStandardItem *parent)
+{
+
+  //  std::cerr << "Entering seqInsert" << "\n";
+  DcmObject *dO = dataset->nextInContainer( NULL);
+
+  //  std::cerr << "Entered nested level   d0=" << dO << "\n";
+  //  std::cerr << "First node is dcmElem=" << dynamic_cast<DcmElement *> (dO) << "\n";
+
+  for( ; dO; dO = dataset->nextInContainer(dO))
+    {
+      // DcmElement *dcmElem = dataset->getElement( idx);
+      DcmElement *dcmElem = dynamic_cast<DcmElement *> (dO);
+      QString tagValue = "";
+
+      DcmTag tag = dO->getTag();
+      if( tag.getXTag() == DCM_SequenceDelimitationItem
+	  || tag.getXTag() == DCM_ItemDelimitationItem)
+	{
+	  return;
+	}
+
+      QString tagName = tag.getTagName();
+
+      //      std::cerr << "node is dcmElem=" << dcmElem << "\n";
+
+      if( dcmElem)
+	{
+	  std::ostringstream value;
+	  OFString part;
+	  std::string sep;
+	  int mult = dcmElem->getVM();
+	  int pos;
+	  if( mult>1)
+	    {
+	      value << "[" << mult << "] ";
+	    }
+	  // TODO define max elem per line
+	  for( pos=0; pos < std::min(mult,10); pos++)
+	    {
+	      value << sep;
+	      OFCondition status = dcmElem->getOFString( part, pos);
+	      if( status.good())
+		{
+		  value << part.c_str();
+		  sep = ", ";
+		}
+	    }
+	  if( pos < mult-1)
+	    {
+	      value << " ...";
+	    }
+	  tagValue = value.str().c_str();
+	}
+      // create items ...
+      QStandardItem *tagItem = new QStandardItem( tagName);
+      QStandardItem *valItem = new QStandardItem( tagValue);
+      // ... and insert them
+      QList<QStandardItem *> modelRow;
+      modelRow.append( tagItem);
+      modelRow.append( valItem);
+      parent->appendRow( modelRow);
+
+
+      //      std::cerr << "    "
+      //		<< tagName.toStdString() << " " << tagValue.toStdString();
+
+
+      if( dcmElem)
+	{
+	  // 	  std::cerr << " >> l=" << dcmElem->isLeaf() 
+	  //		    << "  nx=" << dataset->nextInContainer( dcmElem);
+	  if( !dcmElem->isLeaf())
+	    {
+	      // now dcmElem  points to a sequenceOfItems
+			ctkDICOMModelObjectPrivate::seqInsert( dynamic_cast<DcmSequenceOfItems*> (dcmElem), tagItem);	 
+	    }
+	}
+      else if( tag.getXTag() == DCM_Item)
+	{
+	      itemInsert( dynamic_cast<DcmItem*> (dO), tagItem);	 
+	}
+      //      std::cerr  << "\n";
+    }
+}
+
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+
+ctkDICOMModelObject::ctkDICOMModelObject(QObject* parentObject)
+  : Superclass(parentObject)
+  , d_ptr(new ctkDICOMModelObjectPrivate(*this))
+{
+Q_D(ctkDICOMModelObject);
+d->init();
+  
+}
+
+//------------------------------------------------------------------------------
+ctkDICOMModelObject::ctkDICOMModelObject(const ctkDICOMModelObject& other)
+{
+}
+
+//------------------------------------------------------------------------------
+ctkDICOMModelObject::~ctkDICOMModelObject()
+{
+}
+
+//------------------------------------------------------------------------------
+
+void ctkDICOMModelObject::setFile(const QString &fileName)
+{
+  Q_D(ctkDICOMModelObject);
+ 
+  OFCondition status = d->fileFormat.loadFile( fileName.toLatin1().data());
+  if( !status.good())
+    {
+		// TODO: Add through error
+    }
+  
+  DcmDataset *dataset = d->fileFormat.getDataset();
+  d->rootItem = ctkDICOMModelObject::invisibleRootItem();
+  d->itemInsert( dataset, d->rootItem);
+}

Libs/DICOM/Core/ctkDICOMModelObject.h

@@ -0,0 +1,62 @@
+/*=============================================================================
+
+  Library: CTK
+
+  Copyright (c) University of Sheffield
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+=============================================================================*/
+
+#ifndef __ctkDICOMModelObject_h
+#define __ctkDICOMModelObject_h
+
+// Qt includes
+#include <QStandardItemModel>
+#include <QString>
+#include <QStringList>
+#include <QMetaType>
+
+#include "ctkDICOMCoreExport.h"
+
+#include <string>
+
+//class ctkDICOMModelObjectData;
+class ctkDICOMModelObjectPrivate;
+/// \ingroup DICOM_Core
+///
+/// \brief .
+///
+class CTK_DICOM_CORE_EXPORT ctkDICOMModelObject
+//class  ctkDICOMModelObject
+	: public QStandardItemModel
+{
+
+  typedef QStandardItemModel Superclass;
+
+public:
+
+  explicit ctkDICOMModelObject(QObject* parent = 0);
+  ctkDICOMModelObject(const ctkDICOMModelObject& other);
+  virtual ~ctkDICOMModelObject();
+  void setFile (const QString& fileName);
+
+protected:
+  QScopedPointer<ctkDICOMModelObjectPrivate> d_ptr;
+
+private:
+Q_DECLARE_PRIVATE(ctkDICOMModelObject);
+};
+
+
+#endif // ctkDICOMModelObject_h