Squashed commit of the following:

commit 8619bb044081da81b4eef238d138bd051e678a4c Merge: 1a767e0c2 1c30c4d36 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun Mar 27 23:59:10 2022 -0700 Merge branch 'master' into gizmo-rework commit 1a767e0c2279cac3baf96a9028c1b78ec0491e00 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun Mar 27 17:23:07 2022 -0700 implement custom html parser/exporter commit bbd9361d345ce864d198f4340b3d59f526e642e5 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed Mar 9 22:27:17 2022 -0800 textgizmo: further improved behavior commit 27634d5d377f03cab009bca418765d73764893f2 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed Mar 9 22:26:19 2022 -0800 textgizmo: improved double click behavior commit 0897ebfa36e676461c7a47305a3c1bf66e7a9fd1 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed Mar 9 10:20:57 2022 -0800 text: added more features and improvements commit 9d6446a25d977ea0c66e5f5c69239aed0e92fe83 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed Mar 9 10:14:59 2022 -0800 text: don't create color input commit d1d3b9d46e74d8197ba3485a8e965068eb245166 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed Mar 9 09:10:23 2022 -0800 text: convert to reference space commit 3ba1565129a0bdd74b860b1869fec5ef30025abb Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon Mar 7 17:57:26 2022 -0800 finally got scaling to work holy shit I never thought it'd be this easy commit 081368cfac9b49a171db6c1d576e134903dffac0 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon Mar 7 11:25:58 2022 -0800 improved text behavior commit f3eda52eee29b7cd354d7d90b3ae1a819e1b1cf2 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon Mar 7 11:08:31 2022 -0800 implemented font styles (weights and italics) commit 0898b613ec9b473ac93996536d00541e0a2a3f74 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon Mar 7 01:26:13 2022 -0800 implemented beginnings of text gizmo commit bffb8ede2d425e7391d16bc03e613d4d90367add Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun Mar 6 17:55:03 2022 -0800 conformed transform node to new gizmos commit 1a1f86fa9bec9ea6b67f77032748c04b6b4c95fd Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat Mar 5 11:16:34 2022 -0800 update polygon node commit 2388dd69164e8c57e0a1d221c7680a0d39173c2c Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Fri Mar 4 15:31:39 2022 -0800 implement glsl hack for corner pin commit e96df6cb326fb278cc6555890ff0ac1d37ebf4bf Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Thu Mar 3 17:06:14 2022 -0800 updated corner pin commit c70aa0e72d4e83045c84259294608c1380e8929b Merge: 5afed6383 780342881 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Thu Mar 3 17:04:40 2022 -0800 Merge branch 'master' into gizmo-rework commit 5afed6383952d7d936b5eeda2556339c854610af Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Thu Mar 3 16:55:57 2022 -0800 use float points for more precise math commit 159ade0d2812d556dee57f99e3f733ef1e838d01 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Thu Mar 3 16:55:40 2022 -0800 ported shape node commit 28f9500d7bc6cd2661ee9ea591db7b3f8d583196 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Thu Mar 3 15:50:19 2022 -0800 implemented enough dragging code to reimplement crop Requires far less boiler-plate code per node commit 5aeaa59227ad2f1dc3c7f499c636de843a262a88 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed Mar 2 19:45:04 2022 -0800 update just merged corner pin for new gizmos commit 8a2d041650d1b873c6d87664564ebcdf92a3760f Merge: c916e8e08 f5b4729a1 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed Mar 2 19:38:36 2022 -0800 Merge branch 'master' into gizmo-rework commit c916e8e08016c1d0b72d85087db76e4137587d52 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed Mar 2 19:35:09 2022 -0800 gizmos: rewrote drawing into standard routines Work towards a far more maintainable gizmo system
2022-03-28 00:01:48 -07:00
parent 1c30c4d361
commit 16580841a6
61 changed files with 3257 additions and 1015 deletions
@@ -21,6 +21,8 @@
 #include "viewerdisplay.h"

 #include <OpenImageIO/imagebuf.h>
+#include <QAbstractTextDocumentLayout>
+#include <QApplication>
 #include <QFileInfo>
 #include <QMessageBox>
 #include <QMouseEvent>
@@ -28,12 +30,23 @@
 #include <QOpenGLFunctions>
 #include <QOpenGLTexture>
 #include <QPainter>
+#include <QPushButton>
+#include <QScreen>
+#include <QTextEdit>

 #include "common/define.h"
 #include "common/functiontimer.h"
+#include "common/html.h"
 #include "config/config.h"
 #include "core.h"
+#include "node/gizmo/path.h"
+#include "node/gizmo/point.h"
+#include "node/gizmo/polygon.h"
+#include "node/gizmo/screen.h"
+#include "node/gizmo/text.h"
 #include "node/traverser.h"
+#include "viewertexteditor.h"
+#include "window/mainwindow/mainwindow.h"

 namespace olive {

@@ -44,7 +57,8 @@ ViewerDisplayWidget::ViewerDisplayWidget(QWidget *parent) :
  deinterlace_texture_(nullptr),
  signal_cursor_color_(false),
  gizmos_(nullptr),
-  gizmo_click_(false),
+  current_gizmo_(nullptr),
+  gizmo_drag_started_(false),
  hand_dragging_(false),
  deinterlace_(false),
  show_fps_(false),
@@ -175,7 +189,7 @@ void ViewerDisplayWidget::SetTime(const rational &time)
  }
 }

-QPoint ViewerDisplayWidget::TransformViewerSpaceToBufferSpace(QPoint pos)
+QPointF ViewerDisplayWidget::TransformViewerSpaceToBufferSpace(const QPointF &pos)
 {
  /*
  * Inversion will only fail if the viewer has been scaled by 0 in any direction
@@ -204,12 +218,12 @@ void ViewerDisplayWidget::IncrementSkippedFrames()
 void ViewerDisplayWidget::mousePressEvent(QMouseEvent *event)
 {
  if (event->button() == Qt::LeftButton && gizmos_
-      && gizmos_->GizmoPress(gizmo_db_, NodeTraverser::GenerateGlobals(gizmo_params_, GenerateGizmoTime()), TransformViewerSpaceToBufferSpace(event->pos()))) {
+      && (current_gizmo_ = TryGizmoPress(gizmo_db_, TransformViewerSpaceToBufferSpace(event->pos())))) {

    // Handle gizmo click
-    gizmo_click_ = true;
-    gizmo_drag_time_ = GetGizmoTime();
    gizmo_start_drag_ = event->pos();
+    gizmo_last_drag_ = gizmo_start_drag_;
+    current_gizmo_->SetGlobals(NodeTraverser::GenerateGlobals(gizmo_params_, GenerateGizmoTime()));

  } else if (IsHandDrag(event)) {

@@ -242,14 +256,38 @@ void ViewerDisplayWidget::mouseMoveEvent(QMouseEvent *event)

    hand_last_drag_pos_ = event->pos();

-  } else if (gizmo_click_) {
+  } else if (current_gizmo_) {

    // Signal movement
-    gizmos_->GizmoMove(TransformViewerSpaceToBufferSpace(event->pos()),
-                       gizmo_drag_time_,
-                       event->modifiers());
-    gizmo_start_drag_ = event->pos();
-    update();
+    if (DraggableGizmo *draggable = dynamic_cast<DraggableGizmo*>(current_gizmo_)) {
+      if (!gizmo_drag_started_) {
+        QPointF start = TransformViewerSpaceToBufferSpace(gizmo_start_drag_);
+
+        rational gizmo_time = GetGizmoTime();
+        NodeTraverser t;
+        t.SetCacheVideoParams(gizmo_params_);
+        NodeValueRow row = t.GenerateRow(gizmos_, TimeRange(gizmo_time, gizmo_time + gizmo_params_.frame_rate_as_time_base()));
+
+        draggable->DragStart(row, start.x(), start.y(), gizmo_time);
+        gizmo_drag_started_ = true;
+      }
+
+      QPointF v = TransformViewerSpaceToBufferSpace(event->pos());
+      switch (draggable->GetDragValueBehavior()) {
+      case DraggableGizmo::kAbsolute:
+        // Above value is correct
+        break;
+      case DraggableGizmo::kDeltaFromPrevious:
+        v -= TransformViewerSpaceToBufferSpace(gizmo_last_drag_);
+        gizmo_last_drag_ = event->pos();
+        break;
+      case DraggableGizmo::kDeltaFromStart:
+        v -= TransformViewerSpaceToBufferSpace(gizmo_start_drag_);
+        break;
+      }
+
+      draggable->DragMove(v.x(), v.y(), event->modifiers());
+    }

  } else {

@@ -268,13 +306,18 @@ void ViewerDisplayWidget::mouseReleaseEvent(QMouseEvent *event)
    hand_dragging_ = false;
    UpdateCursor();

-  } else if (gizmo_click_) {
+  } else if (current_gizmo_) {

    // Handle gizmo
-    MultiUndoCommand *command = new MultiUndoCommand();
-    gizmos_->GizmoRelease(command);
-    Core::instance()->undo_stack()->pushIfHasChildren(command);
-    gizmo_click_ = false;
+    if (gizmo_drag_started_) {
+      MultiUndoCommand *command = new MultiUndoCommand();
+      if (DraggableGizmo *draggable = dynamic_cast<DraggableGizmo*>(current_gizmo_)) {
+        draggable->DragEnd(command);
+      }
+      Core::instance()->undo_stack()->pushIfHasChildren(command);
+      gizmo_drag_started_ = false;
+    }
+    current_gizmo_ = nullptr;

  } else {

@@ -284,6 +327,65 @@ void ViewerDisplayWidget::mouseReleaseEvent(QMouseEvent *event)
  }
 }

+void ViewerDisplayWidget::mouseDoubleClickEvent(QMouseEvent *event)
+{
+  if (event->button() == Qt::LeftButton && gizmos_) {
+    QPointF ptr = TransformViewerSpaceToBufferSpace(event->pos());
+    foreach (NodeGizmo *g, gizmos_->GetGizmos()) {
+      if (TextGizmo *text = dynamic_cast<TextGizmo*>(g)) {
+        if (text->GetRect().contains(ptr)) {
+          QTransform gizmo_transform = GenerateGizmoTransform();
+
+          ViewerTextEditor *text_edit = new ViewerTextEditor(gizmo_transform.m11(), this);
+          Html::HtmlToDoc(text_edit->document(), text->GetHtml());
+          text_edit->setProperty("gizmo", reinterpret_cast<quintptr>(text));
+
+          QRectF transformed_geom = gizmo_transform.map(text->GetRect()).boundingRect();
+          text_edit->setGeometry(transformed_geom.toRect());
+
+          ViewerTextEditorToolBar *toolbar = new ViewerTextEditorToolBar(this);
+          toolbar->setWindowFlags(Qt::FramelessWindowHint | Qt::Window | Qt::WindowStaysOnTopHint);
+          toolbar->resize(toolbar->sizeHint());
+
+          QPoint pos = mapToGlobal(QPoint(transformed_geom.x(), transformed_geom.y() - toolbar->height()));
+          for (QScreen *screen : qApp->screens()) {
+            if (screen->geometry().contains(pos)) {
+              if (pos.x() + toolbar->width() > screen->geometry().right()) {
+                pos.setX(screen->geometry().right() - toolbar->width());
+              }
+              break;
+            }
+          }
+          toolbar->move(pos);
+          toolbar->show();
+
+          text_edit->show();
+
+          connect(text_edit, &ViewerTextEditor::textChanged, this, &ViewerDisplayWidget::TextEditChanged);
+
+          text_edit->ConnectToolBar(toolbar);
+
+          QPoint text_edit_pos = text_edit->mapFrom(this, event->pos());
+
+          // Ensure text edit is actually focused rather than the toolbar
+          connect(toolbar, &ViewerTextEditorToolBar::FirstPaint, this, [this, text_edit, text_edit_pos]{
+            // Grab focus back from the toolbar
+            this->raise();
+            this->activateWindow();
+            text_edit->setFocus();
+
+            // Start text cursor where the user clicked
+            text_edit->setTextCursor(text_edit->cursorForPosition(text_edit_pos));
+          });
+          break;
+        }
+      }
+    }
+  }
+
+  super::mouseDoubleClickEvent(event);
+}
+
 void ViewerDisplayWidget::dragEnterEvent(QDragEnterEvent *event)
 {
  emit DragEntered(event);
@@ -396,7 +498,11 @@ void ViewerDisplayWidget::OnPaint()

    QPainter p(inner_widget());
    p.setWorldTransform(GenerateGizmoTransform());
-    gizmos_->DrawGizmos(gizmo_db_, NodeTraverser::GenerateGlobals(gizmo_params_, range), &p);
+
+    gizmos_->UpdateGizmoPositions(gizmo_db_, NodeTraverser::GenerateGlobals(gizmo_params_, range));
+    foreach (NodeGizmo *gizmo, gizmos_->GetGizmos()) {
+      gizmo->Draw(&p);
+    }
  }

  // Draw action/title safe areas
@@ -563,6 +669,31 @@ QTransform ViewerDisplayWidget::GenerateGizmoTransform()
  return gizmo_transform;
 }

+NodeGizmo *ViewerDisplayWidget::TryGizmoPress(const NodeValueRow &row, const QPointF &p)
+{
+  for (auto it=gizmos_->GetGizmos().crbegin(); it!=gizmos_->GetGizmos().crend(); it++) {
+    NodeGizmo *gizmo = *it;
+    if (PointGizmo *point = dynamic_cast<PointGizmo*>(gizmo)) {
+      if (point->GetClickingRect(GenerateGizmoTransform()).contains(p)) {
+        return point;
+      }
+    } else if (PolygonGizmo *poly = dynamic_cast<PolygonGizmo*>(gizmo)) {
+      if (poly->GetPolygon().containsPoint(p, Qt::OddEvenFill)) {
+        return poly;
+      }
+    } else if (PathGizmo *path = dynamic_cast<PathGizmo*>(gizmo)) {
+      if (path->GetPath().contains(p)) {
+        return path;
+      }
+    } else if (ScreenGizmo *screen = dynamic_cast<ScreenGizmo*>(gizmo)) {
+      // NOTE: Perhaps this should limit to the actual visible screen space? We'll see.
+      return screen;
+    }
+  }
+
+  return nullptr;
+}
+
 void ViewerDisplayWidget::EmitColorAtCursor(QMouseEvent *e)
 {
  // Do this no matter what, emits signal to any pixel samplers
@@ -657,4 +788,14 @@ void ViewerDisplayWidget::UpdateFromQueue()
  update();
 }

+void ViewerDisplayWidget::TextEditChanged()
+{
+  ViewerTextEditor *editor = static_cast<ViewerTextEditor *>(sender());
+
+  TextGizmo *gizmo = reinterpret_cast<TextGizmo*>(editor->property("gizmo").value<quintptr>());
+
+  QString html = Html::DocToHtml(editor->document());
+  gizmo->UpdateInputHtml(html, GetGizmoTime());
+}
+
 }