Always select newly added armature.

This will help preventing conlficts where two armature nodes are added in
the tree view.

See Issue #13668

Modules/Loadable/Armatures/qSlicerArmaturesModuleWidget.cxx

@@ -44,6 +44,7 @@
 #include <vtkMRMLHierarchyNode.h>
 #include <vtkMRMLInteractionNode.h>
 #include <vtkMRMLSelectionNode.h>
+#include <vtkMRMLScene.h>
 
 //-----------------------------------------------------------------------------
 // qSlicerArmaturesModuleWidgetPrivate methods
@@ -611,11 +612,9 @@ ::setMRMLArmatureNode(vtkMRMLArmatureNode* armatureNode)
 {
   Q_D(qSlicerArmaturesModuleWidget);
 
-  if (armatureNode && !d->ArmatureNodeComboBox->currentNode())
+  if (armatureNode && armatureNode != d->ArmatureNodeComboBox->currentNode())
     {
-    bool wasBlocking = d->ArmatureNodeComboBox->blockSignals(true);
     d->ArmatureNodeComboBox->setCurrentNode(armatureNode);
-    d->ArmatureNodeComboBox->blockSignals(wasBlocking);
     }
 
   this->qvtkReconnect(d->ArmatureNode, armatureNode,
@@ -713,6 +712,16 @@ void qSlicerArmaturesModuleWidget::enter()
     }
 }
 
+//-----------------------------------------------------------------------------
+void qSlicerArmaturesModuleWidget::setMRMLScene(vtkMRMLScene* scene)
+{
+  vtkMRMLScene* oldMRMLScene = this->mrmlScene();
+  this->Superclass::setMRMLScene(scene);
+  this->qvtkReconnect(oldMRMLScene, scene, vtkMRMLScene::NodeAddedEvent, this,
+    SLOT(onMRMLNodeAdded(vtkObject*, void*)));
+}
+
+
 //-----------------------------------------------------------------------------
 void qSlicerArmaturesModuleWidget
 ::setMRMLBoneNode(vtkMRMLBoneNode* boneNode)
@@ -912,3 +921,14 @@ void qSlicerArmaturesModuleWidget::updateCurrentMRMLBoneNode()
 
   d->BoneNode->EndModify(wasModifying);
 }
+
+//-----------------------------------------------------------------------------
+void qSlicerArmaturesModuleWidget
+::onMRMLNodeAdded(vtkObject* scene, void* callData)
+{
+  vtkMRMLNode* node = reinterpret_cast<vtkMRMLNode*>(callData);
+  if (node && node->IsA("vtkMRMLArmatureNode"))
+    {
+    this->setMRMLArmatureNode(node);
+    }
+}

Modules/Loadable/Armatures/qSlicerArmaturesModuleWidget.h

@@ -63,6 +63,11 @@ class Q_SLICER_QTMODULES_ARMATURES_EXPORT qSlicerArmaturesModuleWidget
   virtual void enter();
 
 public slots:
+   /// Set the mrml scene.
+   /// Listens to add added node to select the newly added armature node
+   /// as selected.
+    virtual void setMRMLScene(vtkMRMLScene* scene);
+
   /// Set \a armatureNode as current.
   /// \sa setMRMLArmatureNode(vtkMRMLNode*) setMRMLNode(vtkMRMLNode* node)
   void setMRMLArmatureNode(vtkMRMLArmatureNode* armatureNode);
@@ -109,6 +114,9 @@ protected slots:
   void updateCurrentMRMLArmatureNode();
   void updateCurrentMRMLBoneNode();
 
+  /// Update the selected armature if the new bone added is an armature
+  void onMRMLNodeAdded(vtkObject*, void*);
+
 protected:
   QScopedPointer<qSlicerArmaturesModuleWidgetPrivate> d_ptr;