viewer: allow adding objects with a rect

app/widget/viewer/viewer.cpp

@@ -37,12 +37,14 @@
 #include "common/timecodefunctions.h"
 #include "config/config.h"
 #include "core.h"
+#include "node/block/gap/gap.h"
 #include "node/project/project.h"
 #include "render/rendermanager.h"
 #include "task/taskmanager.h"
 #include "viewerpreventsleep.h"
 #include "widget/menu/menu.h"
 #include "window/mainwindow/mainwindow.h"
+#include "widget/timelinewidget/tool/add.h"
 #include "widget/timeruler/timeruler.h"
 
 namespace olive {
@@ -93,6 +95,7 @@ ViewerWidget::ViewerWidget(QWidget *parent) :
   connect(display_widget_, &ViewerDisplayWidget::Dropped, this, &ViewerWidget::Dropped);
   connect(display_widget_, &ViewerDisplayWidget::TextureChanged, this, &ViewerWidget::TextureChanged);
   connect(display_widget_, &ViewerDisplayWidget::QueueStarved, this, &ViewerWidget::ForceRequeueFromCurrentTime);
+  connect(display_widget_, &ViewerDisplayWidget::CreateAddableAt, this, &ViewerWidget::CreateAddableAt);
   connect(sizer_, &ViewerSizer::RequestScale, display_widget_, &ViewerDisplayWidget::SetMatrixZoom);
   connect(sizer_, &ViewerSizer::RequestTranslate, display_widget_, &ViewerDisplayWidget::SetMatrixTranslate);
   connect(display_widget_, &ViewerDisplayWidget::HandDragMoved, sizer_, &ViewerSizer::HandDragMove);
@@ -385,6 +388,7 @@ void ViewerWidget::CacheSequenceInOut()
 
 void ViewerWidget::SetGizmos(Node *node)
 {
+  qDebug() << "setting gizmos to" << node;
   display_widget_->SetTimeTarget(GetConnectedNode());
   display_widget_->SetGizmos(node);
 }
@@ -476,6 +480,47 @@ void ViewerWidget::UpdateAudioProcessor()
   }
 }
 
+void ViewerWidget::CreateAddableAt(QRectF f)
+{
+  if (Sequence *s = dynamic_cast<Sequence*>(GetConnectedNode())) {
+    Track::Type type = Track::kVideo;
+    int track_index = -1;
+    TrackList *list = s->track_list(type);
+    const rational &in = GetTime();
+    rational length = OLIVE_CONFIG("DefaultStillLength").value<rational>();
+    rational out = in + length;
+
+    // Find a free track where we won't overwrite anything
+    while (true) {
+      track_index++;
+
+      if (track_index >= list->GetTrackCount()) {
+        // Just create a new track
+        break;
+      }
+
+      Track *track = list->GetTrackAt(track_index);
+      if (track->IsLocked()) {
+        continue;
+      }
+
+      Block *b = track->NearestBlockBeforeOrAt(in);
+      if (!b || (dynamic_cast<GapBlock*>(b) && b->out() >= out)) {
+        break;
+      }
+    }
+
+    // Normalize around center of sequence
+    f.translate(-s->GetVideoParams().width()*0.5, -s->GetVideoParams().height()*0.5);
+    f.translate(f.width()*0.5, f.height()*0.5);
+
+    MultiUndoCommand *command = new MultiUndoCommand();
+    Node *clip = AddTool::CreateAddableClip(command, s, Track::Reference(type, track_index), in, length, f);
+    Core::instance()->undo_stack()->pushIfHasChildren(command);
+    SetGizmos(clip);
+  }
+}
+
 void ViewerWidget::CloseAudioProcessor()
 {
   audio_processor_.Close();

app/widget/viewer/viewer.h

@@ -325,6 +325,8 @@ private slots:
 
   void UpdateAudioProcessor();
 
+  void CreateAddableAt(QRectF f);
+
 };
 
 }

app/widget/viewer/viewerdisplay.cpp

@@ -67,9 +67,10 @@ ViewerDisplayWidget::ViewerDisplayWidget(QWidget *parent) :
   show_fps_(false),
   frames_skipped_(0),
   show_widget_background_(false),
-  push_mode_(kPushNull)
+  push_mode_(kPushNull),
+  add_band_(nullptr)
 {
-  connect(Core::instance(), &Core::ToolChanged, this, &ViewerDisplayWidget::UpdateCursor);
+  connect(Core::instance(), &Core::ToolChanged, this, &ViewerDisplayWidget::ToolChanged);
 
   connect(this, &ViewerDisplayWidget::InnerWidgetMouseMove, this, &ViewerDisplayWidget::EmitColorAtCursor);
 
@@ -105,6 +106,8 @@ void ViewerDisplayWidget::UpdateCursor()
 {
   if (Core::instance()->tool() == Tool::kHand) {
     setCursor(Qt::OpenHandCursor);
+  } else if (Core::instance()->tool() == Tool::kAdd) {
+    setCursor(Qt::CrossCursor);
   } else {
     unsetCursor();
   }
@@ -136,6 +139,11 @@ void ViewerDisplayWidget::SetBlank()
   update();
 }
 
+void ViewerDisplayWidget::ToolChanged()
+{
+  UpdateCursor();
+}
+
 void ViewerDisplayWidget::SetDeinterlacing(bool e)
 {
   deinterlace_ = e;
@@ -235,7 +243,16 @@ void ViewerDisplayWidget::IncrementSkippedFrames()
 
 void ViewerDisplayWidget::mousePressEvent(QMouseEvent *event)
 {
-  if (event->button() == Qt::LeftButton && gizmos_
+  if (event->button() == Qt::LeftButton && Core::instance()->tool() == Tool::kAdd
+      && (Core::instance()->GetSelectedAddableObject() == Tool::kAddableShape || Core::instance()->GetSelectedAddableObject() == Tool::kAddableTitle)) {
+
+    add_band_start_ = event->pos();
+
+    add_band_ = new QRubberBand(QRubberBand::Rectangle, this);
+    add_band_->setGeometry(QRect(add_band_start_, add_band_start_));
+    add_band_->show();
+
+  } else if (event->button() == Qt::LeftButton && gizmos_
       && (current_gizmo_ = TryGizmoPress(gizmo_db_, TransformViewerSpaceToBufferSpace(event->pos())))) {
 
     // Handle gizmo click
@@ -274,6 +291,10 @@ void ViewerDisplayWidget::mouseMoveEvent(QMouseEvent *event)
 
     hand_last_drag_pos_ = event->pos();
 
+  } else if (add_band_) {
+
+    add_band_->setGeometry(QRect(event->pos(), add_band_start_).normalized());
+
   } else if (current_gizmo_) {
 
     // Signal movement
@@ -324,6 +345,14 @@ void ViewerDisplayWidget::mouseReleaseEvent(QMouseEvent *event)
     hand_dragging_ = false;
     UpdateCursor();
 
+  } else if (add_band_) {
+
+    QRectF r = GenerateGizmoTransform().inverted().mapRect(add_band_->geometry());
+    emit CreateAddableAt(r);
+
+    add_band_->deleteLater();
+    add_band_ = nullptr;
+
   } else if (current_gizmo_) {
 
     // Handle gizmo

app/widget/viewer/viewerdisplay.h

@@ -21,8 +21,9 @@
 #ifndef VIEWERGLWIDGET_H
 #define VIEWERGLWIDGET_H
 
-#include <QOpenGLWidget>
 #include <QMatrix4x4>
+#include <QOpenGLWidget>
+#include <QRubberBand>
 
 #include "node/color/colormanager/colormanager.h"
 #include "node/gizmo/text.h"
@@ -163,6 +164,8 @@ public slots:
    */
   void UpdateCursor();
 
+  void ToolChanged();
+
   /**
    * @brief Enables/disables a basic deinterlace on the viewer
    */
@@ -208,6 +211,8 @@ signals:
 
   void QueueStarved();
 
+  void CreateAddableAt(const QRectF &rect);
+
 protected:
   /**
    * @brief Override the mouse press event for the DragStarted() signal and gizmos
@@ -371,6 +376,9 @@ private:
 
   rational playback_timebase_;
 
+  QRubberBand *add_band_;
+  QPoint add_band_start_;
+
 private slots:
   void EmitColorAtCursor(QMouseEvent* e);
 
@@ -380,6 +388,7 @@ private slots:
 
   void SubtitlesChanged(const TimeRange &r);
 
+
 };
 
 }