ENH: checkpoint commit

QIICR · May 14, 2017 · e1827fe · e1827fe
1 parent fa9557b
commit e1827fe
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/include/dcmqi/DICOMFrame.h b/include/dcmqi/DICOMFrame.h
@@ -41,6 +41,9 @@ namespace dcmqi {
 
     int getFrameNumber() const; // 0 for legacy datasets, 1 or above for enhanced objects
     OFString getInstanceUID() const;
+    vnl_vector<double> getFrameIPP(){
+      return frameIPP;
+    };
 
   private:
 

diff --git a/libsrc/MultiframeObject.cpp b/libsrc/MultiframeObject.cpp
@@ -163,8 +163,18 @@ int MultiframeObject::mapVolumeSlicesToDICOMFrames(ImageVolumeGeometry& volume,
 
 std::vector<int> MultiframeObject::findIntersectingSlices(ImageVolumeGeometry &volume, dcmqi::DICOMFrame &frame) {
   std::vector<int> intersectingSlices;
-
-
+  // for now, adopt a simple strategy that maps origin of the frame to index, and selects the slice corresponding
+  //  to this index as the intersecting one
+  ImageVolumeGeometry::DummyImageType::Pointer itkvolume = volume.getITKRepresentation();
+  ImageVolumeGeometry::DummyImageType::PointType point;
+  ImageVolumeGeometry::DummyImageType::IndexType index;
+  vnl_vector<double> frameIPP = frame.getFrameIPP();
+  point[0] = frameIPP[0];
+  point[1] = frameIPP[1];
+  point[2] = frameIPP[2];
+
+  if(itkvolume->TransformPhysicalPointToIndex(point, index))
+    intersectingSlices.push_back(index[2]);
 
   return intersectingSlices;
-}
+}
diff --git a/libsrc/ParametricMapObject.cpp b/libsrc/ParametricMapObject.cpp
@@ -21,6 +21,10 @@ int ParametricMapObject::initializeFromITK(Float32ITKImageType::Pointer inputIma
 
   initializeVolumeGeometry();
 
+  // NB: the sequence of steps initializing different components of the object parallels that
+  //  in the original converter function. It probably makes sense to revisit the sequence
+  //  of these steps. It does not necessarily need to happen in this order.
+
   // TODO: consider creating parametric map object after all FGs are initialized instead
   createParametricMap();
 
@@ -40,7 +44,8 @@ int ParametricMapObject::initializeFromITK(Float32ITKImageType::Pointer inputIma
   initializeFrameAnatomyFG();
   initializeRWVMFG();
 
-
+  // initialize referenced instances
+  ///initializeReferencedInstances();
 
   return EXIT_SUCCESS;
 }
@@ -195,7 +200,7 @@ int ParametricMapObject::initializeRWVMFG() {
 
       if (!bval || !bvalUnits || !qCodeName)
       {
-        return NULL;
+        return EXIT_FAILURE;
       }
 
       bval->setValueType(ContentItemMacro::VT_NUMERIC);