gizmos: consolidated input param dragging code into reusable class

app/node/CMakeLists.txt

@@ -36,6 +36,8 @@ set(OLIVE_SOURCES
   node/input.cpp
   node/inputarray.h
   node/inputarray.cpp
+  node/inputdragger.h
+  node/inputdragger.cpp
   node/keyframe.h
   node/keyframe.cpp
   node/node.h

app/node/generator/polygon/polygon.cpp

@@ -139,12 +139,28 @@ bool PolygonGenerator::GizmoPress(const NodeValueDatabase &db, const QPointF &p,
   return false;
 }
 
-void PolygonGenerator::GizmoMove(const QPointF &p, const QVector2D &scale)
+void PolygonGenerator::GizmoMove(const QPointF &p, const QVector2D &scale, const rational& time)
 {
   QVector2D new_pos = QVector2D(p) / scale;
 
-  gizmo_drag_->set_standard_value(new_pos.x(), 0);
-  gizmo_drag_->set_standard_value(new_pos.y(), 1);
+  if (!gizmo_x_dragger_.IsStarted()) {
+    gizmo_x_dragger_.Start(gizmo_drag_, time, 0);
+  }
+
+  if (!gizmo_y_dragger_.IsStarted()) {
+    gizmo_y_dragger_.Start(gizmo_drag_, time, 1);
+  }
+
+  gizmo_x_dragger_.Drag(new_pos.x());
+  gizmo_y_dragger_.Drag(new_pos.y());
+
+  InvalidateVisible(gizmo_drag_, gizmo_drag_);
+}
+
+void PolygonGenerator::GizmoRelease(const QPointF &p)
+{
+  gizmo_x_dragger_.End();
+  gizmo_y_dragger_.End();
 }
 
 QVector<QPointF> PolygonGenerator::GetGizmoCoordinates(const NodeValueDatabase &db, const QVector2D& scale) const

app/node/generator/polygon/polygon.h

@@ -22,6 +22,7 @@
 #define POLYGONGENERATOR_H
 
 #include "node/node.h"
+#include "node/inputdragger.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -46,8 +47,8 @@ public:
   virtual void DrawGizmos(const NodeValueDatabase& db, QPainter *p, const QVector2D &scale) const override;
 
   virtual bool GizmoPress(const NodeValueDatabase& db, const QPointF &p, const QVector2D &scale) override;
-  virtual void GizmoMove(const QPointF &p, const QVector2D &scale) override;
-  //virtual void GizmoRelease(const QPointF &p) override;
+  virtual void GizmoMove(const QPointF &p, const QVector2D &scale, const rational &time) override;
+  virtual void GizmoRelease(const QPointF &p) override;
 
 private:
   QVector<QPointF> GetGizmoCoordinates(const NodeValueDatabase &db, const QVector2D &scale) const;
@@ -61,6 +62,9 @@ private:
   NodeInput* gizmo_drag_;
   QPointF gizmo_drag_start_;
 
+  NodeInputDragger gizmo_x_dragger_;
+  NodeInputDragger gizmo_y_dragger_;
+
 };
 
 OLIVE_NAMESPACE_EXIT

app/node/inputdragger.cpp

@@ -0,0 +1,118 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "inputdragger.h"
+
+#include "core.h"
+#include "node.h"
+#include "widget/nodeparamview/nodeparamviewundo.h"
+
+OLIVE_NAMESPACE_ENTER
+
+NodeInputDragger::NodeInputDragger() :
+  input_(nullptr)
+{
+
+}
+
+bool NodeInputDragger::IsStarted() const
+{
+  return input_;
+}
+
+void NodeInputDragger::Start(NodeInput *input, const rational &time, int track)
+{
+  Q_ASSERT(!input_);
+
+  // Set up new drag
+  input_ = input;
+  time_ = time;
+  track_ = track;
+
+  // Cache current value
+  start_value_ = input_->get_value_at_time_for_track(time, track);
+
+  // Determine whether we are creating a keyframe or not
+  if (input_->is_keyframing()) {
+    dragging_key_ = input_->get_keyframe_at_time_on_track(time, track);
+    drag_created_key_ = !dragging_key_;
+
+    if (drag_created_key_) {
+      dragging_key_ = NodeKeyframe::Create(time,
+                                           start_value_,
+                                           input_->get_best_keyframe_type_for_time(time, track),
+                                           track);
+
+      // We disable default signal emitting during the drag
+      input_->blockSignals(true);
+      input_->insert_keyframe(dragging_key_);
+      input_->blockSignals(false);
+
+      emit input_->KeyframeAdded(dragging_key_);
+    }
+  }
+}
+
+void NodeInputDragger::Drag(const QVariant& value)
+{
+  Q_ASSERT(input_);
+
+  end_value_ = value;
+
+  input_->blockSignals(true);
+
+  if (input_->is_keyframing()) {
+    dragging_key_->set_value(value);
+  } else {
+    input_->set_standard_value(value, track_);
+  }
+
+  input_->blockSignals(false);
+}
+
+void NodeInputDragger::End()
+{
+  if (!IsStarted()) {
+    return;
+  }
+
+  QUndoCommand* command = new QUndoCommand();
+
+  if (input_->is_keyframing()) {
+    if (drag_created_key_) {
+      // We created a keyframe in this process
+      new NodeParamInsertKeyframeCommand(input_, dragging_key_, 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_key_, end_value_, start_value_, command);
+  } else {
+    // We just set the standard value
+    new NodeParamSetStandardValueCommand(input_, track_, end_value_, start_value_, command);
+  }
+
+  Core::instance()->undo_stack()->push(command);
+
+  input_ = nullptr;
+}
+
+OLIVE_NAMESPACE_EXIT

app/node/inputdragger.h

@@ -0,0 +1,60 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef NODEINPUTDRAGGER_H
+#define NODEINPUTDRAGGER_H
+
+#include "node/input.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class NodeInputDragger
+{
+public:
+  NodeInputDragger();
+
+  bool IsStarted() const;
+
+  void Start(NodeInput* input, const rational& time, int track);
+
+  void Drag(const QVariant &value);
+
+  void End();
+
+private:
+  NodeInput* input_;
+
+  int track_;
+
+  rational time_;
+
+  QVariant start_value_;
+
+  QVariant end_value_;
+
+  NodeKeyframePtr dragging_key_;
+
+  bool drag_created_key_;
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // NODEINPUTDRAGGER_H

app/node/node.cpp

@@ -296,7 +296,7 @@ bool Node::GizmoPress(const NodeValueDatabase &, const QPointF &, const QVector2
   return false;
 }
 
-void Node::GizmoMove(const QPointF &, const QVector2D &)
+void Node::GizmoMove(const QPointF &, const QVector2D &, const rational &)
 {
 }
 

app/node/node.h

@@ -386,7 +386,7 @@ public:
   virtual void DrawGizmos(const NodeValueDatabase& db, QPainter* p, const QVector2D &scale) const;
 
   virtual bool GizmoPress(const NodeValueDatabase& db, const QPointF& p, const QVector2D &scale);
-  virtual void GizmoMove(const QPointF& p, const QVector2D &scale);
+  virtual void GizmoMove(const QPointF& p, const QVector2D &scale, const rational &time);
   virtual void GizmoRelease(const QPointF& p);
 
   const QString& GetLabel() const;