[IRCtrl] Unactive InterventionalRadiologyController events if a BeamA…

…dapterActionController is already linked to it. For backward compatinility
epernod · Aug 28, 2023 · 0a33048 · 0a33048
1 parent 695ec39
commit 0a33048
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/BeamAdapter/component/controller/BeamAdapterActionController.inl b/src/BeamAdapter/component/controller/BeamAdapterActionController.inl
@@ -48,6 +48,7 @@ void BeamAdapterActionController<DataTypes>::init()
     {
         msg_error() << "No l_interventionController given. Component will be set to Invalid.";
         this->d_componentState.setValue(sofa::core::objectmodel::ComponentState::Invalid);
+        return;
     }
 
     // the controller must listen to the event (in particular BeginAnimationStep event)
@@ -58,6 +59,9 @@ void BeamAdapterActionController<DataTypes>::init()
         msg_warning() << "WriteMode is set to on but a list of actions has been set as input. The list will be overwritten.";
     }
 
+    interventionCtrl* ctrl = l_interventionController.get();
+    ctrl->useBeamAction(true);
+
     this->d_componentState.setValue(sofa::core::objectmodel::ComponentState::Valid);
 }
 

diff --git a/src/BeamAdapter/component/controller/InterventionalRadiologyController.h b/src/BeamAdapter/component/controller/InterventionalRadiologyController.h
@@ -110,6 +110,8 @@ class InterventionalRadiologyController : public MechanicalStateController<DataT
     int getTotalNbEdges()const;
 
     void applyAction(sofa::beamadapter::BeamAdapterAction action);
+    /// Method to warn this controller that a BeamActionController is controlling the scene. Will bypass the event handling in this component.
+    void useBeamAction(bool value) { m_useBeamActions = value; }
 
     /// Getter to the tools curviline abscisses sorted @sa m_nodeCurvAbs at the current timestep.
     [[nodiscard]] const type::vector<Real>& getCurrentCurvAbscisses() const { return m_nodeCurvAbs; }
@@ -153,7 +155,7 @@ class InterventionalRadiologyController : public MechanicalStateController<DataT
     Data<unsigned int>   d_indexFirstNode; // First Node simulated
 
 
-
+    bool m_useBeamActions = false;
     bool m_FF, m_RW, m_sensored;
     FixedConstraint<DataTypes> *    m_fixedConstraint;
     type::vector<int>                     m_droppedInstruments;

diff --git a/src/BeamAdapter/component/controller/InterventionalRadiologyController.inl b/src/BeamAdapter/component/controller/InterventionalRadiologyController.inl
@@ -248,6 +248,9 @@ void InterventionalRadiologyController<DataTypes>::onMouseEvent(MouseEvent * mev
 template <class DataTypes>
 void InterventionalRadiologyController<DataTypes>::onKeyPressedEvent(KeypressedEvent *kev)
 {
+    if (m_useBeamActions)
+        return;
+
     /// Control keys for interventonal Radiology simulations:
     switch(kev->getKey())
     {
@@ -309,6 +312,9 @@ void InterventionalRadiologyController<DataTypes>::onBeginAnimationStep(const do
 {
     SOFA_UNUSED(dt);
 
+    if (m_useBeamActions)
+        return applyInterventionalRadiologyController();
+
     BaseContext* context = getContext();
     auto xInstrTip = sofa::helper::getWriteOnlyAccessor(d_xTip);
     if(m_FF || m_RW)