Merge pull request #1220 from aylward/SpatialObjectPointAssignmentOpe…

…ratorBug BUG: operator= defined in [tube|*]SpatialObjectPoint incomplete
InsightSoftwareConsortium · Sep 2, 2019 · d2e5114 · d2e5114
2 parents 126b561 + 096a847
commit d2e5114
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 0 deletions.
diff --git a/Modules/Core/SpatialObjects/include/itkContourSpatialObjectPoint.hxx b/Modules/Core/SpatialObjects/include/itkContourSpatialObjectPoint.hxx
@@ -66,6 +66,7 @@ ContourSpatialObjectPoint<TPointDimension>::operator=(const ContourSpatialObject
     this->m_Id = rhs.GetId();
     this->m_PositionInObjectSpace = rhs.GetPositionInObjectSpace();
     this->m_Color = rhs.GetColor();
+    this->m_SpatialObject = rhs.GetSpatialObject();
     this->m_NormalInObjectSpace = rhs.GetNormalInObjectSpace();
     this->m_PickedPointInObjectSpace = rhs.GetPickedPointInObjectSpace();
   }

diff --git a/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObjectPoint.hxx b/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObjectPoint.hxx
@@ -169,6 +169,7 @@ DTITubeSpatialObjectPoint<TPointDimension>::operator=(const DTITubeSpatialObject
     this->SetId(rhs.GetId());
     this->SetPositionInObjectSpace(rhs.GetPositionInObjectSpace());
     this->SetColor(rhs.GetColor());
+    this->SetSpatialObject(rhs.GetSpatialObject());
 
     // Tube
     this->SetRadiusInObjectSpace(rhs.GetRadiusInObjectSpace());

diff --git a/Modules/Core/SpatialObjects/include/itkLineSpatialObjectPoint.hxx b/Modules/Core/SpatialObjects/include/itkLineSpatialObjectPoint.hxx
@@ -74,6 +74,7 @@ LineSpatialObjectPoint<TPointDimension>::operator=(const LineSpatialObjectPoint
 {
   this->m_Id = rhs.m_Id;
   this->m_Color = rhs.m_Color;
+  this->m_SpatialObject = rhs.m_SpatialObject;
   this->m_PositionInObjectSpace = rhs.m_PositionInObjectSpace;
   this->m_NormalArrayInObjectSpace = rhs.m_NormalArrayInObjectSpace;
   return *this;

diff --git a/Modules/Core/SpatialObjects/include/itkSpatialObjectPoint.h b/Modules/Core/SpatialObjects/include/itkSpatialObjectPoint.h
@@ -107,6 +107,12 @@ class ITK_TEMPLATE_EXPORT SpatialObjectPoint
     m_SpatialObject = so;
   }
 
+  SpatialObjectType *
+  GetSpatialObject() const
+  {
+    return m_SpatialObject;
+  }
+
   /** Set the position in world coordinates, using the
    *    spatialObject's objectToWorld transform, inverse */
   void

diff --git a/Modules/Core/SpatialObjects/include/itkSpatialObjectPoint.hxx b/Modules/Core/SpatialObjects/include/itkSpatialObjectPoint.hxx
@@ -82,6 +82,7 @@ SpatialObjectPoint<TPointDimension>::operator=(const SpatialObjectPoint & rhs)
     this->SetId(rhs.GetId());
     this->SetPositionInObjectSpace(rhs.GetPositionInObjectSpace());
     this->SetColor(rhs.GetColor());
+    this->SetSpatialObject(rhs.GetSpatialObject());
   }
   return *this;
 }
@@ -103,6 +104,7 @@ SpatialObjectPoint<TPointDimension>::PrintSelf(std::ostream & os, Indent indent)
     os << m_PositionInObjectSpace[i - 1] << ",";
   }
   os << m_PositionInObjectSpace[TPointDimension - 1] << std::endl;
+  os << indent << "SpatialObject: " << m_SpatialObject << std::endl;
 }
 } // end namespace itk
 

diff --git a/Modules/Core/SpatialObjects/include/itkSurfaceSpatialObjectPoint.hxx b/Modules/Core/SpatialObjects/include/itkSurfaceSpatialObjectPoint.hxx
@@ -63,6 +63,7 @@ SurfaceSpatialObjectPoint<TPointDimension>::operator=(const SurfaceSpatialObject
 {
   this->m_Id = rhs.m_Id;
   this->m_Color = rhs.m_Color;
+  this->m_SpatialObject = rhs.m_SpatialObject;
   this->m_PositionInObjectSpace = rhs.m_PositionInObjectSpace;
   this->m_NormalInObjectSpace = rhs.m_NormalInObjectSpace;
   return *this;

diff --git a/Modules/Core/SpatialObjects/include/itkTubeSpatialObjectPoint.hxx b/Modules/Core/SpatialObjects/include/itkTubeSpatialObjectPoint.hxx
@@ -185,6 +185,7 @@ TubeSpatialObjectPoint<TPointDimension>::operator=(const TubeSpatialObjectPoint
     this->SetId(rhs.GetId());
     this->SetPositionInObjectSpace(rhs.GetPositionInObjectSpace());
     this->SetColor(rhs.GetColor());
+    this->SetSpatialObject(rhs.GetSpatialObject());
 
     // class
     this->SetRadiusInObjectSpace(rhs.GetRadiusInObjectSpace());