diff --git a/AltCover.UICommon/AltCover.UICommon.fsproj b/AltCover.UICommon/AltCover.UICommon.fsproj index b3cc22513..887daf9ad 100644 --- a/AltCover.UICommon/AltCover.UICommon.fsproj +++ b/AltCover.UICommon/AltCover.UICommon.fsproj @@ -47,9 +47,9 @@ - - - + + + diff --git a/AltCover.UICommon/Icons.fs b/AltCover.UICommon/Icons.fs index 15814c37b..070a2754d 100644 --- 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 new file mode 100644 index 000000000..c30445c0a Binary files /dev/null and b/AltCover.UICommon/RawCodeCoverageDataFile.png differ diff --git a/AltCover.UICommon/RawCodeCoverageDataFileStale.png b/AltCover.UICommon/RawCodeCoverageDataFileStale.png new file mode 100644 index 000000000..ee74cfc8d Binary files /dev/null and b/AltCover.UICommon/RawCodeCoverageDataFileStale.png differ diff --git a/AltCover.UICommon/RawCodeCoverageDataFileWarning.png b/AltCover.UICommon/RawCodeCoverageDataFileWarning.png new file mode 100644 index 000000000..18993f585 Binary files /dev/null and b/AltCover.UICommon/RawCodeCoverageDataFileWarning.png differ diff --git a/AltCover.UICommon/Report.png b/AltCover.UICommon/Report.png deleted file mode 100644 index 9b9a03d30..000000000 Binary files a/AltCover.UICommon/Report.png and /dev/null differ diff --git a/AltCover.UICommon/ReportStale.png b/AltCover.UICommon/ReportStale.png deleted file mode 100644 index d89e857f2..000000000 Binary files a/AltCover.UICommon/ReportStale.png and /dev/null differ diff --git a/AltCover.UICommon/ReportWarning.png b/AltCover.UICommon/ReportWarning.png deleted file mode 100644 index 1e97d36ed..000000000 Binary files a/AltCover.UICommon/ReportWarning.png and /dev/null differ diff --git a/AltCover.Visualizer/Screenshot-Avalonia.png b/AltCover.Visualizer/Screenshot-Avalonia.png index 0eb4f7fb7..45c9df815 100644 Binary files a/AltCover.Visualizer/Screenshot-Avalonia.png and b/AltCover.Visualizer/Screenshot-Avalonia.png differ diff --git a/AltCover.Visualizer/Screenshot-GTK.png b/AltCover.Visualizer/Screenshot-GTK.png index 0f2450c3b..a790659cc 100644 Binary files a/AltCover.Visualizer/Screenshot-GTK.png and b/AltCover.Visualizer/Screenshot-GTK.png differ diff --git a/AltCover.Visualizer/Screenshot-GTK3.png b/AltCover.Visualizer/Screenshot-GTK3.png index 1f2afa3d1..0922c0a8e 100644 Binary files a/AltCover.Visualizer/Screenshot-GTK3.png and b/AltCover.Visualizer/Screenshot-GTK3.png differ diff --git a/AltCover.Visualizer/Visualizer.fs b/AltCover.Visualizer/Visualizer.fs index 54ba6c200..2c7b6cb20 100644 --- 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, -#endif - typeof, - typeof, -#if VIS_PERCENT - typeof, -#endif - typeof, - typeof, -#if VIS_PERCENT - typeof, -#endif - typeof, - typeof, -#if VIS_PERCENT - typeof, -#endif - typeof, - typeof, -#if VIS_PERCENT - typeof -#else - typeof -#endif - ) - + handler.classStructureTree.Model <- + new TreeStore(typeof, typeof, typeof, typeof, + typeof, typeof, typeof, + typeof, typeof, typeof, + typeof) handler.auxModel <- - new TreeStore( -#if !VIS_PERCENT - typeof, -#endif - typeof, - typeof, -#if VIS_PERCENT - typeof, -#endif - typeof, - typeof, -#if VIS_PERCENT - typeof, + new TreeStore(typeof, typeof, typeof, typeof, + typeof, typeof, typeof, + typeof, typeof, typeof, + typeof) #endif - typeof, - typeof, -#if VIS_PERCENT - typeof, -#endif - typeof, - typeof, -#if VIS_PERCENT - typeof -#else - typeof -#endif - ) #if !NET472 [] @@ -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 new file mode 100644 index 000000000..2a93b086b --- /dev/null +++ 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 \ No newline at end of file diff --git a/AltCover.Visualizer/wiki/FontSelection.png b/AltCover.Visualizer/wiki/FontSelection.png index b2c8d16cc..b946e6a32 100644 Binary files a/AltCover.Visualizer/wiki/FontSelection.png and b/AltCover.Visualizer/wiki/FontSelection.png differ