ENH: Add detached vtkIECTransformLogic library to SlicerRT superbuild

This commit was authored by TrosnyogoSzakoca.
I just rebased it to current tip of master branch.

-Change existing code to use new library instead of vtkSlicerIECTransformLogic
-Delete old vtkSlicerIECTransformLogic
-Add new external cmake to superbuild folder
-Update CMakeLists
-Main problem: dll not found errors during SlicerRT startup

FIX: remove debug comment

FIX: try to mimick exactly the Plastimatch cmake structure

FIX: require package in every submodule, as done with plastimatch

FIX: make package was missing the external library vtkIEC

Commit by cpinter. Inspired from IGSIO library.

Author: ferdymercury

Beams/Logic/CMakeLists.txt

@@ -1,5 +1,7 @@
 project(vtkSlicer${MODULE_NAME}ModuleLogic)
 
+find_package(vtkIECTransformLogic REQUIRED)
+
 set(KIT ${PROJECT_NAME})
 
 set(${KIT}_EXPORT_DIRECTIVE "VTK_SLICER_${MODULE_NAME_UPPER}_LOGIC_EXPORT")
@@ -8,18 +10,17 @@ set(${KIT}_INCLUDE_DIRECTORIES
   ${SlicerRtCommon_INCLUDE_DIRS}
   ${vtkSlicerBeamsModuleMRML_INCLUDE_DIRS}
   ${vtkSlicerSubjectHierarchyModuleLogic_INCLUDE_DIRS}
+  ${vtkIECTransformLogic_INCLUDE_DIRS}
   )
 
 set(${KIT}_SRCS
   vtkSlicer${MODULE_NAME}ModuleLogic.cxx
   vtkSlicer${MODULE_NAME}ModuleLogic.h
-  vtkSlicerIECTransformLogic.cxx
-  vtkSlicerIECTransformLogic.h
   vtkSlicerMLCPositionLogic.cxx
   vtkSlicerMLCPositionLogic.h
   )
 
-SET (${KIT}_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${vtkSlicerBeamsModuleMRML_INCLUDE_DIRS} CACHE INTERNAL "" FORCE)
+SET (${KIT}_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${vtkSlicerBeamsModuleMRML_INCLUDE_DIRS} ${vtkIECTransformLogic_INCLUDE_DIRS} CACHE INTERNAL "" FORCE)
 
 set(${KIT}_TARGET_LIBRARIES
   vtkSlicer${MODULE_NAME}ModuleMRML
@@ -28,6 +29,7 @@ set(${KIT}_TARGET_LIBRARIES
   vtkSlicerSubjectHierarchyModuleLogic
   ${ITK_LIBRARIES}
   ${VTK_LIBRARIES}
+  vtkIECTransformLogic
   )
 
 #-----------------------------------------------------------------------------
@@ -38,4 +40,4 @@ SlicerMacroBuildModuleLogic(
   SRCS ${${KIT}_SRCS}
   TARGET_LIBRARIES ${${KIT}_TARGET_LIBRARIES}
   )
-  
+

Beams/Logic/vtkSlicerBeamsModuleLogic.cxx

@@ -20,7 +20,6 @@
 
 // Beams includes
 #include "vtkSlicerBeamsModuleLogic.h"
-#include "vtkSlicerIECTransformLogic.h"
 #include "vtkSlicerMLCPositionLogic.h"
 
 // SlicerRT includes
@@ -46,7 +45,7 @@ vtkStandardNewMacro(vtkSlicerBeamsModuleLogic);
 //----------------------------------------------------------------------------
 vtkSlicerBeamsModuleLogic::vtkSlicerBeamsModuleLogic()
   : MLCPositionLogic(vtkSlicerMLCPositionLogic::New())
-  , IECLogic(vtkSlicerIECTransformLogic::New())
+  , IECLogic(vtkIECTransformLogic::New())
 {
 }
 
@@ -172,7 +171,7 @@ void vtkSlicerBeamsModuleLogic::OnMRMLSceneEndImport()
 }
 
 //---------------------------------------------------------------------------
-void vtkSlicerBeamsModuleLogic::SetIECLogic(vtkSlicerIECTransformLogic* iecLogic)
+void vtkSlicerBeamsModuleLogic::SetIECLogic(vtkIECTransformLogic* iecLogic)
 {
   if (iecLogic == nullptr)
   {
@@ -183,7 +182,7 @@ void vtkSlicerBeamsModuleLogic::SetIECLogic(vtkSlicerIECTransformLogic* iecLogic
   this->IECLogic->Delete();
   this->IECLogic = nullptr;
 
-  vtkSetObjectBodyMacro(IECLogic, vtkSlicerIECTransformLogic, iecLogic);
+  vtkSetObjectBodyMacro(IECLogic, vtkIECTransformLogic, iecLogic);
 }
 
 //----------------------------------------------------------------------------
@@ -361,7 +360,7 @@ void vtkSlicerBeamsModuleLogic::UpdateBeamTransform(vtkMRMLRTBeamNode* beamNode,
   this->UpdateIECTransformsFromBeam(beamNode, isocenter);
 
   vtkNew<vtkGeneralTransform> beamGeneralTransform;
-  this->IECLogic->GetTransformBetween(vtkSlicerIECTransformLogic::Collimator, vtkSlicerIECTransformLogic::RAS, beamGeneralTransform, true);
+  this->IECLogic->GetTransformBetween(vtkIECTransformLogic::Collimator, vtkIECTransformLogic::RAS, beamGeneralTransform, true);
 
   // Convert general transform to linear
   // This call also makes hard copy of the transform so that it doesn't change when other beam transforms change
@@ -408,7 +407,7 @@ void vtkSlicerBeamsModuleLogic::UpdateIECTransformsFromBeam(vtkMRMLRTBeamNode* b
 
 //-----------------------------------------------------------------------------
 void vtkSlicerBeamsModuleLogic::UpdateRASRelatedTransforms(
-  vtkSlicerIECTransformLogic* iecLogic/*=nullptr*/, vtkMRMLRTPlanNode* planNode/*=nullptr*/, double* isocenter/*=nullptr*/, bool transformForBeam/*=false*/)
+  vtkIECTransformLogic* iecLogic/*=nullptr*/, vtkMRMLRTPlanNode* planNode/*=nullptr*/, double* isocenter/*=nullptr*/, bool transformForBeam/*=false*/)
 {
   if (!this->GetMRMLScene())
   {
@@ -424,7 +423,7 @@ void vtkSlicerBeamsModuleLogic::UpdateRASRelatedTransforms(
   // Do the same for the RAS to Patient transform as well.
   vtkNew<vtkTransform> fixedReferenceToRASTransformBeamComponent;
   vtkTransform* rasToPatientReferenceTransform = iecLogic->GetElementaryTransformBetween(
-    vtkSlicerIECTransformLogic::RAS, vtkSlicerIECTransformLogic::Patient);
+    vtkIECTransformLogic::RAS, vtkIECTransformLogic::Patient);
   if (rasToPatientReferenceTransform == nullptr)
   {
     vtkErrorMacro("UpdateRASRelatedTransforms: Failed to find RAS related transforms in the IEC logic");
@@ -479,7 +478,7 @@ void vtkSlicerBeamsModuleLogic::UpdateRASRelatedTransforms(
   // Set up concatenation for final fixed reference to RAS transform
   vtkNew<vtkGeneralTransform> tableTopToTableTopEccentricRotationGeneralTransform;
   iecLogic->GetTransformBetween(
-    vtkSlicerIECTransformLogic::TableTop, vtkSlicerIECTransformLogic::TableTopEccentricRotation, tableTopToTableTopEccentricRotationGeneralTransform, transformForBeam);
+    vtkIECTransformLogic::TableTop, vtkIECTransformLogic::TableTopEccentricRotation, tableTopToTableTopEccentricRotationGeneralTransform, transformForBeam);
   vtkNew<vtkTransform> tableTopToTableTopEccentricRotationLinearTransform;
   if (!vtkMRMLTransformNode::IsGeneralTransformLinear(tableTopToTableTopEccentricRotationGeneralTransform, tableTopToTableTopEccentricRotationLinearTransform))
   {
@@ -489,7 +488,7 @@ void vtkSlicerBeamsModuleLogic::UpdateRASRelatedTransforms(
 
   vtkNew<vtkGeneralTransform> patientSupportRotationToFixedReferenceGeneralTransform;
   iecLogic->GetTransformBetween(
-    vtkSlicerIECTransformLogic::PatientSupportRotation, vtkSlicerIECTransformLogic::FixedReference, patientSupportRotationToFixedReferenceGeneralTransform, transformForBeam);
+    vtkIECTransformLogic::PatientSupportRotation, vtkIECTransformLogic::FixedReference, patientSupportRotationToFixedReferenceGeneralTransform, transformForBeam);
   vtkNew<vtkTransform> patientSupportRotationToFixedReferenceLinearTransform;
   if (!vtkMRMLTransformNode::IsGeneralTransformLinear(patientSupportRotationToFixedReferenceGeneralTransform, patientSupportRotationToFixedReferenceLinearTransform))
   {
@@ -506,6 +505,6 @@ void vtkSlicerBeamsModuleLogic::UpdateRASRelatedTransforms(
 
   // Update fixed reference to RAS transform in IEC logic
   vtkTransform* fixedReferenceToRASTransform = iecLogic->GetElementaryTransformBetween(
-    vtkSlicerIECTransformLogic::FixedReference, vtkSlicerIECTransformLogic::RAS);
+    vtkIECTransformLogic::FixedReference, vtkIECTransformLogic::RAS);
   fixedReferenceToRASTransform->DeepCopy(fixedReferenceToRASTransformNew);
 }

Beams/Logic/vtkSlicerBeamsModuleLogic.h

@@ -30,10 +30,12 @@
 // Slicer includes
 #include "vtkSlicerModuleLogic.h"
 
+// IEC Logic include
+#include <vtkIECTransformLogic.h>
+
 // Beams includes
 #include "vtkSlicerBeamsModuleLogicExport.h"
 #include "vtkMRMLRTBeamNode.h"
-#include "vtkSlicerIECTransformLogic.h"
 
 // VTK includes
 #include <vtkNew.h>
@@ -77,14 +79,14 @@ class VTK_SLICER_BEAMS_LOGIC_EXPORT vtkSlicerBeamsModuleLogic : public vtkSlicer
   /// \param planNode: Plan node to get the isocenter position from
   /// \param isocenter: Option to set any isocenter for dynamic beams
   /// \param transformForBeam: calculate dynamic transformation for beam model or other models. False by default.
-  void UpdateRASRelatedTransforms(vtkSlicerIECTransformLogic* iecLogic=nullptr, vtkMRMLRTPlanNode* planNode=nullptr, double* isocenter=nullptr, bool transformForBeam=false);
+  void UpdateRASRelatedTransforms(vtkIECTransformLogic* iecLogic=nullptr, vtkMRMLRTPlanNode* planNode=nullptr, double* isocenter=nullptr, bool transformForBeam=false);
 
 public:
   vtkGetObjectMacro(MLCPositionLogic, vtkSlicerMLCPositionLogic);
-  vtkGetObjectMacro(IECLogic, vtkSlicerIECTransformLogic);
+  vtkGetObjectMacro(IECLogic, vtkIECTransformLogic);
 
   /// Possibility to use an external IEC logic. This is useful for testing.
-  void SetIECLogic(vtkSlicerIECTransformLogic* iecLogic);
+  void SetIECLogic(vtkIECTransformLogic* iecLogic);
 
 protected:
   vtkSlicerBeamsModuleLogic();
@@ -108,7 +110,7 @@ class VTK_SLICER_BEAMS_LOGIC_EXPORT vtkSlicerBeamsModuleLogic : public vtkSlicer
   vtkSlicerMLCPositionLogic* MLCPositionLogic;
 
 private:
-  vtkSlicerIECTransformLogic* IECLogic;
+  vtkIECTransformLogic* IECLogic;
 };
 
 #endif