WIP commit for cross model browsing

Author: eelstork

Editor/Core/UI/LogWindow-Prolog.cs

@@ -10,16 +10,13 @@
 using PrologFrame = Activ.Prolog.Frame;
 using PrologLogger = Activ.Prolog.Logger;
 using PrologMessage = Activ.Prolog.Message;
-using PrologWindowModel = Activ.Prolog.LogWindowModel;
-using static Activ.Prolog.LogWindowModel;
 
 namespace Activ.Loggr.UI{
 public partial class LogWindow{  // Prolog
 
-    Vector2 p_scroll;
+    public static readonly string[] rtypeOptions = {"any", "void", "status"};
 
-    PrologWindowModel model = PrologWindowModel.instance;
-    PrologFrame selectedFrame;   // Last selected frame object
+    Vector2 p_scroll;
 
     void DrawPrologView(){
         DrawPrologHeader();

Editor/Core/UI/LogWindow.cs

@@ -13,6 +13,7 @@ public partial class LogWindow : EditorWindow{
     const int FontSize = 13;
     const float ScrubberButtonsHeight = 24f;
     public static LogWindow instance;
+    LogWindowModel model = new LogWindowModel();
     //
     static Font normalButtonFont;
     static Font _font;
@@ -94,7 +95,9 @@ void DrawTextView(string text, ref Vector2 scroll){
         scroll = BeginScrollView(scroll);
         GUI.backgroundColor = Color.black;
         ConfigTextAreaStyle();
-        GL.TextArea(browsing ? selectedFrame.Format() : text,
+        // TODO this is injecting prolog data into debug chan out
+        // when browsing
+        GL.TextArea(browsing ? model.selectedFrame.Format() : text,
                            GL.ExpandHeight(true));
         EndScrollView();
         GUI.backgroundColor = Color.white;
@@ -113,7 +116,7 @@ void ConfigTextAreaStyle(){
 
     void DrawScrubber(){
         BeginHorizontal();
-        int frameNo = browsing ? selectedFrame.index : Time.frameCount;
+        int frameNo = browsing ? model.selectedFrame.index : Time.frameCount;
         var style = GUI.skin.button;
         normalButtonFont = style.font;
         style.font = monofont;
@@ -138,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, selectedFrame);
+        var sel = PrologHistoryGUI.Draw(model.filtered, model.selectedFrame);
         if(Ed.isPaused || !isPlaying){
-            selectedFrame = sel ?? selectedFrame;
+            model.selectedFrame = sel ?? model.selectedFrame;
             Repaint();
         }else{
-            selectedFrame = null;
+            model.selectedFrame = null;
         }
     }
 
@@ -153,20 +156,18 @@ void OnSelectionChange()
     void Clear(){
         PrologLogger.Clear();
         model.Clear();
-        selectedFrame = null;
         SceneView.RepaintAll();
         Repaint();
     }
 
     void SelectPrev(){
-        selectedFrame = model.filtered.Prev(selectedFrame
-                                            ?? model.filtered.last);
+        model.selectedFrame = model.Prev(model.selectedFrame);
         SceneView.RepaintAll();
     }
 
     void SelectNext(){
-        if(selectedFrame == null) return;
-        selectedFrame = model.filtered.Next(selectedFrame);
+        if(model.selectedFrame == null) return;
+        model.selectedFrame = model.Next(model.selectedFrame);
         SceneView.RepaintAll();
     }
 
@@ -187,7 +188,7 @@ static Font monofont{ get{
     }}
 
     bool browsing
-    => (Ed.isPaused || !isPlaying) && selectedFrame != null;
+    => (Ed.isPaused || !isPlaying) && model.selectedFrame != null;
 
     static bool isPlaying => Application.isPlaying;
 

Editor/Core/UI/LogWindowModel.cs

@@ -1,29 +1,52 @@
 using UnityEngine;
 using Activ.Loggr;
+using PrologHistory = Activ.Prolog.History;
+using PrologFrame = Activ.Prolog.Frame;
+using PrologFilter = Activ.Prolog.Filter;
+using PrologFormatter = Activ.Prolog.Formatter;
+using PrologLogger = Activ.Prolog.Logger;
 
-namespace Activ.Prolog{
+namespace Activ.Loggr.UI{
 public class LogWindowModel{
 
-    public static readonly string[] rtypeOptions = {"any", "void", "status"};
-    public static LogWindowModel instance = new LogWindowModel();
     public GameObject current;
-    public History filtered{ get; private set; }
-    Filter filter;
+    public PrologHistory filtered{ get; private set; }
+    PrologFilter filter;
+    public PrologFrame selectedFrame;   // Last selected frame object
 
-    public GameObject selection
-    => Config.useSelection ? current : null;
+    public LogWindowModel(){
+        PrologLogger.onFrame += OnPrologFrame;
+    }
+
+    public void Clear(){
+        filtered = null;
+        current = null;
+        selectedFrame = null;
+    }
+
+    public PrologFrame Next(PrologFrame current){
+        return filtered.Next(current);
+    }
 
-    public void Clear(){ filtered = null; current = null; }
+    public PrologFrame Prev(PrologFrame current){
+        return filtered.Prev(current ?? filtered.last);
+    }
 
     public string Output(bool useHistory, string rtype){
-        filter = new Filter(selection, rtype);
-        return useHistory ? Formatter.Latest(source)
-                          : Formatter.State(source);
+        filter = new PrologFilter(selection, rtype);
+        return useHistory ? PrologFormatter.Latest(source)
+                          : PrologFormatter.State(source);
+    }
+
+    public void OnPrologFrame(PrologFrame frame){
+        filtered += frame;
+        Activ.Loggr.UI.LogWindow.instance?.Repaint();
     }
 
-    public void Log(Frame frame) => filtered += frame;
+    public GameObject selection
+    => Config.useSelection ? current : null;
 
-    History source
-    => selection ? (filtered /= filter) : Logger.history;
+    PrologHistory source
+    => selection ? (filtered /= filter) : PrologLogger.history;
 
 }}

Editor/DebugChan/LoggingManager.cs

@@ -15,8 +15,6 @@ static void OnPlayState(PlayModeStateChange state){
             case PlayModeStateChange.EnteredPlayMode:
                 DebugChan.logger = new Logger<string, object>();
                 DebugChan.logToConsole = Config.logToConsole;
-                // TODO - transitional ref
-                // 
                 DebugChan.maxMessages = Config.maxMessages == 0 ? (int?)null : Config.maxMessages;
                 Activ.Loggr.UI.LogWindow.cumulatedMessageCount = 0;
                 break;

Editor/Prolog/Logger.cs

@@ -2,17 +2,19 @@
 using System.Diagnostics;
 using UnityEngine;
 using UnityEditor;
-//using static UnityEngine.Application;
 using Activ.Prolog.IL;
 using Activ.Loggr;  // for config keys
 
 namespace Activ.Prolog{
 [InitializeOnLoad]
 public static class Logger{
 
+    public static event FrameEventHandler onFrame;
+
     public static int injectionTimeMs;
     public static History history    = new History(ConfigKeys.LogPath);
     public static List<Frame> frames = new List<Frame>();
+
     static bool isPlaying = false;
 
     private static void OnPlayState(PlayModeStateChange state){
@@ -49,9 +51,7 @@ public static void LogStatic(string type, string message)
     static void Process(Message msg){
         if(frame + msg) return;
         history += frame;
-        LogWindowModel.instance.Log(frame);
-        // TODO model-to-view dep
-        Activ.Loggr.UI.LogWindow.instance?.Repaint();
+        onFrame?.Invoke(frame);
         frame = new Frame(msg);
     }
 
@@ -60,4 +60,8 @@ static Frame frame{
         set => frames.Add(value);
     }
 
+    // -------------------------------------------------------------
+
+    public delegate void FrameEventHandler(Frame frame);
+
 }}