Commit f021ee64 authored by pinter's avatar pinter
Browse files

BUG: Fix double-saving of MRML node attribute

As the WriteXML method in both the vtkMRMLGPURayCastVolumeRenderingDisplayNode class and its base class vtkMRMLVolumeRenderingDisplayNode saved the raycastTechnique attribute, saving a scene containing GPU volume rendering resulted in an invalid XML file. By removing it from the specialized class, this issue is fixed.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@27164 3bd1e089-480b-0410-8dfb-8563597acbee
parent ea976db9
...@@ -33,7 +33,6 @@ vtkMRMLNodeNewMacro(vtkMRMLGPURayCastVolumeRenderingDisplayNode); ...@@ -33,7 +33,6 @@ vtkMRMLNodeNewMacro(vtkMRMLGPURayCastVolumeRenderingDisplayNode);
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
vtkMRMLGPURayCastVolumeRenderingDisplayNode::vtkMRMLGPURayCastVolumeRenderingDisplayNode() vtkMRMLGPURayCastVolumeRenderingDisplayNode::vtkMRMLGPURayCastVolumeRenderingDisplayNode()
{ {
this->RaycastTechnique = vtkMRMLGPURayCastVolumeRenderingDisplayNode::Composite;
this->SurfaceSmoothing = false; this->SurfaceSmoothing = false;
} }
...@@ -48,7 +47,6 @@ void vtkMRMLGPURayCastVolumeRenderingDisplayNode::ReadXMLAttributes(const char** ...@@ -48,7 +47,6 @@ void vtkMRMLGPURayCastVolumeRenderingDisplayNode::ReadXMLAttributes(const char**
this->Superclass::ReadXMLAttributes(atts); this->Superclass::ReadXMLAttributes(atts);
vtkMRMLReadXMLBeginMacro(atts); vtkMRMLReadXMLBeginMacro(atts);
vtkMRMLReadXMLIntMacro(raycastTechnique, RaycastTechnique);
vtkMRMLReadXMLIntMacro(surfaceSmoothing, SurfaceSmoothing); vtkMRMLReadXMLIntMacro(surfaceSmoothing, SurfaceSmoothing);
vtkMRMLReadXMLEndMacro(); vtkMRMLReadXMLEndMacro();
} }
...@@ -59,7 +57,6 @@ void vtkMRMLGPURayCastVolumeRenderingDisplayNode::WriteXML(ostream& of, int nInd ...@@ -59,7 +57,6 @@ void vtkMRMLGPURayCastVolumeRenderingDisplayNode::WriteXML(ostream& of, int nInd
this->Superclass::WriteXML(of, nIndent); this->Superclass::WriteXML(of, nIndent);
vtkMRMLWriteXMLBeginMacro(of); vtkMRMLWriteXMLBeginMacro(of);
vtkMRMLWriteXMLIntMacro(raycastTechnique, RaycastTechnique);
vtkMRMLWriteXMLIntMacro(surfaceSmoothing, SurfaceSmoothing); vtkMRMLWriteXMLIntMacro(surfaceSmoothing, SurfaceSmoothing);
vtkMRMLWriteXMLEndMacro(); vtkMRMLWriteXMLEndMacro();
} }
...@@ -71,7 +68,6 @@ void vtkMRMLGPURayCastVolumeRenderingDisplayNode::Copy(vtkMRMLNode *anode) ...@@ -71,7 +68,6 @@ void vtkMRMLGPURayCastVolumeRenderingDisplayNode::Copy(vtkMRMLNode *anode)
this->Superclass::Copy(anode); this->Superclass::Copy(anode);
vtkMRMLCopyBeginMacro(anode); vtkMRMLCopyBeginMacro(anode);
vtkMRMLCopyIntMacro(RaycastTechnique);
vtkMRMLCopyIntMacro(SurfaceSmoothing); vtkMRMLCopyIntMacro(SurfaceSmoothing);
vtkMRMLCopyEndMacro(); vtkMRMLCopyEndMacro();
...@@ -84,7 +80,6 @@ void vtkMRMLGPURayCastVolumeRenderingDisplayNode::PrintSelf(ostream& os, vtkInde ...@@ -84,7 +80,6 @@ void vtkMRMLGPURayCastVolumeRenderingDisplayNode::PrintSelf(ostream& os, vtkInde
this->Superclass::PrintSelf(os,indent); this->Superclass::PrintSelf(os,indent);
vtkMRMLPrintBeginMacro(os, indent); vtkMRMLPrintBeginMacro(os, indent);
vtkMRMLPrintIntMacro(RaycastTechnique);
vtkMRMLPrintIntMacro(SurfaceSmoothing); vtkMRMLPrintIntMacro(SurfaceSmoothing);
vtkMRMLPrintEndMacro(); vtkMRMLPrintEndMacro();
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment