Draft x-browsing

Author: eelstork

Editor/Core/UI/LogWindow-DebugChan.cs

@@ -14,8 +14,15 @@ public void OnGenericMessage(string message, object sender, int messageCount){
         }
     }
 
-    void DrawLoggerTextView()
-        => DrawTextView(EvalTextContent(), ref dc_scroll);
+    void DrawLoggerTextView(){
+        string content;
+        if(browsing){
+            content = model.dcRange.Format();
+        }else{
+            content = EvalTextContent();
+        }
+        DrawTextView(content, ref dc_scroll);
+    }
 
     string EvalTextContent(){
         var logger = (Activ.Loggr.Logger<string, object>) DebugChan.logger;

Editor/Core/UI/LogWindow-Prolog.cs

@@ -38,7 +38,7 @@ void DrawPrologTextView(){
         string log = model.Output(useHistory, rtypeOptions[Config.rtypeIndex]);
         if(currentLog != log && Config.step) Ed.isPaused = true;
         currentLog = log;
-        DrawTextView(log, ref p_scroll);
+        DrawTextView(browsing ? model.pgRange.Format() : log, ref p_scroll);
     }
 
     void DrawConfigSelector(){

Editor/Core/UI/LogWindow.cs

@@ -26,7 +26,7 @@ public partial class LogWindow : EditorWindow{
     LogWindow(){
         Ed.pauseStateChanged +=
             (PauseState s) => { if(s == PauseState.Paused) Repaint(); };
-        Activ.Loggr.Logger<string, object>.messageReceived += OnGenericMessage;
+        Activ.Loggr.Logger<string, object>.onMessage += OnGenericMessage;
     }
 
     void OnFocus(){
@@ -95,10 +95,7 @@ void DrawTextView(string text, ref Vector2 scroll){
         scroll = BeginScrollView(scroll);
         GUI.backgroundColor = Color.black;
         ConfigTextAreaStyle();
-        // TODO this is injecting prolog data into debug chan out
-        // when browsing
-        GL.TextArea(browsing ? model.selectedFrame.Format() : text,
-                           GL.ExpandHeight(true));
+        GL.TextArea(text, GL.ExpandHeight(true));
         EndScrollView();
         GUI.backgroundColor = Color.white;
     }
@@ -116,7 +113,10 @@ void ConfigTextAreaStyle(){
 
     void DrawScrubber(){
         BeginHorizontal();
-        int frameNo = browsing ? model.selectedFrame.index : Time.frameCount;
+        int frameNo = Time.frameCount;
+        if(browsing){
+            frameNo = model.currentFrame ?? frameNo;
+        }
         var style = GUI.skin.button;
         normalButtonFont = style.font;
         style.font = monofont;
@@ -141,12 +141,12 @@ void ToggleAdvanced(){}
     // Ref https://tinyurl.com/yyo8c35g which also demonstrates starting a 2D
     // GUI at handles location
     void OnSceneGUI(SceneView sceneView){
-        var sel = PrologHistoryGUI.Draw(model.filtered, model.selectedFrame);
+        var sel = PrologHistoryGUI.Draw(model.filtered, model.pgRange);
         if(Ed.isPaused || !isPlaying){
-            model.selectedFrame = sel ?? model.selectedFrame;
+            model.pgRange = sel ?? model.pgRange;
             Repaint();
         }else{
-            model.selectedFrame = null;
+            model.pgRange = null;
         }
     }
 
@@ -161,13 +161,12 @@ void Clear(){
     }
 
     void SelectPrev(){
-        model.selectedFrame = model.Prev(model.selectedFrame);
+        model.Prev();
         SceneView.RepaintAll();
     }
 
     void SelectNext(){
-        if(model.selectedFrame == null) return;
-        model.selectedFrame = model.Next(model.selectedFrame);
+        model.Next();
         SceneView.RepaintAll();
     }
 
@@ -188,7 +187,7 @@ static Font monofont{ get{
     }}
 
     bool browsing
-    => (Ed.isPaused || !isPlaying) && model.selectedFrame != null;
+    => (Ed.isPaused || !isPlaying) && model.pgRange != null;
 
     static bool isPlaying => Application.isPlaying;
 

Editor/Core/UI/LogWindowModel.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using Activ.Loggr;
+using Ints = Activ.Loggr.IntExt;
 using PrologHistory = Activ.Prolog.History;
 using PrologFrame = Activ.Prolog.Frame;
 using PrologFilter = Activ.Prolog.Filter;
@@ -10,9 +11,11 @@ namespace Activ.Loggr.UI{
 public class LogWindowModel{
 
     public GameObject current;
+    public int? currentFrame;
     public PrologHistory filtered{ get; private set; }
     PrologFilter filter;
-    public PrologFrame selectedFrame;   // Last selected frame object
+    public PrologFrame   pgRange;  // selected prolog range
+    public Range<string> dcRange;  // selected debug-chan range
 
     public LogWindowModel(){
         PrologLogger.onFrame += OnPrologFrame;
@@ -21,15 +24,35 @@ public LogWindowModel(){
     public void Clear(){
         filtered = null;
         current = null;
-        selectedFrame = null;
+        pgRange = null;
+        dcRange = null;
     }
 
-    public PrologFrame Next(PrologFrame current){
-        return filtered.Next(current);
+    public void Next(){
+        int? index = Ints.Min(
+            filtered.FirstStopAfter(currentFrame, current),
+            DebugChan.logger.FirstStopAfter(currentFrame, current)
+        );
+        SetCurrentFrame(index);
     }
 
-    public PrologFrame Prev(PrologFrame current){
-        return filtered.Prev(current ?? filtered.last);
+    public void Prev(){
+        int? index = Ints.Max(
+            filtered.LastStopBefore(currentFrame, current),
+            DebugChan.logger.LastStopBefore(currentFrame, current)
+        );
+        SetCurrentFrame(index);
+    }
+
+    public void SetCurrentFrame(int? frameIndex){
+        if(frameIndex.HasValue){
+            var i = frameIndex.Value;
+            pgRange = filtered.At(i);
+            dcRange = DebugChan.logger.At(i, current);
+        }else{
+            pgRange = null;
+            dcRange = null;
+        }
     }
 
     public string Output(bool useHistory, string rtype){

Editor/Prolog/Model/History.cs

@@ -22,6 +22,33 @@ public History(Filter filter){
         foreach(var frame in Logger.frames){ var self = this + frame; }
     }
 
+    public Frame At(int φ){
+        foreach(var range in frames){
+            if(range.index >= φ) return range;
+        }
+        return null;
+    }
+
+    // TODO support for selection here is... quirky?
+    public int? FirstStopAfter(int? frameIndex, object src){
+        if(!frameIndex.HasValue) return null;
+        var i = frameIndex.Value;
+        foreach(var range in frames){
+            if(range.index > i) return range.index;
+        }
+        return null;
+    }
+
+    // TODO support for selection here is... quirky?
+    public int? LastStopBefore(int? frameIndex, object src){
+        if(!frameIndex.HasValue) return null;
+        var i = frameIndex.Value;
+        for(int k = frames.Count; k >= 0; k --){
+            if(frames[k].index < i) return frames[k].index;
+        }
+        return null;
+    }
+
     public bool empty => !this == 0;
 
     public Frame last{

Runtime/Core/IntExt.cs

@@ -0,0 +1,16 @@
+namespace Activ.Loggr{
+public static class IntExt{
+
+    public static int? Min(int? a, int? b){
+        if(a == null) return b;
+        if(b == null) return a;
+        return a < b ? a : b;
+    }
+
+    public static int? Max(int? a, int? b){
+        if(a == null) return b;
+        if(b == null) return a;
+        return a > b ? a : b;
+    }
+
+}}

Runtime/Core/IntExt.cs.meta

@@ -9,6 +9,31 @@ public class Log<T>{
     public Frame<T> current { get; private set; }
     List<Range<T>> ranges = new List<Range<T>>();
 
+    public Range<T> At(int φ){
+        foreach(var range in ranges){
+            if(range.start.frame >= φ) return range;
+        }
+        return null;
+    }
+
+    public int? FirstStopAfter(int? frameIndex){
+        if(!frameIndex.HasValue) return null;
+        var i = frameIndex.Value;
+        foreach(var range in ranges){
+            if(range.start.frame > i) return range.start.frame;
+        }
+        return null;
+    }
+
+    public int? LastStopBefore(int? frameIndex){
+        if(!frameIndex.HasValue) return null;
+        var i = frameIndex.Value;
+        for(int k = ranges.Count; k >= 0; k --){
+            if(ranges[k].start.frame < i) return ranges[k].start.frame;
+        }
+        return null;
+    }
+
     public void LogMessage(T message, out int overhead){
         var time = new Stamp(Time.frameCount, Time.time);
         if(current == null){

Runtime/Core/Log.cs

@@ -2,20 +2,38 @@
 using UnityEngine;
 
 namespace Activ.Loggr{
-public class Logger<T, S>{
+public class Logger<T, S> where S : class{
 
-    public static event MessageEventHandler messageReceived;
+    public static event MessageEventHandler onMessage;
 
     Dictionary<S, Log<T>> logs = new Dictionary<S, Log<T>>();
     public int messageCount{ get; private set; }
 
+    public Range<T> At(int φ, object src){
+        S σ = (src as S);
+        if(σ == null) return null;  // TODO breaks browsing all
+        return this[σ].At(φ);
+    }
+
+    public int? FirstStopAfter(int? frameIndex, object src){
+        S σ = (src as S);
+        if(σ == null) return null;  // TODO breaks browsing all
+        return this[σ].FirstStopAfter(frameIndex);
+    }
+
+    public int? LastStopBefore(int? frameIndex, object src){
+        S σ = (src as S);
+        if(σ == null) return null;  // TODO breaks browsing all
+        return this[σ].LastStopBefore(frameIndex);
+    }
+
     public void Log(T message, S source, int? maxMessages){
         Log<T> log;
         if(!logs.TryGetValue(source, out log)){
             log = logs[source] = new Log<T>();
         }
         log.LogMessage(message, out int overhead);
-        messageReceived?.Invoke(message, source, messageCount);
+        onMessage?.Invoke(message, source, messageCount);
         UpdateMessageCount(overhead, maxMessages);
     }