From cfa8e87931ac6b0a67f475a4e9133d7b23f70ca8 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Mon, 23 Mar 2020 04:29:06 +0100
Subject: [PATCH] Relative-Hook: now able to push down time->pixel translation
 (see #1213)

the actual translation is still TODO;
we should delegate the calculation to the DisplayManager,
which is in focus within the TrackBody, where the coordinate
translation hook is now located.
---
 src/stage/timeline/clip-presenter.cpp  |  7 ++++---
 src/stage/timeline/clip-presenter.hpp  |  4 +++-
 src/stage/timeline/clip-widget.cpp     |  9 ++++++---
 src/stage/timeline/clip-widget.hpp     |  4 +++-
 src/stage/timeline/track-presenter.hpp | 21 ++-------------------
 5 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/stage/timeline/clip-presenter.cpp b/src/stage/timeline/clip-presenter.cpp
index 59a5b344e..d144c1b7a 100644
--- a/src/stage/timeline/clip-presenter.cpp
+++ b/src/stage/timeline/clip-presenter.cpp
@@ -68,16 +68,17 @@ namespace timeline {
    * @param identity referring to the corresponding session::Clip in Steam-Layer.
    * @param nexus a way to connect this Controller to the UI-Bus.
    * @param view (abstracted) canvas or display framework to attach this clip to
-   * @param offsetX offset relative to the start of the track       ///////////////////////////////TICKET #1213 : translation time->offset should be built into the ViewHook!!!
+   * @param startTime (optional) start time point of the clip.
+   * @note Clip can not be displayed unless startTime is given
    */
-  ClipPresenter::ClipPresenter (ID identity, ctrl::BusTerm& nexus, WidgetHook& view, optional<int> offsetX)
+  ClipPresenter::ClipPresenter (ID identity, ctrl::BusTerm& nexus, WidgetHook& view, optional<Time> startTime)
     : Controller{identity, nexus}
     , channels_{}
     , effects_{}
     , markers_{}
     , widget_{}
     {
-      ClipDelegate::buildDelegate (widget_, view, offsetX);
+      ClipDelegate::buildDelegate (widget_, view, startTime);
     }
   
   
diff --git a/src/stage/timeline/clip-presenter.hpp b/src/stage/timeline/clip-presenter.hpp
index ca6ca10e9..fb1dcc568 100644
--- a/src/stage/timeline/clip-presenter.hpp
+++ b/src/stage/timeline/clip-presenter.hpp
@@ -55,6 +55,7 @@
 #include "stage/gtk-base.hpp"
 #include "stage/model/controller.hpp"
 #include "stage/timeline/clip-widget.hpp"
+#include "lib/time/timevalue.hpp"
 
 //#include "lib/util.hpp"
 
@@ -70,6 +71,7 @@ namespace timeline {
   using std::vector;
   using std::optional;
   using std::unique_ptr;
+  using lib::time::Time;
   
   class MarkerWidget;
   
@@ -94,7 +96,7 @@ namespace timeline {
       static const ClipDelegate::Appearance defaultAppearance = ClipDelegate::COMPACT;
       
     public:
-      ClipPresenter (ID, ctrl::BusTerm&, WidgetHook&, optional<int> offsetX);
+      ClipPresenter (ID, ctrl::BusTerm&, WidgetHook&, optional<Time> startTime);
       
      ~ClipPresenter();
       
diff --git a/src/stage/timeline/clip-widget.cpp b/src/stage/timeline/clip-widget.cpp
index 6cd5be8e1..becf87c9d 100644
--- a/src/stage/timeline/clip-widget.cpp
+++ b/src/stage/timeline/clip-widget.cpp
@@ -122,12 +122,15 @@ namespace timeline {
   }
   
   ClipDelegate::Appearance
-  ClipDelegate::buildDelegate (PDelegate& manager, WidgetHook& view, optional<int> startOffsetX)   ////////////////TICKET #1213 : translation time->offset should be built into the ViewHook!!!
+  ClipDelegate::buildDelegate (PDelegate& manager, WidgetHook& view, optional<Time> startTime)
   {
-    if (startOffsetX)
-      manager.reset (new ClipWidget{view.hookedAt(*startOffsetX, defaultOffsetY), defaultName});
+    if (startTime)
+      manager.reset (new ClipWidget{view.hookedAt(*startTime, defaultOffsetY), defaultName});
     else
       manager.reset (new ClipData{view});
+    
+    return startTime? Appearance::COMPACT
+                    : Appearance::PENDING;
   }
   
   
diff --git a/src/stage/timeline/clip-widget.hpp b/src/stage/timeline/clip-widget.hpp
index f08ec0f9d..a28ffff0e 100644
--- a/src/stage/timeline/clip-widget.hpp
+++ b/src/stage/timeline/clip-widget.hpp
@@ -103,6 +103,7 @@
 
 #include "stage/gtk-base.hpp"
 #include "stage/model/canvas-hook.hpp"
+#include "lib/time/timevalue.hpp"
 
 //#include "lib/util.hpp"
 
@@ -117,6 +118,7 @@ namespace stage  {
 namespace timeline {
   
   using std::string;
+  using lib::time::Time;
   
   using WidgetHook = model::CanvasHook<Gtk::Widget>;
   
@@ -173,7 +175,7 @@ namespace timeline {
        *  viable appearance style. This is the first incantation of #switchAppearance.
        */
       static Appearance buildDelegate (PDelegate& manager, WidgetHook& view,
-                                       std::optional<int> startOffsetX);    ///////////////////////TICKET #1213 : translation time->offset should be built into the ViewHook!!!
+                                       std::optional<Time> startTime);
       
     private:/* ===== Internals ===== */
      
diff --git a/src/stage/timeline/track-presenter.hpp b/src/stage/timeline/track-presenter.hpp
index 8d7194c3f..a6ce8887d 100644
--- a/src/stage/timeline/track-presenter.hpp
+++ b/src/stage/timeline/track-presenter.hpp
@@ -126,11 +126,6 @@ namespace timeline {
   using PMark  = unique_ptr<MarkerWidget>;
   using PRuler = unique_ptr<RulerTrack>;
   
-  namespace {
-    const int TODO_px_per_second = 25;
-    const int TODO_px_per_microtick = TODO_px_per_second / Time::SCALE;
-  }
-  
   
   /**
    * Reference frame to organise the presentation related to a specific Track in the Timeline-GUI.
@@ -227,18 +222,6 @@ namespace timeline {
       
     private:/* ===== Internals ===== */
       
-      /** try to extract the start coordinates from a given Diff spec */
-      std::optional<int>
-      extractStartOffset (GenNode const& spec)
-        {
-          auto startTime = spec.retrieveAttribute<Time> (string{ATTR_start});
-          if (startTime)
-            return TODO_px_per_microtick * _raw(*startTime);   //////////////////////////////////////////////TICKET #1213 : need to abstract that away!!
-          else
-            return std::nullopt;
-        }
-      
-      
       /** invoked via diff to show a (changed) track name */
       void
       setTrackName (string name)
@@ -331,8 +314,8 @@ namespace timeline {
                   })
                .constructFrom ([&](GenNode const& spec) -> PClip
                   {
-                    std::optional<int> startOffsetX{extractStartOffset (spec)};    //////////////////////////TICKET #1213 : should pass the start time instead!!
-                    return make_unique<ClipPresenter> (spec.idi, this->uiBus_, display_.getClipHook(), startOffsetX);
+                    std::optional<Time> startTime = spec.retrieveAttribute<Time> (string{ATTR_start});
+                    return make_unique<ClipPresenter> (spec.idi, this->uiBus_, display_.getClipHook(), startTime);
                   })
                .buildChildMutator ([&](PClip& target, GenNode::ID const& subID, TreeMutator::Handle buff) -> bool
                   {