ENH: Basic JSON descriptor file works for Varian TrueBeam STX

Re SlicerRt#218
cpinter · Feb 11, 2023 · ac9c57b · ac9c57b
1 parent 8fcd31d
commit ac9c57b
Show file tree

Hide file tree

Showing 11 changed files with 578 additions and 401 deletions.
diff --git a/RoomsEyeView/Logic/CMakeLists.txt b/RoomsEyeView/Logic/CMakeLists.txt
@@ -9,6 +9,7 @@ set(${KIT}_INCLUDE_DIRECTORIES
   ${vtkSlicerSubjectHierarchyModuleLogic_INCLUDE_DIRS}
   ${vtkSlicerBeamsModuleMRML_INCLUDE_DIRS}
   ${vtkSlicerBeamsModuleLogic_INCLUDE_DIRS}
+  ${RapidJSON_INCLUDE_DIR}
   )
 
 set(${KIT}_SRCS

diff --git a/RoomsEyeView/Logic/vtkMRMLRoomsEyeViewNode.cxx b/RoomsEyeView/Logic/vtkMRMLRoomsEyeViewNode.cxx
@@ -71,7 +71,7 @@ vtkMRMLNodeNewMacro(vtkMRMLRoomsEyeViewNode);
 //----------------------------------------------------------------------------
 vtkMRMLRoomsEyeViewNode::vtkMRMLRoomsEyeViewNode()
   : PatientBodySegmentID(nullptr)
-  , TreatmentMachineType(nullptr)
+  , TreatmentMachineDescriptorFilePath(nullptr)
   , CollisionDetectionEnabled(true)
   , GantryRotationAngle(0.0)
   , CollimatorRotationAngle(0.0)
@@ -93,7 +93,7 @@ vtkMRMLRoomsEyeViewNode::vtkMRMLRoomsEyeViewNode()
 vtkMRMLRoomsEyeViewNode::~vtkMRMLRoomsEyeViewNode()
 {
   this->SetPatientBodySegmentID(nullptr);
-  this->SetTreatmentMachineType(nullptr);
+  this->SetTreatmentMachineDescriptorFilePath(nullptr);
 }
 
 //----------------------------------------------------------------------------
@@ -115,7 +115,7 @@ void vtkMRMLRoomsEyeViewNode::WriteXML(ostream& of, int nIndent)
   vtkMRMLWriteXMLFloatMacro(AdditionalModelLongitudinalDisplacement, AdditionalModelLongitudinalDisplacement);
   vtkMRMLWriteXMLFloatMacro(AdditionalModelLateralDisplacement, AdditionalModelLateralDisplacement);
   vtkMRMLWriteXMLStringMacro(PatientBodySegmentID, PatientBodySegmentID);
-  vtkMRMLWriteXMLStringMacro(TreatmentMachineType, TreatmentMachineType);
+  vtkMRMLWriteXMLStringMacro(TreatmentMachineDescriptorFilePath, TreatmentMachineDescriptorFilePath);
   vtkMRMLWriteXMLIntMacro(ApplicatorHolderVisibility, ApplicatorHolderVisibility);
   vtkMRMLWriteXMLIntMacro(ElectronApplicatorVisibility, ElectronApplicatorVisibility);
   vtkMRMLWriteXMLEndMacro(); 
@@ -140,7 +140,7 @@ void vtkMRMLRoomsEyeViewNode::ReadXMLAttributes(const char** atts)
   vtkMRMLReadXMLFloatMacro(AdditionalModelLongitudinalDisplacement, AdditionalModelLongitudinalDisplacement);
   vtkMRMLReadXMLFloatMacro(AdditionalModelLateralDisplacement, AdditionalModelLateralDisplacement);
   vtkMRMLReadXMLStringMacro(PatientBodySegmentID, PatientBodySegmentID);
-  vtkMRMLReadXMLStringMacro(TreatmentMachineType, TreatmentMachineType);
+  vtkMRMLReadXMLStringMacro(TreatmentMachineDescriptorFilePath, TreatmentMachineDescriptorFilePath);
   vtkMRMLReadXMLIntMacro(ApplicatorHolderVisibility, ApplicatorHolderVisibility);
   vtkMRMLReadXMLIntMacro(ElectronApplicatorVisibility, ElectronApplicatorVisibility);
   vtkMRMLReadXMLEndMacro(); 
@@ -172,7 +172,7 @@ void vtkMRMLRoomsEyeViewNode::Copy(vtkMRMLNode *anode)
   vtkMRMLCopyFloatMacro(AdditionalModelLongitudinalDisplacement);
   vtkMRMLCopyFloatMacro(AdditionalModelLateralDisplacement);
   vtkMRMLCopyStringMacro(PatientBodySegmentID);
-  vtkMRMLCopyStringMacro(TreatmentMachineType);
+  vtkMRMLCopyStringMacro(TreatmentMachineDescriptorFilePath);
   vtkMRMLCopyIntMacro(ApplicatorHolderVisibility);
   vtkMRMLCopyIntMacro(ElectronApplicatorVisibility);
   vtkMRMLCopyEndMacro(); 
@@ -198,7 +198,7 @@ void vtkMRMLRoomsEyeViewNode::PrintSelf(ostream& os, vtkIndent indent)
   vtkMRMLPrintFloatMacro(AdditionalModelLongitudinalDisplacement);
   vtkMRMLPrintFloatMacro(AdditionalModelLateralDisplacement);
   vtkMRMLPrintStringMacro(PatientBodySegmentID);
-  vtkMRMLPrintStringMacro(TreatmentMachineType);
+  vtkMRMLPrintStringMacro(TreatmentMachineDescriptorFilePath);
   vtkMRMLPrintIntMacro(ApplicatorHolderVisibility);
   vtkMRMLPrintIntMacro(ElectronApplicatorVisibility);
   vtkMRMLPrintEndMacro(); 

diff --git a/RoomsEyeView/Logic/vtkMRMLRoomsEyeViewNode.h b/RoomsEyeView/Logic/vtkMRMLRoomsEyeViewNode.h
@@ -127,10 +127,10 @@ class VTK_SLICER_ROOMSEYEVIEW_LOGIC_EXPORT vtkMRMLRoomsEyeViewNode : public vtkM
   /// Set patient body segment ID
   vtkSetStringMacro(PatientBodySegmentID);
 
-  /// Get treatment machine type name
-  vtkGetStringMacro(TreatmentMachineType);
-  /// Set treatment machine type name
-  vtkSetStringMacro(TreatmentMachineType);
+  /// Get path to the treatment machine descriptor JSON file
+  vtkGetStringMacro(TreatmentMachineDescriptorFilePath);
+  /// Set path to the treatment machine descriptor JSON file
+  vtkSetStringMacro(TreatmentMachineDescriptorFilePath);
 
   vtkGetMacro(CollisionDetectionEnabled, bool);
   vtkSetMacro(CollisionDetectionEnabled, bool);
@@ -182,8 +182,8 @@ class VTK_SLICER_ROOMSEYEVIEW_LOGIC_EXPORT vtkMRMLRoomsEyeViewNode : public vtkM
   /// Patient body segment ID in selected segmentation node
   char* PatientBodySegmentID;
 
-  /// Name of treatment machine used (must match folder name where the models can be found)
-  char* TreatmentMachineType;
+  /// Path to the treatment machine descriptor JSON file
+  char* TreatmentMachineDescriptorFilePath;
 
   bool CollisionDetectionEnabled;