Clean Up bone node - Display node first

This starts by declaring the bone display node before the node itself. This is necessary because otherwise the bone node does not have a proper reference on its display node when loading a scene. This implies that we can get rid of the initialization-hackish code in the bone display node and the displayable manager. See Issue #13668
vovythevov · Dec 12, 2012 · 40e9747 · 40e9747
1 parent 6509f6b
commit 40e9747
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 30 deletions.
diff --git a/Modules/Loadable/Armatures/MRML/Core/vtkMRMLBoneDisplayNode.cxx b/Modules/Loadable/Armatures/MRML/Core/vtkMRMLBoneDisplayNode.cxx
@@ -38,7 +38,6 @@ vtkMRMLNodeNewMacro(vtkMRMLBoneDisplayNode);
 vtkMRMLBoneDisplayNode::vtkMRMLBoneDisplayNode()
 {
   this->SetVisibility(1);
-  this->ShouldBeInitialized = true;
 }
 
 //----------------------------------------------------------------------------

diff --git a/Modules/Loadable/Armatures/MRML/Core/vtkMRMLBoneDisplayNode.h b/Modules/Loadable/Armatures/MRML/Core/vtkMRMLBoneDisplayNode.h
@@ -78,10 +78,6 @@ class VTK_BENDER_ARMATURES_MRML_CORE_EXPORT vtkMRMLBoneDisplayNode
   vtkSetVector3Macro(WidgetInteractionColor, double);
   vtkGetVector3Macro(WidgetInteractionColor, double);
 
-  /// Set/Get if the widget should be initialized or not.
-  vtkSetMacro(ShouldBeInitialized, bool);
-  vtkGetMacro(ShouldBeInitialized, bool);
-
   //--------------------------------------------------------------------------
   // Bone methods
   //--------------------------------------------------------------------------
@@ -99,7 +95,6 @@ class VTK_BENDER_ARMATURES_MRML_CORE_EXPORT vtkMRMLBoneDisplayNode
   ~vtkMRMLBoneDisplayNode();
 
   double WidgetInteractionColor[3];
-  bool ShouldBeInitialized;
 
   vtkMRMLBoneDisplayNode(const vtkMRMLBoneDisplayNode&); /// not implemented
   void operator=(const vtkMRMLBoneDisplayNode&); /// not implemented

diff --git a/Modules/Loadable/Armatures/MRML/Core/vtkMRMLBoneNode.cxx b/Modules/Loadable/Armatures/MRML/Core/vtkMRMLBoneNode.cxx
@@ -164,8 +164,8 @@ void vtkMRMLBoneNode::Initialize(vtkMRMLScene* mrmlScene)
     }
   // \tbd remove this SetScene call as it shouldn't be mandatory.
   this->SetScene(mrmlScene);
-  this->Superclass::Initialize(mrmlScene);
   this->CreateBoneDisplayNode();
+  this->Superclass::Initialize(mrmlScene);
 }
 
 //----------------------------------------------------------------------------

diff --git a/Modules/Loadable/Armatures/MRML/DisplayableManagers/vtkMRMLArmatureDisplayableManager.cxx b/Modules/Loadable/Armatures/MRML/DisplayableManagers/vtkMRMLArmatureDisplayableManager.cxx
@@ -211,15 +211,15 @@ ::AddBoneNode(vtkMRMLBoneNode* boneNode)
     armatureWidget->UpdateBoneWithArmatureOptions(
       boneWidget,
       parentBoneWidget);
-    // For not armature widget properties HACKISH
-    if (boneWidget->GetBoneRepresentation())
+    vtkMRMLBoneDisplayNode* boneDisplayNode = boneNode->GetBoneDisplayNode();
+    if (boneDisplayNode)
       {
-      boneWidget->GetBoneRepresentation()->SetOpacity(
-        armatureNode->GetOpacity());
+      boneDisplayNode->SetOpacity(armatureNode->GetOpacity());
       double rgb[3];
       armatureNode->GetColor(rgb);
-      boneWidget->GetBoneRepresentation()->GetLineProperty()->SetColor(rgb);
+      boneDisplayNode->SetColor(rgb);
       }
+
     boneWidget->SetShowParenthood(parentBoneWidget != 0);
     boneNode->SetHasParent(parentBoneWidget != 0);
 
@@ -601,8 +601,6 @@ void vtkMRMLArmatureDisplayableManager::vtkInternal
 ::UpdateBoneWidgetFromNode(vtkMRMLBoneNode* boneNode,
                            vtkBoneWidget* boneWidget)
 {
-  vtkMRMLBoneDisplayNode* boneDisplayNode =
-    boneNode ? boneNode->GetBoneDisplayNode() : 0;
   if (!boneNode)
     {
     return;
@@ -616,6 +614,9 @@ ::UpdateBoneWidgetFromNode(vtkMRMLBoneNode* boneNode,
     this->BoneNodes.find(boneNode)->second = boneWidget;
     }
 
+  vtkMRMLBoneDisplayNode* boneDisplayNode =
+    boneNode ? boneNode->GetBoneDisplayNode() : 0;
+
   // We need to stop listening to the boneWidget when changing its properties
   // according to the node. Otherwise it will send ModifiedEvent() for the
   // first property changed, thus updating the node.
@@ -627,22 +628,6 @@ ::UpdateBoneWidgetFromNode(vtkMRMLBoneNode* boneNode,
   boneNode->PasteBoneNodeProperties(boneWidget);
   if (boneDisplayNode)
     {
-    if (boneDisplayNode->GetShouldBeInitialized())
-      {
-      // This hackish code is here to prevent the update of the widget
-      // by the display node before the display node was initialized.
-      int wasModifying = boneDisplayNode->StartModify();
-      double normalColor[3];
-      boneWidget->GetBoneRepresentation()->GetLineProperty()
-        ->GetColor(normalColor);
-      boneDisplayNode->SetColor(normalColor);
-
-      boneDisplayNode->CopyBoneWidgetDisplayProperties(boneWidget);
-      boneDisplayNode->SetSelected(true);
-      boneDisplayNode->SetShouldBeInitialized(false);
-      boneDisplayNode->EndModify(wasModifying);
-      }
-
     boneDisplayNode->PasteBoneDisplayNodeProperties(boneWidget);
     }
   boneWidget->AddObserver(vtkCommand::ModifiedEvent,