Merge pull request #745 from SMI/reviewer-async-fixes

Reviewer async fixes
SMI · May 14, 2021 · 293bc30 · 293bc30
2 parents 9fb431d + 6b84e77
commit 293bc30
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 10 deletions.
diff --git a/news/745-bugfix.md b/news/745-bugfix.md
@@ -0,0 +1 @@
+Fixed reviewer tree view refresh/async code
diff --git a/src/applications/Applications.IsIdentifiableReviewer/MainWindow.cs b/src/applications/Applications.IsIdentifiableReviewer/MainWindow.cs
@@ -407,6 +407,14 @@ private void OpenReport(string path, Action<Exception> exceptionHandler)
                 Width = Dim.Fill() };
             dlg.Add(rows);
 
+            bool done = false;
+
+            Application.MainLoop.AddTimeout(TimeSpan.FromSeconds(1),(s) =>
+            {
+                dlg.SetNeedsDisplay();
+                return !done;
+            });
+
             Task.Run(()=>{
                     try
                     {
@@ -425,13 +433,12 @@ private void OpenReport(string path, Action<Exception> exceptionHandler)
                 }
             ).ContinueWith((t)=>{
 
-                    btn.Clicked -= cancelFunc;
-                    btn.Text = "Done";
-                    btn.Clicked += closeFunc;
-                    dlg.SetNeedsDisplay();
-
+                btn.Clicked -= cancelFunc;
+                btn.Text = "Done";
+                btn.Clicked += closeFunc;
+                done = true;
 
-                    cts.Dispose();
+                cts.Dispose();
             });
 
             Application.Run(dlg);

diff --git a/src/applications/Applications.IsIdentifiableReviewer/Views/RulesView.cs b/src/applications/Applications.IsIdentifiableReviewer/Views/RulesView.cs
@@ -65,6 +65,11 @@ public RulesView()
 
         private void _treeView_SelectionChanged(object sender, SelectionChangedEventArgs<ITreeNode> e)
         {
+            if(e.NewValue != null)
+            {
+                e.Tree.RefreshObject(e.NewValue);
+            }
+
             // when selecting a node 
 
             if (e.NewValue is OutstandingFailureNode ofn){
@@ -320,18 +325,27 @@ private void EvaluateRuleCoverage()
             dlg.Add(stage);
             dlg.Add(progress);
             dlg.Add(textProgress);
-
+
+
+            bool done = false;
+
+            Application.MainLoop.AddTimeout(TimeSpan.FromSeconds(1), (s) =>
+            {
+                _treeView.RebuildTree();
+                dlg.SetNeedsDisplay();
+                return !done;
+            });
+
             Task.Run(()=>{
                 EvaluateRuleCoverageAsync(stage,progress,textProgress,cts.Token,colliding,ignore,update,outstanding);
                 },cts.Token).ContinueWith((t)=>{
 
                     btn.Clicked -= cancelFunc;
                     btn.Text = "Done";
                     btn.Clicked += closeFunc;
-                    dlg.SetNeedsDisplay();
-
+                    done = true;
                     cts.Dispose();
-            });;
+            });
 
             Application.Run(dlg);
         }