Update Reannotate v0.4.2 > v0.4.3 (#1687)

Author: BenTalagan

Various/talagan_Reannotate.lua

@@ -1,6 +1,6 @@
 --[[
 @description Reannotate - Annotation tool for REAPER
-@version 0.4.2
+@version 0.4.3
 @author Ben 'Talagan' Babut
 @donation https://www.paypal.com/donate/?business=3YEZMY9D6U8NC&no_recurring=1&currency_code=EUR
 @license MIT
@@ -10,7 +10,12 @@
   Forum Thread https://forum.cockos.com/showthread.php?t=304147
 @metapackage
 @changelog
-  - [Feature] Can now use stickers without a text
+  - [Feature] The markdown stylesheet is now customizable
+  - [Feature] UI Font size is now customizable
+  - [Feature] Note editor's width is now remembered
+  - [Bug Fix] Tooltips with vertical scrollbars could affect the layout of other tooltips shown immediately after
+  - [Rework] Moved project notes to the transport zone instead of the time ruler (will be used for regions / markers ?)
+  - [Rework] Optimizations
 @provides
   [nomain] talagan_Reannotate/ext/**/*
   [nomain] talagan_Reannotate/classes/**/*

Various/talagan_Reannotate/classes/app_context.lua

@@ -6,9 +6,8 @@
 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 D                     = require "modules/defines"
 
 local AppContext = {}
 AppContext.__index = AppContext
@@ -65,6 +64,7 @@ function AppContext:findMainToolbarHwnd(main_hwnd, time_ruler_hwnd, tcp_hwnd)
     local _, tcp_l, tcp_t,  tcp_r,  tcp_b   = reaper.JS_Window_GetRect(tcp_hwnd)
     local _, l = reaper.JS_Window_ListAllChild(main_hwnd)
     for token in string.gmatch(l, "[^,]+") do
+---@diagnostic disable-next-line: param-type-mismatch
       local subhwnd = reaper.JS_Window_HandleFromAddress(token)
       if subhwnd then
         local _, a_l, a_t, a_r, a_b = reaper.JS_Window_GetRect(subhwnd)
@@ -88,6 +88,8 @@ function AppContext:_initialize()
   self.mv                         = { hwnd=reaper.GetMainHwnd() }
   -- Arrange view
   self.av                         = { hwnd=reaper.JS_Window_FindChildByID(self.mv.hwnd, 1000) }
+
+  self.transport                  = { hwnd=reaper.JS_Window_FindChild(reaper.GetMainHwnd(), "Transport", true) }
   -- TCP view
   self.tcp                        = { hwnd=reaper.JS_Window_FindEx(reaper.GetMainHwnd(), reaper.GetMainHwnd(), "REAPERTCPDisplay", "") }
   -- Time Ruler
@@ -122,7 +124,7 @@ function AppContext:_initialize()
   ImGui.Attach(self.imgui_ctx, self.arial_font_italic)
 
   self.enabled_category_filters = {}
-  for i=1, Notes.MAX_SLOTS do
+  for i=1, D.MAX_SLOTS do
     self.enabled_category_filters[i] = true
   end
 
@@ -210,6 +212,7 @@ function AppContext:updateWindowLayouts()
   self:retrieveCoordinates(self.main_toolbar)
   self:retrieveCoordinates(self.time_ruler)
   self:retrieveCoordinates(self.mcp_window)
+  self:retrieveCoordinates(self.transport)
 
   self.av.pinned_height = self:retrievePinnedTcpHeight()
 

Various/talagan_Reannotate/classes/color.lua

@@ -162,6 +162,14 @@ function Color:new(r_or_string_or_rgb_int,g,b,a)
     return instance
 end
 
+function Color:new_from_iargb(argb)
+  return Color:new( (argb & 0x00FF0000) >> 16, (argb & 0x0000FF00) >> 8, (argb & 0x000000FF), (argb & 0xFF000000) >> 24)
+end
+
+function Color:new_from_irgba(rgba)
+  return Color:new((rgba & 0xFF000000) >> 24, (rgba & 0x00FF0000) >> 16, (rgba & 0x0000FF00) >> 8, (rgba & 0x000000FF))
+end
+
 function Color:validateComponent(name, presence)
   local val = self[name]
 
@@ -220,6 +228,14 @@ function Color:setHsv(h,s,l)
     self.r, self.g, self.b = math.floor(r * 255 + 0.5), math.floor(g * 255 + 0.5), math.floor(b * 255 + 0.5)
 end
 
+function Color:css_rgb()
+  return string.format("#%02X%02X%02X", self.r, self.g, self.b)
+end
+
+function Color:css_argb()
+  return string.format("#%%02X02X%02X%02X", self.a, self.r, self.g, self.b)
+end
+
 function Color:to_irgb()
   return (self.r << 16) | (self.g << 8) | (self.b << 0)
 end
@@ -232,7 +248,6 @@ function Color:to_irgba()
   return (self:to_irgb() << 8) | ((self.a or 255) << 0)
 end
 
-
 function Color.irgba(str)
   return Color.parse(str):to_irgba()
 end

Various/talagan_Reannotate/classes/mem_cache.lua

@@ -0,0 +1,96 @@
+-- @noindex
+-- @author Ben 'Talagan' Babut
+-- @license MIT
+-- @description This file is part of Reannotate
+
+local Notes = require 'classes/notes'
+
+local MemCache = {}
+MemCache.__index = MemCache
+
+function MemCache:new()
+  local instance = {}
+  setmetatable(instance, self)
+  instance:_initialize()
+  return instance
+end
+
+function MemCache:_initialize()
+  self._repo = {}
+
+  MemCache.__singleton = self
+end
+
+function MemCache.GetObjectGUID(object)
+  local guid = ''
+  if reaper.ValidatePtr(object, "MediaTrack*") then
+    local tguid = reaper.GetTrackGUID(object)
+    guid = tguid
+  elseif reaper.ValidatePtr(object,"MediaItem*") then
+    local _, tguid = reaper.GetSetMediaItemInfo_String(object, "GUID", "", false)
+    guid = tguid
+  elseif reaper.ValidatePtr(object, "TrackEnvelope*") then
+    local _, tguid = reaper.GetSetEnvelopeInfo_String(object, "GUID", "", false)
+    guid = tguid
+  elseif reaper.ValidatePtr(object, "ReaProject*") then
+    local _, tguid = reaper.GetSetProjectInfo_String(object, "PROJECT_NAME", "", false)
+    guid = tguid
+  else
+    error("Unhandled type for object")
+  end
+  return guid
+end
+
+function MemCache:getObjectCache(object)
+
+  local guid = MemCache.GetObjectGUID(object)
+
+  if not self._repo[guid] then
+    -- Build object cache
+
+    local name = ''
+    local type = ''
+    if reaper.ValidatePtr(object, "MediaTrack*") then
+      local _, tname = reaper.GetTrackName(object)
+      name = tname
+      type = 'track'
+    elseif reaper.ValidatePtr(object,"MediaItem*") then
+      local take = reaper.GetActiveTake(object)
+      if take then
+        name = reaper.GetTakeName(take)
+      end
+      type = 'item'
+    elseif reaper.ValidatePtr(object, "TrackEnvelope*") then
+      local _, ename = reaper.GetEnvelopeName(object)
+      name = ename
+      type = 'env'
+    elseif reaper.ValidatePtr(object, "ReaProject*") then
+      name = "Project"
+      type = 'project'
+    else
+      error("Unhandled type for object")
+    end
+
+    -- Cache miss, pull info from object
+    self._repo[guid] = {
+      guid    = guid,
+      object  = object,
+      name    = name,
+      type    = type,
+      -- Notes cache
+      notes   = Notes:new(object)
+    }
+  end
+
+  return self._repo[guid]
+end
+
+function MemCache.instance()
+  if not MemCache.__singleton then
+    MemCache.__singleton = MemCache:new()
+  end
+
+  return MemCache.__singleton
+end
+
+return MemCache