MantisBT - Bender

View Issue Details

Project

Category

vtkBoneWidgets => Armatures module

2013-04-02 14:28

Julien Finet

Target Version

=> 1.0

Notes

I believe vtkBoneWidget::StartSelectAction can be factorized a bit more:
There is code duplication in the following:
    if (state == vtkBoneRepresentation::OnHead)
      {
      self->SetWidgetSelectedState(vtkBoneWidget::HeadSelected);
      self->InvokeEvent(vtkCommand::LeftButtonPressEvent,NULL);
      }
    else if (state == vtkBoneRepresentation::OnTail)
      {
      self->SetWidgetSelectedState(vtkBoneWidget::TailSelected);
      self->InvokeEvent(vtkCommand::LeftButtonPressEvent,NULL);
      }
    else if (state == vtkBoneRepresentation::OnLine)
      {
      if (self->WidgetState == vtkBoneWidget::Rest)
        {
        self->SetWidgetSelectedState(vtkBoneWidget::LineSelected);
        self->WidgetRep->StartWidgetInteraction(e);
        self->InvokeEvent(vtkCommand::LeftButtonPressEvent,NULL);
        }

      self->InvokeEvent(vtkCommand::StartInteractionEvent,NULL);
      }
Maybe self->InvokeEvent(vtkCommand::LeftButtonPressEvent,NULL); can be called within SetWidgetSelectedState.

And wouldn't it be cool if vtkBoneRepresentation::OnHead, vtkBoneRepresentation::OnTail, vtkBoneRepresentation::OnLine and vtkBoneRepresentation::Outside were the same than vtkBoneWidget::HeadSelected, vtkBoneWidget::TailSelected, vtkBoneWidget::LineSelected and vtkBoneWidget::NoneSelected? It would make the code in vtkBoneWidget::StartSelectAction() be more like that:
...
int modifier =
   self->Interactor->GetShiftKey() | self->Interactor->GetControlKey();
int state = self->WidgetRep->ComputeInteractionState(X,Y,modifier);
self->SetWidgetSelectedState(state);
...
//(be careful with the abort flag).
...

and

vtkBoneWidget::SetWidgetSelectedState(int selectionState)
{
  ...
  this->BoneSelected = selectionState;
  this->GetBoneRepresentation(selectionState)->Highlight(selectionState != NoSelected);
  if (selectionState == NoSelected)
    {
    return;
    }
  self->GrabFocus(self->EventCallbackCommand);
  // Explain here why it is different than for head and tail
  // and why we don't do it in Pose state
  if (selectionState == Line && widgetState == Rest)
    {
    self->WidgetRep->StartWidgetInteraction(e);
    }
  this->InvokeEvent(LeftButtonPressEvent);
  // Make sure that the order of the calls (LeftButtonPressEvent, StartInteractionEvent) is the
  // same between Head selected, Tail selected and Line selected.
  if (selectionState == Line)
    {
    self->InvokeEvent(vtkCommand::StartInteractionEvent,NULL);
    }
}