Bug fixes and results

SteveGilham · Mar 10, 2022 · e6a5f44 · e6a5f44
1 parent 99e63cf
commit e6a5f44
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 61 deletions.
diff --git a/AltCover.UICommon/AltCover.UICommon.fsproj b/AltCover.UICommon/AltCover.UICommon.fsproj
@@ -47,9 +47,9 @@
     <EmbeddedResource Include="Property.png" />
     <EmbeddedResource Include="Refresh.png" />
     <EmbeddedResource Include="Refresh_greyThin.png" />
-    <EmbeddedResource Include="Report.png" />
-    <EmbeddedResource Include="ReportStale.png" />
-    <EmbeddedResource Include="ReportWarning.png" />
+    <EmbeddedResource Include="RawCodeCoverageDataFile.png" />
+    <EmbeddedResource Include="RawCodeCoverageDataFileStale.png" />
+    <EmbeddedResource Include="RawCodeCoverageDataFileWarning.png" />
     <EmbeddedResource Include="Resource.eo.resx" />
     <EmbeddedResource Include="Resource.resx" />
     <EmbeddedResource Include="StatusError.png" />

diff --git a/AltCover.UICommon/Icons.fs b/AltCover.UICommon/Icons.fs
@@ -22,13 +22,13 @@ type Icons<'TIcon>(toIcon: System.IO.Stream -> 'TIcon) =
   //with
   //| x -> System.InvalidOperationException(name, x) |> raise
 
-  member self.Report = makeIcon "Report"
+  member self.Report = makeIcon "RawCodeCoverageDataFile"
 
   member self.ReportDated =
-    makeIcon "ReportStale"
+    makeIcon "RawCodeCoverageDataFileStale"
 
   member self.ReportWarning =
-    makeIcon "ReportWarning"
+    makeIcon "RawCodeCoverageDataFileWarning"
 
   member self.Assembly = makeIcon "Assembly"
   member self.Event = makeIcon "Event"

diff --git a/AltCover.UICommon/RawCodeCoverageDataFile.png b/AltCover.UICommon/RawCodeCoverageDataFile.png
diff --git a/AltCover.UICommon/RawCodeCoverageDataFileStale.png b/AltCover.UICommon/RawCodeCoverageDataFileStale.png
diff --git a/AltCover.UICommon/RawCodeCoverageDataFileWarning.png b/AltCover.UICommon/RawCodeCoverageDataFileWarning.png
diff --git a/AltCover.UICommon/Report.png b/AltCover.UICommon/Report.png
diff --git a/AltCover.UICommon/ReportStale.png b/AltCover.UICommon/ReportStale.png
diff --git a/AltCover.UICommon/ReportWarning.png b/AltCover.UICommon/ReportWarning.png
diff --git a/AltCover.Visualizer/Screenshot-Avalonia.png b/AltCover.Visualizer/Screenshot-Avalonia.png
diff --git a/AltCover.Visualizer/Screenshot-GTK.png b/AltCover.Visualizer/Screenshot-GTK.png
diff --git a/AltCover.Visualizer/Screenshot-GTK3.png b/AltCover.Visualizer/Screenshot-GTK3.png
diff --git a/AltCover.Visualizer/Visualizer.fs b/AltCover.Visualizer/Visualizer.fs
@@ -183,63 +183,18 @@ module private Gui =
     seq { 0 .. (types.Length - 1) }
     |> Seq.iter (prepareTreeLine handler)
 
-    handler.classStructureTree.Model <-
-      new TreeStore(
 #if !VIS_PERCENT
-        typeof<string>,
-#endif
-        typeof<Gdk.Pixbuf>,
-        typeof<string>,
-#if VIS_PERCENT
-        typeof<string>,
-#endif
-        typeof<Gdk.Pixbuf>,
-        typeof<string>,
-#if VIS_PERCENT
-        typeof<string>,
-#endif
-        typeof<Gdk.Pixbuf>,
-        typeof<string>,
-#if VIS_PERCENT
-        typeof<string>,
-#endif
-        typeof<Gdk.Pixbuf>,
-        typeof<string>,
-#if VIS_PERCENT
-        typeof<string>
-#else
-        typeof<Gdk.Pixbuf>
-#endif
-      )
-
+    handler.classStructureTree.Model <-
+            new TreeStore(typeof<string>, typeof<Gdk.Pixbuf>, typeof<Gdk.Pixbuf>, typeof<string>,
+                          typeof<Gdk.Pixbuf>, typeof<string>, typeof<Gdk.Pixbuf>,
+                          typeof<string>, typeof<Gdk.Pixbuf>, typeof<string>,
+                          typeof<Gdk.Pixbuf>)
     handler.auxModel <-
-      new TreeStore(
-#if !VIS_PERCENT
-        typeof<string>,
-#endif
-        typeof<Gdk.Pixbuf>,
-        typeof<string>,
-#if VIS_PERCENT
-        typeof<string>,
-#endif
-        typeof<Gdk.Pixbuf>,
-        typeof<string>,
-#if VIS_PERCENT
-        typeof<string>,
+            new TreeStore(typeof<string>, typeof<Gdk.Pixbuf>, typeof<Gdk.Pixbuf>, typeof<string>,
+                          typeof<Gdk.Pixbuf>, typeof<string>, typeof<Gdk.Pixbuf>,
+                          typeof<string>, typeof<Gdk.Pixbuf>, typeof<string>,
+                          typeof<Gdk.Pixbuf>)
 #endif
-        typeof<Gdk.Pixbuf>,
-        typeof<string>,
-#if VIS_PERCENT
-        typeof<string>,
-#endif
-        typeof<Gdk.Pixbuf>,
-        typeof<string>,
-#if VIS_PERCENT
-        typeof<string>
-#else
-        typeof<Gdk.Pixbuf>
-#endif
-      )
 
 #if !NET472
   [<AutoSerializable(false); Sealed>]
@@ -408,7 +363,7 @@ module private Gui =
             table.Clear()
 
             let topRow =
-              model.AppendValues(name, pc, icon.Force())
+              model.AppendValues(name, (*pc,*) icon.Force()) // VIS_PERCENT
 
             if tip |> String.IsNullOrWhiteSpace |> not then
               let path = model.GetPath(topRow)

diff --git a/AltCover.Visualizer/images.txt b/AltCover.Visualizer/images.txt
@@ -0,0 +1,16 @@
+Screenshot-GTK.png -> README.core.md
+Screenshot-Avalonia -> README.visualizer.md
+Annotated.png
+Annotation66a.png
+FontSelection.png
+
+---
+TheVisualizer.md ->
+
+Screenshot-Avalonia
+Screenshot-GTK
+Annotated.png
+Annotation66a.png
+FontSelection.png -- 328x112
+Annotation66b.png
+Screenshot-GTK3
diff --git a/AltCover.Visualizer/wiki/FontSelection.png b/AltCover.Visualizer/wiki/FontSelection.png