Update Reannotate v0.3.2 > v0.3.3 (#1647)

Author: BenTalagan

Various/talagan_Reannotate.lua

@@ -1,6 +1,6 @@
 --[[
 @description Reannotate - Annotation tool for REAPER
-@version 0.3.2
+@version 0.3.3
 @author Ben 'Talagan' Babut
 @donation https://www.paypal.com/donate/?business=3YEZMY9D6U8NC&no_recurring=1&currency_code=EUR
 @license MIT
@@ -10,7 +10,8 @@
   Forum Thread https://forum.cockos.com/showthread.php?t=304147
 @metapackage
 @changelog
-  - [Bug Fix] Check dependency on Markdown Library not working under windows
+  - [Bug Fix] Pinned track zone overlaps with the rest of the arrange view (thanks @smandrap !)
+  - [Bug Fixes] Fixed various bug linked to envelope visibility
 @provides
   [nomain] talagan_Reannotate/ext/**/*
   [nomain] talagan_Reannotate/classes/**/*
@@ -31,4 +32,6 @@
   You can consult the forum thread for more info.
 
   Please note that this tool is very young and may contain bugs.
+
+  Special thanks to Christian Fillion for the infallible support on ReaImGui, and Arkadata for the continuous and precious feedback and comments during the dev !
 --]]

Various/talagan_Reannotate/classes/app_context.lua

@@ -6,9 +6,11 @@
 local LaunchContext         = require "classes/launch_context"
 local ArrangeViewWatcher    = require "classes/arrange_view_watcher"
 local ImGui                 = require "ext/imgui"
-
 local Notes                 = require "classes/notes"
 
+local reaper_ext            = require "modules/reaper_ext"
+
+
 local AppContext = {}
 AppContext.__index = AppContext
 
@@ -104,6 +106,51 @@ function AppContext:retrieveCoordinates(sub, scrollbar_w, scrollbar_h)
 
 end
 
+function AppContext:retrievePinnedTcpHeight()
+  -- Loop on all tracks
+  local track_count = reaper.CountTracks(0)
+
+  local bypos   = nil
+  local btrack  = nil
+
+  -- Among the visible pinned tracks, find the bottomost
+  for i = -1, track_count - 1 do
+    local track = (i==-1) and reaper.GetMasterTrack(0) or reaper.GetTrack(0, i)
+
+    if reaper_ext.IsTrackPinned(track) and reaper_ext.IsTrackVisibleInTcp(track, i == -1) then
+      local typos = reaper.GetMediaTrackInfo_Value(track, "I_TCPY")
+      if bypos == nil or typos > bypos then
+        bypos   = typos
+        btrack  = track
+      end
+    end
+  end
+
+  if not btrack then return 0 end
+
+  local ph  = bypos + reaper.GetMediaTrackInfo_Value(btrack, "I_TCPH")
+
+  local ei = 0
+  while true do
+    local envelope = reaper.GetTrackEnvelope(btrack, ei)
+    if not envelope then break end
+
+    if reaper_ext.IsEnvelopeVisible(envelope) then
+      local env_height  = reaper.GetEnvelopeInfo_Value(envelope, "I_TCPH")
+      ph = ph + env_height
+    end
+
+    ei = ei + 1
+  end
+
+  if ph > 0 then
+    -- Add extra space for resizing grip
+    ph = ph + 10
+  end
+
+  return ph
+end
+
 function AppContext:updateWindowLayouts()
 
   self:retrieveCoordinates(self.av, 16, 16)
@@ -114,6 +161,8 @@ function AppContext:updateWindowLayouts()
   self:retrieveCoordinates(self.main_toolbar)
   self:retrieveCoordinates(self.time_ruler)
 
+  self.av.pinned_height = self:retrievePinnedTcpHeight()
+
   self.av.start_time, self.av.end_time  = reaper.GetSet_ArrangeView2(0, false, 0, 0)
 end
 

Various/talagan_Reannotate/modules/reaper_ext.lua

@@ -0,0 +1,34 @@
+-- @noindex
+-- @author Ben 'Talagan' Babut
+-- @license MIT
+-- @description This file is part of Reannotate
+
+local function IsEnvelopeVisible(envelope)
+  local _, env_vis = reaper.GetSetEnvelopeInfo_String(envelope, "VISIBLE", "", false)
+  return env_vis == "1"
+end
+
+local function IsTrackVisibleInTcp(track, is_master)
+  if is_master then
+    return (reaper.GetMasterTrackVisibility() & 1 ~= 0)
+  end
+  return (reaper.IsTrackVisible(track, false))
+end
+
+local function IsTrackVisibleInMcp(track, is_master)
+  if is_master then
+    return (reaper.GetMasterTrackVisibility() & 2 == 0)
+  end
+  return (reaper.IsTrackVisible(track, true))
+end
+
+local function IsTrackPinned(track)
+  return reaper.GetMediaTrackInfo_Value(track, "B_TCPPIN") == 1
+end
+
+return {
+    IsEnvelopeVisible       = IsEnvelopeVisible,
+    IsTrackPinned           = IsTrackPinned,
+    IsTrackVisibleInTcp     = IsTrackVisibleInTcp,
+    IsTrackVisibleInMcp     = IsTrackVisibleInMcp
+}

Various/talagan_Reannotate/widgets/quick_preview_overlay.lua

@@ -9,8 +9,10 @@ local ImGuiMd           = require "reaimgui_markdown"
 local Notes             = require "classes/notes"
 local NoteEditor        = require "widgets/note_editor"
 local SettingsEditor    = require "widgets/settings_editor"
+local S                 = require "modules/settings"
+
+local reaper_ext        = require "modules/reaper_ext"
 
-local S = require "modules/settings"
 
 local OS                            = reaper.GetOS()
 local is_windows                    = OS:match('Win')
@@ -152,7 +154,7 @@ function QuickPreviewOverlay:updateVisibleThings()
     -- Get total number of tracks
     local track_count = reaper.CountTracks(0)
 
-    local function block_clamp(minx,miny,w,h, limitx, limity)
+    local function block_clamp(minx, miny, w, h, limitx, limity, low_limit_y)
         local maxx = minx + w
         local maxy = miny + h
 
@@ -167,8 +169,10 @@ function QuickPreviewOverlay:updateVisibleThings()
             clamped_right = true
         end
 
-        if miny < 0 then miny = 0 end
-        if maxy > limity then maxy = limity end
+        low_limit_y = low_limit_y or 0
+
+        if miny < low_limit_y   then miny = low_limit_y end
+        if maxy > limity        then maxy = limity      end
 
         w = maxx - minx
         h = maxy - miny
@@ -178,57 +182,58 @@ function QuickPreviewOverlay:updateVisibleThings()
 
     -- Iterate through tracks
     for i = -1, track_count - 1 do
-        local track = (i==-1) and reaper.GetMasterTrack(0) or reaper.GetTrack(0, i)
-
-        local _, tname      = reaper.GetTrackName(track)
-        local track_height  = reaper.GetMediaTrackInfo_Value(track, "I_TCPH")
-        local track_top     = reaper.GetMediaTrackInfo_Value(track, "I_TCPY")
-        local track_bottom  = track_top + track_height
-        local tcp_entry     = nil
+        local is_master         = (i==-1)
+        local track             = is_master and reaper.GetMasterTrack(0) or reaper.GetTrack(0, i)
+        local _, tname          = reaper.GetTrackName(track)
+        local track_height      = reaper.GetMediaTrackInfo_Value(track, "I_TCPH")
+        local track_top         = reaper.GetMediaTrackInfo_Value(track, "I_TCPY")
+        local track_bottom      = track_top + track_height
+        local track_is_pinned   = reaper_ext.IsTrackPinned(track)
+        local hlimit            = track_is_pinned and 0 or avi.pinned_height
+        local tcp_entry         = nil
+
+        local track_is_visible_in_tcp = reaper_ext.IsTrackVisibleInTcp(track, is_master)
 
         -- Loop on track envelopes
-        local ei = 0
-        while true do
-            local envelope = reaper.GetTrackEnvelope(track, ei)
-            if not envelope then break end
-
-            local env_vis     = reaper.GetSetEnvelopeInfo_String(envelope, "VISIBLE", "", false)
-            if env_vis then
-                local env_top     = reaper.GetEnvelopeInfo_Value(envelope, "I_TCPY") + track_top
-                local env_height  = reaper.GetEnvelopeInfo_Value(envelope, "I_TCPH")
-                local env_bottom  = env_top + env_height
-                local tcp_entry     = nil
-
-                if env_height > 0 and ((env_top >= 0 and env_top <= avi.h) or (env_bottom >= 0 and env_bottom <= avi.h)) then
-
-                    local pos_x_pixels = 0
-                    local len_x_pixels = tcp.w
-                    local pos_y_pixels, len_y_pixels = env_top, env_height
-                    local clamped_left, clamped_right = false, false
+        if track_is_visible_in_tcp then
+            local ei = 0
+            while true do
+                local envelope = reaper.GetTrackEnvelope(track, ei)
+                if not envelope then break end
+
+                if reaper_ext.IsEnvelopeVisible(envelope) then
+                    local env_top     = reaper.GetEnvelopeInfo_Value(envelope, "I_TCPY") + track_top
+                    local env_height  = reaper.GetEnvelopeInfo_Value(envelope, "I_TCPH")
+                    local env_bottom  = env_top + env_height
+
+                    if env_height > 0 and ((env_top >= hlimit and env_top <= avi.h) or (env_bottom >= hlimit and env_bottom <= avi.h)) then
 
-                    pos_x_pixels, pos_y_pixels, len_x_pixels, len_y_pixels, clamped_left, clamped_right = block_clamp(pos_x_pixels, pos_y_pixels, len_x_pixels, len_y_pixels, tcp.w, tcp.h)
+                        local pos_x_pixels = 0
+                        local len_x_pixels = tcp.w
+                        local pos_y_pixels, len_y_pixels = env_top, env_height
+                        local clamped_left, clamped_right = false, false
 
-                    local env_entry = self:buildEditContextForThing(envelope, "env", i, "tcp", pos_x_pixels, pos_y_pixels, len_x_pixels, len_y_pixels, clamped_left, clamped_right)
+                        pos_x_pixels, pos_y_pixels, len_x_pixels, len_y_pixels, clamped_left, clamped_right = block_clamp(pos_x_pixels, pos_y_pixels, len_x_pixels, len_y_pixels, tcp.w, tcp.h, hlimit)
 
-                    table.insert(self.visible_things, env_entry)
+                        local env_entry = self:buildEditContextForThing(envelope, "env", i, "tcp", pos_x_pixels, pos_y_pixels, len_x_pixels, len_y_pixels, clamped_left, clamped_right)
+
+                        table.insert(self.visible_things, env_entry)
+                    end
                 end
-            end
 
-            ei = ei + 1
+                ei = ei + 1
+            end
         end
 
-        local track_is_visible_in_tcp = false
-        if (i==-1) then track_is_visible_in_tcp = (reaper.GetMasterTrackVisibility() & 1 ~= 0) else track_is_visible_in_tcp = (reaper.IsTrackVisible(track, false)) end
-
         -- Loop on items. Process item only if visible.
-        if track_height > 0 and ((track_top >= 0 and track_top <= avi.h) or (track_bottom >= 0 and track_bottom <= avi.h)) and track_is_visible_in_tcp then
+        if track_is_visible_in_tcp and track_height > 0 and ((track_top >= hlimit and track_top <= avi.h) or (track_bottom >= hlimit and track_bottom <= avi.h)) then
 
             local pos_x_pixels = 0
             local len_x_pixels = tcp.w
             local pos_y_pixels, len_y_pixels = track_top, track_height
             local clamped_left, clamped_right = false, false
 
-            pos_x_pixels, pos_y_pixels, len_x_pixels, len_y_pixels, clamped_left, clamped_right = block_clamp(pos_x_pixels, pos_y_pixels, len_x_pixels, len_y_pixels, tcp.w, tcp.h)
+            pos_x_pixels, pos_y_pixels, len_x_pixels, len_y_pixels, clamped_left, clamped_right = block_clamp(pos_x_pixels, pos_y_pixels, len_x_pixels, len_y_pixels, tcp.w, tcp.h, hlimit)
 
             tcp_entry = self:buildEditContextForThing(track, "track", i, "tcp", pos_x_pixels, pos_y_pixels, len_x_pixels, len_y_pixels, clamped_left, clamped_right)
 
@@ -256,19 +261,18 @@ function QuickPreviewOverlay:updateVisibleThings()
                     local pos_y_pixels, len_y_pixels = self:getItemYBounds(track, item)
                     local clamped_left, clamped_right = false, false
 
-                    pos_x_pixels, pos_y_pixels, len_x_pixels, len_y_pixels, clamped_left, clamped_right = block_clamp(pos_x_pixels, pos_y_pixels, len_x_pixels, len_y_pixels, avi.w, avi.h)
+                    pos_x_pixels, pos_y_pixels, len_x_pixels, len_y_pixels, clamped_left, clamped_right = block_clamp(pos_x_pixels, pos_y_pixels, len_x_pixels, len_y_pixels, avi.w, avi.h, hlimit)
 
                     table.insert(self.visible_things, self:buildEditContextForThing(item, "item", i, "arrange", pos_x_pixels, pos_y_pixels, len_x_pixels, len_y_pixels, clamped_left, clamped_right))
                 end
             end
         end
 
-        local track_is_visible_in_mcp = false
-        if (i==-1) then track_is_visible_in_mcp = (reaper.GetMasterTrackVisibility() & 2 == 0) else track_is_visible_in_mcp = (reaper.IsTrackVisible(track, true)) end
+        local track_is_visible_in_mcp = reaper_ext.IsTrackVisibleInMcp(track, is_master)
 
         -- Handle track in mcp
         local mcp = (i==-1) and app_ctx.mcp_master or app_ctx.mcp_other
-        if mcp.hwnd and reaper.JS_Window_IsVisible(mcp.hwnd)  and track_is_visible_in_mcp then
+        if track_is_visible_in_mcp and mcp.hwnd and reaper.JS_Window_IsVisible(mcp.hwnd) then
 
             local mcp_track_left                = reaper.GetMediaTrackInfo_Value(track, "I_MCPX")
             local mcp_track_width               = reaper.GetMediaTrackInfo_Value(track, "I_MCPW")