gizmos: consolidated input param dragging code into reusable class

app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp

@@ -42,9 +42,7 @@ OLIVE_NAMESPACE_ENTER
 
 NodeParamViewWidgetBridge::NodeParamViewWidgetBridge(NodeInput *input, QObject *parent) :
   QObject(parent),
-  input_(input),
-  dragging_(false),
-  drag_created_keyframe_(false)
+  input_(input)
 {
   CreateWidgets();
 
@@ -227,74 +225,23 @@ void NodeParamViewWidgetBridge::ProcessSlider(SliderBase *slider, const QVariant
   if (slider->IsDragging()) {
 
     // While we're dragging, we block the input's normal signalling and create our own
-    input_->blockSignals(true);
-
-    if (!dragging_) {
-      // Set up new drag
-      dragging_ = true;
-
-      // Cache current value
-      drag_old_value_ = input_->get_value_at_time_for_track(node_time, slider_track);
-
-      // Determine whether we are creating a keyframe or not
-      if (input_->is_keyframing()) {
-        dragging_keyframe_ = input_->get_keyframe_at_time_on_track(node_time, slider_track);
-        drag_created_keyframe_ = !dragging_keyframe_;
-
-        if (drag_created_keyframe_) {
-          dragging_keyframe_ = NodeKeyframe::Create(node_time,
-                                                    value,
-                                                    input_->get_best_keyframe_type_for_time(node_time, slider_track),
-                                                    slider_track);
-
-          input_->insert_keyframe(dragging_keyframe_);
-
-          // We re-enable signals temporarily to emit the keyframe added signal
-          input_->blockSignals(false);
-          emit input_->KeyframeAdded(dragging_keyframe_);
-          input_->blockSignals(true);
-        }
-      }
+    if (!dragger_.IsStarted()) {
+      dragger_.Start(input_, node_time, slider_track);
     }
 
-    if (input_->is_keyframing()) {
-      dragging_keyframe_->set_value(value);
-    } else {
-      input_->set_standard_value(value, slider_track);
-    }
-
-    input_->blockSignals(false);
+    dragger_.Drag(value);
 
     input_->parentNode()->InvalidateVisible(input_, input_);
 
+  } else if (dragger_.IsStarted()) {
+
+    // We were dragging and just stopped
+    dragger_.Drag(value);
+    dragger_.End();
+
   } else {
-    if (dragging_) {
-      // We were dragging and just stopped
-      dragging_ = false;
-
-      QUndoCommand* command = new QUndoCommand();
-
-      if (input_->is_keyframing()) {
-        if (drag_created_keyframe_) {
-          // We created a keyframe in this process
-          new NodeParamInsertKeyframeCommand(input_, dragging_keyframe_, true, command);
-        }
-
-        // We just set a keyframe's value
-        // We do this even when inserting a keyframe because we don't actually perform an insert in this undo command
-        // so this will ensure the ValueChanged() signal is sent correctly
-        new NodeParamSetKeyframeValueCommand(dragging_keyframe_, value, drag_old_value_, command);
-      } else {
-        // We just set the standard value
-        new NodeParamSetStandardValueCommand(input_, slider_track, value, drag_old_value_, command);
-      }
-
-      Core::instance()->undo_stack()->push(command);
-
-    } else {
-      // No drag was involved, we can just push the value
-      SetInputValue(value, slider_track);
-    }
+    // No drag was involved, we can just push the value
+    SetInputValue(value, slider_track);
   }
 }
 
@@ -529,7 +476,7 @@ rational NodeParamViewWidgetBridge::GetCurrentTimeAsNodeTime() const
 
 void NodeParamViewWidgetBridge::InputValueChanged(const TimeRange &range)
 {
-  if (!dragging_ && range.in() <= time_ && range.out() >= time_) {
+  if (!dragger_.IsStarted() && range.in() <= time_ && range.out() >= time_) {
     // We'll need to update the widgets because the values have changed on our current time
     UpdateWidgetValues();
   }

app/widget/nodeparamview/nodeparamviewwidgetbridge.h

@@ -24,6 +24,7 @@
 #include <QObject>
 
 #include "node/input.h"
+#include "node/inputdragger.h"
 #include "widget/slider/sliderbase.h"
 #include "widget/timetarget/timetarget.h"
 
@@ -60,10 +61,7 @@ private:
 
   rational time_;
 
-  bool dragging_;
-  bool drag_created_keyframe_;
-  QVariant drag_old_value_;
-  NodeKeyframePtr dragging_keyframe_;
+  NodeInputDragger dragger_;
 
 private slots:
   void WidgetCallback();

app/widget/viewer/viewerdisplay.cpp

@@ -191,11 +191,11 @@ void ViewerDisplayWidget::SetTime(const rational &time)
 
 void ViewerDisplayWidget::mousePressEvent(QMouseEvent *event)
 {
-  if (gizmos_) {
-    if (gizmos_->GizmoPress(gizmo_db_, event->pos(), QVector2D(GetTexturePosition(size())))) {
-      gizmo_click_ = true;
-      return;
-    }
+  if (gizmos_
+      && gizmos_->GizmoPress(gizmo_db_, event->pos(), QVector2D(GetTexturePosition(size())))) {
+    gizmo_click_ = true;
+    gizmo_drag_time_ = GetGizmoTime();
+    return;
   }
 
   QOpenGLWidget::mousePressEvent(event);
@@ -206,7 +206,7 @@ void ViewerDisplayWidget::mousePressEvent(QMouseEvent *event)
 void ViewerDisplayWidget::mouseMoveEvent(QMouseEvent *event)
 {
   if (gizmo_click_) {
-    gizmos_->GizmoMove(event->pos(), QVector2D(GetTexturePosition(size())));
+    gizmos_->GizmoMove(event->pos(), QVector2D(GetTexturePosition(size())), gizmo_drag_time_);
     return;
   }
 
@@ -294,7 +294,7 @@ void ViewerDisplayWidget::paintGL()
   if (gizmos_) {
     GizmoTraverser gt;
 
-    rational node_time = GetAdjustedTime(GetTimeTarget(), gizmos_, time_, NodeParam::kInput);
+    rational node_time = GetGizmoTime();
 
     gizmo_db_ = gt.GenerateDatabase(gizmos_, TimeRange(node_time, node_time));
 
@@ -351,6 +351,11 @@ QPointF ViewerDisplayWidget::GetTexturePosition(const double &x, const double &y
                  y / gizmo_params_.height());
 }
 
+rational ViewerDisplayWidget::GetGizmoTime()
+{
+  return GetAdjustedTime(GetTimeTarget(), gizmos_, time_, NodeParam::kInput);
+}
+
 #ifdef Q_OS_LINUX
 void ViewerDisplayWidget::ShowNouveauWarning()
 {

app/widget/viewer/viewerdisplay.h

@@ -162,6 +162,8 @@ private:
   QPointF GetTexturePosition(const QSize& size);
   QPointF GetTexturePosition(const double& x, const double& y);
 
+  rational GetGizmoTime();
+
   /**
    * @brief Internal reference to the OpenGL texture to draw. Set in SetTexture() and used in paintGL().
    */
@@ -188,11 +190,9 @@ private:
   ViewerSafeMarginInfo safe_margin_;
 
   Node* gizmos_;
-
   NodeValueDatabase gizmo_db_;
-
+  rational gizmo_drag_time_;
   VideoRenderingParams gizmo_params_;
-
   bool gizmo_click_;
 
   rational time_;