FIX: MLC distance and JawPositions proper default values

SlicerRt · Jan 7, 2020 · 89834f5 · 89834f5
1 parent c279962
commit 89834f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Beams/MRML/vtkMRMLRTIonBeamNode.cxx b/Beams/MRML/vtkMRMLRTIonBeamNode.cxx
@@ -347,10 +347,9 @@ void vtkMRMLRTIonBeamNode::CreateBeamPolyData(vtkPolyData* beamModelPolyData/*=n
   }
   else
   {
-    vtkErrorMacro("CreateBeamPolyData: Invalid table node with " \
+    vtkWarningMacro("CreateBeamPolyData: Invalid or absent table node with " \
       "scan spot parameters for a node " 
       << "\"" << this->GetName() << "\"");
-    return;
   }
 
   // Scanning spot beam

diff --git a/DicomRtImportExport/Logic/vtkSlicerDicomRtReader.cxx b/DicomRtImportExport/Logic/vtkSlicerDicomRtReader.cxx
@@ -77,7 +77,7 @@ class vtkSlicerDicomRtReader::vtkInternal
   public:
     BeamLimitingDeviceEntry()
       :
-      SourceIsoDistance(0.),
+      SourceIsoDistance(400.),
       NumberOfPairs(0)
     {
     }
@@ -253,7 +253,7 @@ class vtkSlicerDicomRtReader::vtkInternal
       Number(0),
       Type("STATIC"),
       RadiationIon({ 0, 0, 0 }),
-      SourceAxisDistance({ 1000., 1000. }),
+      SourceAxisDistance({ 2000., 2000. }),
       SourceIsoToJawsDistance({ 500., 500. }),
       NumberOfCompensators(0),
       NumberOfBlocks(0),
@@ -474,7 +474,7 @@ vtkSlicerDicomRtReader::vtkInternal::ControlPointEntry::ControlPointEntry()
   BeamLimitingDeviceAngle(0.0),
   NominalBeamEnergy(0.0),
   MetersetRate(0.0),
-  JawPositions({ 0.0, 0.0, 0.0, 0.0 })
+  JawPositions({ -100.0, 100.0, -100.0, 100.0 })
 {
 }
 
@@ -1763,7 +1763,7 @@ void vtkSlicerDicomRtReader::vtkInternal::LoadRTIonPlan(DcmDataset* dataset)
             controlPoint.NumberOfPaintings = nofPaintings;
           }
         }
-        
+
         DRTBeamLimitingDevicePositionSequence &currentCollimatorPositionSequence =
           controlPointItem.getBeamLimitingDevicePositionSequence();
         if (currentCollimatorPositionSequence.isValid() &&