2 Commits

Author SHA1 Message Date
mbabienco 5b87eb7d87 Use Avalonia 12 preview versions for DialogHost, progress ring 2026-02-20 15:10:53 +09:00
mbabienco f3dd4bec82 Attempt to build on Avalonia 12
Fails, likely due to dependencies relying on 11
2026-02-20 14:42:52 +09:00
26 changed files with 98 additions and 692 deletions
-20
View File
@@ -1,22 +1,3 @@
-Add ImageMagick attribution to about page
-auto detect receipts in an image and auto-crop?
-https://imagemagick.org/api/feature.php#gsc.tab=0 canny edge image
-https://blog.jiayu.co/2019/05/edge-detection-with-imagemagick/
-https://pyimagesearch.com/2021/10/27/automatically-ocring-receipts-and-scans/ using open CV
-https://www.kaggle.com/code/dmitryyemelyanov/receipt-ocr-part-1-image-segmentation-by-opencv manip done before edge detect
-https://www.luisllamas.es/en/how-to-use-opencv-in-net-with-opencvsharp/ (some basic code but also line detect)
-opencv for macOS? https://www.nuget.org/packages/OpenCvSharp4.runtime.osx.10.15-universal
macOS arm64: https://www.nuget.org/packages/OpenCvSharp4.runtime.osx_arm64/4.8.1-rc
-can use the normal nuget for windows, linnux
-if we can get openCV working then we can probably hack something together...
-https://github.com/shimat/opencvsharp/issues/949 -- requires ffmpeg?!
-https://github.com/shimat/opencvsharp
-https://www.emgu.com/wiki/index.php?title=Main_Page (GPL...)
-https://stackoverflow.com/questions/30296710/detecting-paper-edge-and-crop-it
//https://developers.goalist.co.jp/entry/2019/02/13/150126
---------------
*-add more items
*-save last opened folder to settings somewhere
@@ -41,4 +22,3 @@
*-Published app has unneeded .DSYM file (fixed via .app builder)
*-Published app has Assets folder already copied to it; don't want that in output macOS folder but it's being copied there anyway (fixed via .app builder)
*-macOS x64 build
Binary file not shown.

Before

Width:  |  Height:  |  Size: 236 KiB

After

Width:  |  Height:  |  Size: 421 KiB

+1 -1
View File
@@ -3,7 +3,7 @@
; Non-commercial use only
#define MyAppName "MayShow"
#define MyAppVersion "1.2.0"
#define MyAppVersion "1.1.0"
#define MyAppPublisher "Quickity Quack Productions"
#define MyAppExeName "MayShow.exe"
-6
View File
@@ -100,12 +100,6 @@
<DataTemplate DataType="{x:Type viewModels:WarningViewModel}">
<views:WarningView/>
</DataTemplate>
<DataTemplate DataType="{x:Type viewModels:ShutdownCheckViewModel}">
<views:ShutdownCheckView/>
</DataTemplate>
<DataTemplate DataType="{x:Type viewModels:ConfirmViewModel}">
<views:ConfirmView/>
</DataTemplate>
</Application.DataTemplates>
<Application.Resources>
<ResourceDictionary>
+1 -1
View File
@@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
<AvaloniaVersion>11.3.12</AvaloniaVersion>
<AvaloniaVersion>12.0.0-preview1</AvaloniaVersion>
</PropertyGroup>
</Project>
+1 -4
View File
@@ -5,10 +5,7 @@ namespace MayShow.Helpers;
class Constants
{
public static string AppVersion = "1.2.0";
public static string[] AllowedFileExtensionPatterns = [ "*.png", "*.jpg", "*.jpeg", "*.gif", "*.bmp", "*.webp", "*.pdf", "*.heic", ];
public static string[] AllowedFileExtensionsNoStar = [ "png", "jpg", "jpeg", "gif", "bmp", "webp", "pdf", "heic", ];
public static string AppVersion = "1.1.0";
public static string[] GetQuotes()
{
-8
View File
@@ -1,8 +0,0 @@
using System.Threading.Tasks;
namespace MayShow.Interfaces;
interface ICanCheckShutdown
{
Task<bool> CheckIsSafeToShutdown();
}
+3 -2
View File
@@ -1,9 +1,10 @@
using MayShow.ViewModels;
namespace MayShow.Interfaces;
namespace MayShow.Interfaces
{
interface IChangeViewModel
{
void PushViewModel(BaseViewModel model);
void PopViewModel();
}
}
+3 -2
View File
@@ -1,8 +1,9 @@
using Avalonia.Controls;
namespace MayShow.Interfaces;
namespace MayShow.Interfaces
{
interface ITopLevelGrabber
{
TopLevel GetTopLevel();
}
}
+1 -2
View File
@@ -13,8 +13,7 @@
Height="650"
MinHeight="550">
<dialogHost:DialogHost CloseOnClickAway="False"
Identifier="DialogHost"
x:Name="WindowDialogHost">
Identifier="DialogHost">
<dialogHost:DialogHost.DialogContent>
<StackPanel/>
</dialogHost:DialogHost.DialogContent>
-59
View File
@@ -1,9 +1,4 @@
using System;
using System.Threading.Tasks;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using DialogHostAvalonia;
using MayShow.Interfaces;
using MayShow.ViewModels;
@@ -15,60 +10,6 @@ public partial class MainWindow : Window, ITopLevelGrabber
{
InitializeComponent();
DataContext = new MainWindowViewModel(this);
Closing += WindowIsClosing;
var lifetime = Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
// lifetime?.ShutdownRequested += ApplicationIsShuttingDown;
}
private async void WindowIsClosing(object? sender, WindowClosingEventArgs e)
{
e.Cancel = true; // async -> need to cancel immediately
if (await CheckIfClosePossible())
{
Closing -= WindowIsClosing;
var lifetime = Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
lifetime?.ShutdownRequested -= ApplicationIsShuttingDown;
Close();
}
}
private async void ApplicationIsShuttingDown(object? sender, ShutdownRequestedEventArgs e)
{
e.Cancel = true; // async -> need to cancel immediately
if (await CheckIfClosePossible())
{
Closing -= WindowIsClosing;
var lifetime = Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
lifetime?.ShutdownRequested -= ApplicationIsShuttingDown;
lifetime?.TryShutdown();
}
}
private async Task<bool> CheckIfClosePossible()
{
var canShutdown = true;
if (DataContext is MainWindowViewModel mwvm)
{
if (mwvm is ICanCheckShutdown canCheck)
{
canShutdown = await canCheck.CheckIsSafeToShutdown();
}
// only checking 1 level but for this app that is OK
if (canShutdown && mwvm.CurrentViewModel is ICanCheckShutdown currModel)
{
try
{
canShutdown = await currModel.CheckIsSafeToShutdown();
}
catch (Exception)
{
canShutdown = true;
}
}
}
return canShutdown;
}
public TopLevel GetTopLevel()
+4 -12
View File
@@ -12,7 +12,7 @@
<PublishTrimmed>true</PublishTrimmed>
<PublishAot>true</PublishAot>
<AssemblyName>MayShow</AssemblyName>
<AssemblyVersion>1.2.0</AssemblyVersion> <!-- Also update Constants version -->
<AssemblyVersion>1.1.0</AssemblyVersion> <!-- Also update Constants version -->
<ApplicationIcon>MayShow-icon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
@@ -42,18 +42,10 @@
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
</PackageReference>
<PackageReference Include="PDFsharp-MigraDoc" Version="6.2.3" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.10.3" />
<PackageReference Include="Deadpikle.AvaloniaProgressRing" Version="0.10.11-preview20251127001" />
<PackageReference Include="DialogHost.Avalonia" Version="0.10.4" />
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.10.2" />
<PackageReference Include="Deadpikle.AvaloniaProgressRing" Version="0.11.0-preview20260220" />
<PackageReference Include="DialogHost.Avalonia" Version="0.10.4-avalonia12" />
<PackageReference Include="Xaml.Behaviors.Interactions.DragAndDrop.DataGrid" Version="11.3.9.5" />
<PackageReference Include="OpenCvSharp4" Version="4.13.0.20260226" />
</ItemGroup>
<ItemGroup Condition=" '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' ">
<PackageReference Include="OpenCvSharp4.runtime.osx.10.15-universal" Version="4.7.0.20230224" />
</ItemGroup>
</Project>
+1 -1
View File
@@ -34,7 +34,7 @@ class Settings : ChangeNotifier
{
var path = Path.Combine(
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
"MayShow"
"ReceiptPDFBuilder" // legacy name for existing settings prior to app name change
);
if (!Directory.Exists(path))
{
-8
View File
@@ -1,8 +0,0 @@
namespace MayShow.Models;
enum ShutdownCheckOptions
{
SaveAndShutdown,
NoSaveShutdown,
CancelShutdown,
}
-52
View File
@@ -1,52 +0,0 @@
#nullable enable
using DialogHostAvalonia;
using MayShow.Helpers;
namespace MayShow.ViewModels;
class ConfirmViewModel
{
private string _title;
private string _message;
private string _confirmTitle;
private string _declineTitle;
public ConfirmViewModel(string title, string message, string confirmTitle = "Yes", string declineTitle = "No")
{
_title = title;
_message = message;
_confirmTitle = confirmTitle;
_declineTitle = declineTitle;
}
public string Title
{
get => _title;
}
public string Message
{
get => _message;
}
public string ConfirmTitle
{
get => _confirmTitle;
}
public string DeclineTitle
{
get => _declineTitle;
}
public void Confirm()
{
DialogHost.Close("DialogHost", true);
}
public void Decline()
{
DialogHost.Close("DialogHost", false);
}
}
+44 -320
View File
@@ -20,16 +20,11 @@ using MayShow.Helpers;
using MayShow.Interfaces;
using MayShow.Models;
using MayShows.Helpers;
using OpenCvSharp;
using System.Reflection.Metadata.Ecma335;
using System.Collections.Generic;
using System.Threading;
namespace MayShow.ViewModels;
class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
class MainViewModel : BaseViewModel, IFontResolver
{
private bool _isPerformingInitialLoad;
private string _processDir;
private bool _isCreatingPDF;
private string _createPDFLog;
@@ -41,11 +36,8 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
private Settings _settings;
private bool _hasUnsavedWork;
public MainViewModel(IChangeViewModel viewModelChanger) : base(viewModelChanger)
{
_isPerformingInitialLoad = true;
_processDir = Path.GetDirectoryName(Environment.ProcessPath) ?? "";
Console.WriteLine("Process is running from: {0}", _processDir);
_isCreatingPDF = false;
@@ -55,10 +47,10 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
_createPDFLog = "----- MayShow v" + Constants.AppVersion + "------" + Environment.NewLine;
_createPDFLog += quotes[quoteIndex] + Environment.NewLine;
_createPDFLog += "---------------------------------------" + Environment.NewLine;
_createPDFLog += "Loaded and ready to create report!" + Environment.NewLine;
_createPDFLog += "Please copy and send this Program Log when reporting any issues with the software.";
_createPDFLog += "Ready to create PDF!";
_workingFolder = "";
ReportFiles = _reportFiles = new ObservableCollection<ReportFile>();
_reportFiles = new ObservableCollection<ReportFile>();
_reportFiles.CollectionChanged += ( sender, e ) => { NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled)); };
_reportTitle = "";
_lastGeneratedTime = null;
_settings = Settings.LoadSettings();
@@ -67,24 +59,12 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
LogInfo("Loading data at last used path of {0}", _settings.LastUsedPath);
ScanFolder(_settings.LastUsedPath);
}
else
{
LogInfo("Choose a receipt folder to begin...");
}
HasUnsavedWork = false;
_isPerformingInitialLoad = false;
}
public string ReportTitle
{
get => _reportTitle;
set
{
_reportTitle = value;
NotifyPropertyChanged();
NotifyPropertyChanged(nameof(IsTitleBoxVisible));
NotifyPropertyChanged(nameof(CanAddItem));
}
set { _reportTitle = value; NotifyPropertyChanged(); NotifyPropertyChanged(nameof(IsTitleBoxVisible)); }
}
public bool IsTitleBoxVisible
@@ -92,11 +72,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
get => !string.IsNullOrWhiteSpace(_workingFolder);
}
public bool CanAddItem
{
get => IsTitleBoxVisible && !IsCreatingPDF;
}
public bool IsCreatingPDF
{
get => _isCreatingPDF;
@@ -106,7 +81,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
NotifyPropertyChanged();
NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled));
NotifyPropertyChanged(nameof(HasWorkingFolderAndNotMakingPDF));
NotifyPropertyChanged(nameof(CanAddItem));
}
}
@@ -143,16 +117,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
set { _createPDFLog = value; NotifyPropertyChanged(); }
}
public bool HasUnsavedWork
{
get => _hasUnsavedWork;
set
{
_hasUnsavedWork = value;
NotifyPropertyChanged();
}
}
public ObservableCollection<ReportFile> ReportFiles
{
get => _reportFiles;
@@ -163,7 +127,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
_reportFiles.CollectionChanged += ( sender, e ) =>
{
NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled));
HasUnsavedWork = true;
};
}
}
@@ -194,7 +157,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
_settings.LastUsedPath = folder.Path.LocalPath;
await _settings.SaveSettingsAsync();
ResortPDFItemsByDate();
HasUnsavedWork = true;
}
}
}
@@ -205,7 +167,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
{
WorkingFolder = path;
NotifyPropertyChanged(nameof(IsTitleBoxVisible));
NotifyPropertyChanged(nameof(CanAddItem));
var reportFilePath = Path.Combine(path, GetReportSavedDataFileName());
var successfullyLoadedPriorReport = false;
if (File.Exists(reportFilePath))
@@ -234,12 +195,8 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
{
AddFileBasedOnPath(filePath);
}
if (!_isPerformingInitialLoad)
{
ResortPDFItemsByDate();
}
HasUnsavedWork = true;
}
}
else
{
@@ -264,7 +221,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
if (idx != -1)
{
ReportFiles.RemoveAt(idx);
HasUnsavedWork = true;
}
}
}
@@ -280,10 +236,20 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
file.Title = updatedData.Title;
file.ReceiptDateTime = updatedData.ReceiptDateTime;
file.Notes = updatedData.Notes;
HasUnsavedWork = true;
}
}
private string[] GetAllowedFileExtensionPatterns()
{
return [ "*.png", "*.jpg", "*.jpeg", "*.gif", "*.bmp", "*.webp", "*.pdf", "*.heic", ];
}
private string[] GetAllowedFileExtensionPatternsWithoutStar()
{
var list = GetAllowedFileExtensionPatterns();
return list.Select(x => x.Replace("*.", "")).ToArray();
}
public async void AddItem()
{
var topLevel = TopLevelGrabber?.GetTopLevel();
@@ -296,7 +262,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
FileTypeFilter = [
new FilePickerFileType("All Types")
{
Patterns = Constants.AllowedFileExtensionPatterns,
Patterns = GetAllowedFileExtensionPatterns(),
AppleUniformTypeIdentifiers = [ "public.image", "com.adobe.pdf", "public.heic" ],
MimeTypes = [ "image/*", "application/pdf", "image/heic" ]
},
@@ -326,7 +292,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
if (!string.IsNullOrWhiteSpace(filePath) && File.Exists(filePath) && !filePath.EndsWith(".DS_Store"))
{
// make sure extensions are OK
var fileExtensions = Constants.AllowedFileExtensionsNoStar;
var fileExtensions = GetAllowedFileExtensionPatternsWithoutStar();
var didMatch = false;
foreach (var fileExtension in fileExtensions)
{
@@ -337,12 +303,9 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
}
}
if (!didMatch)
{
if (!filePath.EndsWith(GetReportSavedDataFileName()))
{
LogInfo("File {0} did not match allowed file extension types, so it was not added.", filePath);
}
}
else
{
var date = Utilities.CheckValidDateInString(filePath);
@@ -353,22 +316,10 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
Notes = "",
FilePath = filePath,
});
HasUnsavedWork = true;
}
}
}
public async void RemoveAllItems()
{
var result = await DialogHost.Show(new ConfirmViewModel("Warning!", "Are you sure you want to remove all items from this report?", "Remove All Items", "Cancel"));
if (result != null && (bool)result)
{
ReportFiles.Clear();
HasUnsavedWork = true;
NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled));
}
}
public void LocateFile(object f) => LocateFileImpl((ReportFile) f);
public async void LocateFileImpl(ReportFile reportFile)
{
@@ -382,7 +333,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
FileTypeFilter = [
new FilePickerFileType("All Types")
{
Patterns = Constants.AllowedFileExtensionPatterns,
Patterns = GetAllowedFileExtensionPatterns(),
AppleUniformTypeIdentifiers = [ "public.image", "com.adobe.pdf", "public.heic" ],
MimeTypes = [ "image/*", "application/pdf", "image/heic" ]
},
@@ -400,7 +351,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
{
var file = files[0];
reportFile.FilePath = file.Path.LocalPath;
HasUnsavedWork = true;
}
}
}
@@ -439,7 +389,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
{
LogInfo("Sorting report files list...");
ReportFiles = new ObservableCollection<ReportFile>(ReportFiles.OrderBy(x => x.ReceiptDateTime));
HasUnsavedWork = true;
}
public async void BuildPDF()
@@ -474,7 +423,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
}
}
public async Task SaveInterimReportInfo()
public async void SaveInterimReportInfo()
{
var report = new PDFReport()
{
@@ -498,7 +447,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
var savePath = Path.Combine(_workingFolder, GetReportSavedDataFileName());
await File.WriteAllTextAsync(savePath, json);
LogInfo("Saved report information to {0}", savePath);
HasUnsavedWork = false;
}
private async Task CreateAndSaveReportObjectAfterReportCreation()
@@ -520,190 +468,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
return "report_data.json";
}
public void TestReceiptFinding(object f) => TestReceiptFindingImpl((ReportFile)f);
private Mat? b_algor(ReportFile file)
{
using var orig = new Mat(file.FilePath);
using var src = new Mat(file.FilePath, ImreadModes.Grayscale);
if (src.Empty())
{
LogInfo("File was empty?");
return null;
}
using var blur = orig.GaussianBlur(new Size(5, 5), 0.0);
using var kernel = Cv2.GetStructuringElement(MorphShapes.Rect, new Size(9,9));
using var dilated = blur.Dilate(kernel, anchor: null, iterations: 4);
using var edges = dilated.Canny(100, 200, 3);
using var heirarchy = new Mat();
Cv2.FindContours(edges, out Mat[] contours, heirarchy, RetrievalModes.External, ContourApproximationModes.ApproxSimple);
using var orgWithContours = new Mat();
orig.CopyTo(orgWithContours);
Cv2.DrawContours(orgWithContours, contours, -1, Scalar.Cyan, 3);
// largest contours
var largestContours = contours.OrderByDescending(x => x.ContourArea()).Take(1).ToArray();
var orgWithLargestContours = new Mat();
orig.CopyTo(orgWithLargestContours);
Cv2.DrawContours(orgWithLargestContours, largestContours, -1, Scalar.Cyan, 5);
using (new OpenCvSharp.Window("blur", blur))
using (new OpenCvSharp.Window("dilated", dilated))
using (new OpenCvSharp.Window("edges", edges))
using (new OpenCvSharp.Window("contours", orgWithContours))
// using (new OpenCvSharp.Window("w biggest contours", orgWithBiggestContours))
{
Cv2.WaitKey();
}
return orgWithLargestContours;
}
private void TestReceiptFindingImpl(ReportFile file)
{
LogInfo("Running receipt edge detection on file at path {0} with OpenCV {1}...", file.FilePath, Cv2.GetVersionString() ?? "");
using var orig = new Mat(file.FilePath);
using var src = new Mat(file.FilePath, ImreadModes.Grayscale);
using var dst = new Mat();
using var wContours = new Mat();
if (src.Empty())
{
LogInfo("File was empty?");
return;
}
var threshold = src.Threshold(90,255, ThresholdTypes.Binary);
var blur = orig.GaussianBlur(new Size(3.0, 3.0), 0.0);
var kernel = Cv2.GetStructuringElement(MorphShapes.Rect, new Size(9,9));
var dilated = blur.Dilate(kernel, null, 1);
var edges = dilated.Canny(50, 200, 3);
//# Detect all contours in Canny-edged image
using var heirarchy = new Mat();
Cv2.FindContours(threshold, out Mat[] contours, heirarchy, RetrievalModes.External, ContourApproximationModes.ApproxSimple);
var orgWithContours = new Mat();
orig.CopyTo(orgWithContours);
Cv2.DrawContours(orgWithContours, contours, -1, Scalar.Cyan, 3);
// # find full contours
var poly = new List<Mat>();
foreach (var contour in contours)
{
var hull = contour.ConvexHull();
poly.Add(hull.ApproxPolyDP(0.01 * Cv2.ArcLength(hull, true), false));
}
Console.WriteLine("How many? {0}", poly.Count);
var orgWithAllPly = new Mat();
orig.CopyTo(orgWithAllPly);
Cv2.DrawContours(orgWithAllPly, poly, -1, Scalar.Red, 3);
var largestPoly = poly.OrderByDescending(x => x.ContourArea()).Take(10).ToArray();
var orgWithLargestContoursPly = new Mat();
orig.CopyTo(orgWithLargestContoursPly);
Cv2.DrawContours(orgWithLargestContoursPly, largestPoly, -1, Scalar.Red, 5);
// using (new OpenCvSharp.Window("poly", orgWithAllPly))
// using (new OpenCvSharp.Window("pol2y", orgWithLargestContoursPly))
// {
// Cv2.WaitKey();
// }
//
// # Get 10 largest contours
Console.WriteLine(contours);
var orgWithLargestContours = new Mat();
orig.CopyTo(orgWithLargestContours);
var largestContours = contours.OrderByDescending(x => x.ContourArea()).Take(10).ToArray();
Cv2.DrawContours(orgWithLargestContours, largestContours, -1, Scalar.Cyan, 5);
//
Mat approximate_contour(Mat contour)
{
var perimeter = Cv2.ArcLength(contour, true);
return contour.ApproxPolyDP(0.02 * perimeter, true);
}
Mat? get_receipt_counter(Mat[] contours)
{
var poly = new List<Mat>();
foreach (var contour in contours)
{
// var hull = contour.ConvexHull();
// var arcLength = hull.ArcLength(true);
// var x = contour.ApproxPolyDP(0.01 * arcLength, true);
// poly.Add(x);
var approx = approximate_contour(contour);
if (approx.Total() == 4)
{
return approx;
}
}
return null;
}
var highestY = 0;
var lowestY = 9999;
var highestX = 0;
var lowestX = 9999;
foreach (var contour in largestContours)
{
Console.WriteLine("Rows: {0}", contour.Rows);
if (contour.Rows > 10) // eliminate small things?
{
for (var i = 0; i < contour.Rows; i++)
{
var pt = contour.At<Point>(i);
if (pt.X < lowestX)
{
lowestX = pt.X;
}
if (pt.X > highestX)
{
highestX = pt.X;
}
if (pt.Y < lowestY)
{
lowestY = pt.Y;
}
if (pt.Y > highestY)
{
highestY = pt.Y;
}
}
}
}
Console.WriteLine("Low X: {0}, High X: {1}", lowestX, highestX);
Console.WriteLine("Low Y: {0}, High Y: {1}", lowestY, highestY);
var rect = new Rect(lowestX, lowestY, Math.Abs(highestX - lowestX), Math.Abs(highestY - lowestY));
Console.WriteLine(rect);
using var crop = new Mat(orig, rect);
using (new OpenCvSharp.Window("w largest contours", orgWithLargestContours))
using (new OpenCvSharp.Window("crop", crop))
using (new OpenCvSharp.Window("crop_b", b_algor(file)))
// using (new OpenCvSharp.Window("w biggest contours", orgWithBiggestContours))
{
Cv2.WaitKey();
}
return;
var largest = get_receipt_counter(largestContours);
Console.WriteLine(largest);
var orgWithBiggestContours = new Mat();
orig.CopyTo(orgWithBiggestContours);
Cv2.DrawContours(orgWithBiggestContours, [largest], -1, Scalar.Cyan, 3);
////
using (new OpenCvSharp.Window("src image", src))
// using (new OpenCvSharp.Window("blur image", blur))
// using (new OpenCvSharp.Window("dilated image", dilated))
using (new OpenCvSharp.Window("orig with all contours", orgWithContours))
using (new OpenCvSharp.Window("w largest contours", orgWithLargestContours))
// using (new OpenCvSharp.Window("w biggest contours", orgWithBiggestContours))
{
Cv2.WaitKey();
}
}
public byte[]? GetFont(string faceName)
{
LogInfo(string.Format("Loading font {0}", faceName));
@@ -794,12 +558,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
reportTitlePar.Format.Font.Name = "Noto Sans JP"; // has english letters in it, too
reportTitlePar.AddText(ReportTitle);
//
var convertedDir = Path.Combine(folderPath, "converted");
if (!Directory.Exists(convertedDir))
{
Directory.CreateDirectory(convertedDir);
}
//
GlobalFontSettings.FontResolver = this;
GlobalFontSettings.FallbackFontResolver = new FailsafeFontResolver();
var hasAddedData = false;
@@ -827,7 +585,14 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
imageTitlePar.Format.Font.Size = 12;
imageTitlePar.Format.Font.Bold = true;
imageTitlePar.Format.Font.Name = "Noto Sans JP"; // has english letters in it, too
imageTitlePar.AddText(string.IsNullOrWhiteSpace(file.Title) ? file.FileName : file.Title);
if (string.IsNullOrWhiteSpace(file.Title))
{
imageTitlePar.AddText(file.FileName);
}
else
{
imageTitlePar.AddText(file.Title);
}
var receiptDatePar = section.AddParagraph();
receiptDatePar.Format.Alignment = ParagraphAlignment.Center;
receiptDatePar.Format.Font.Size = 12;
@@ -855,48 +620,36 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
var info = new FileInfo(file.FilePath);
uint loadedImageWidth = 0;
uint loadedImageHeight = 0;
if (!isPDF)
if (isHEIC || isWebp || isPNG)
{
// Save image as jpg
var convertedDir = Path.Combine(folderPath, "converted");
if (!Directory.Exists(convertedDir))
{
Directory.CreateDirectory(convertedDir);
}
var outputPath = Path.Combine(convertedDir, info.Name + ".jpg");
using var mImage = new MagickImage(info.FullName);
loadedImageWidth = mImage.Width;
loadedImageHeight = mImage.Height;
var convertedOutputPath = Path.Combine(convertedDir, info.Name + ".jpg");
var didAdjust = false;
LogInfo("Image orientation of {0} is {1}", fileName, mImage.Orientation);
if (mImage.Orientation != OrientationType.TopLeft)
{
LogInfo("Auto-adjusted image orientation of {0}", fileName);
mImage.AutoOrient();
didAdjust = true;
}
// perform needed image manipulations
if (isHEIC || isWebp || isPNG || (!isPDF && info.Length > 1.5 * 1024 * 1024 /* 1.5 MB */))
{
// Save image as jpg
mImage.Quality = 80;
if (mImage.Width >= 400 || mImage.Height >= 400)
{
loadedImageWidth = (uint)Math.Floor(mImage.Width * 0.5);
loadedImageHeight = (uint)Math.Floor(mImage.Height * 0.5);
mImage.Scale(loadedImageWidth, loadedImageHeight);
LogInfo("Image {2} scaled to {0}x{1}", loadedImageWidth, loadedImageHeight, fileName);
}
didAdjust = true;
LogInfo("Converted image {0} to JPEG", fileName);
await mImage.WriteAsync(outputPath);
filePath = Path.Combine("Converted", info.Name + ".jpg");
LogInfo(string.Format("Converted image to JPEG; fileName is now {0}", file.FilePath));
}
else
else if (!isPDF)
{
// load height/width
using var mImage = new MagickImage(info.FullName);
loadedImageWidth = mImage.Width;
loadedImageHeight = mImage.Height;
}
if (didAdjust)
{
await mImage.WriteAsync(convertedOutputPath);
filePath = Path.Combine("Converted", info.Name + ".jpg");
LogInfo(string.Format("Saved adjusted image to JPEG; fileName is now {0}", file.FilePath));
}
}
var paragraph = section.AddParagraph();
paragraph.Format.Alignment = ParagraphAlignment.Center;
var image = paragraph.AddImage(filePath);
@@ -935,43 +688,14 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
Document = pdfDoc,
WorkingDirectory = folderPath
};
LogInfo("Rendering document to PDF file...");
LogInfo("Rendering document...");
pdfRenderer.RenderDocument();
string outputPDFFileName = Path.Join(folderPath, outputFileName);
LogInfo("Saving PDF document to disk...");
LogInfo("Saving document to disk...");
pdfRenderer.PdfDocument.Save(outputPDFFileName);
LogInfo("Finished saving PDF output to: " + outputPDFFileName);
LogInfo("Saved PDF output to: " + outputPDFFileName);
await CreateAndSaveReportObjectAfterReportCreation();
OpenFolderForFileInFileViewer(outputPDFFileName);
IsCreatingPDF = false;
}
public async Task<bool> CheckIsSafeToShutdown()
{
if (!HasUnsavedWork || string.IsNullOrWhiteSpace(WorkingFolder))
{
return true;
}
else
{
var result = await DialogHost.Show(new ShutdownCheckViewModel());
if (result != null && result is ShutdownCheckOptions opt)
{
if (opt == ShutdownCheckOptions.SaveAndShutdown)
{
await SaveInterimReportInfo();
return true;
}
else if (opt == ShutdownCheckOptions.NoSaveShutdown)
{
return true;
}
else if (opt == ShutdownCheckOptions.CancelShutdown)
{
return false;
}
}
}
return false;
}
}
-29
View File
@@ -1,29 +0,0 @@
#nullable enable
using DialogHostAvalonia;
using MayShow.Models;
namespace MayShow.ViewModels;
class ShutdownCheckViewModel
{
public ShutdownCheckViewModel()
{
}
public void SaveAndShutdown()
{
DialogHost.Close("DialogHost", ShutdownCheckOptions.SaveAndShutdown);
}
public void DoNotSaveAndShutdown()
{
DialogHost.Close("DialogHost", ShutdownCheckOptions.NoSaveShutdown);
}
public void CancelShutdown()
{
DialogHost.Close("DialogHost", ShutdownCheckOptions.CancelShutdown);
}
}
+4 -2
View File
@@ -7,8 +7,7 @@
xmlns:models="clr-namespace:MayShow.Models"
xmlns:vm="clr-namespace:MayShow.ViewModels"
xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
x:DataType="vm:AboutViewModel"
MaxWidth="450">
x:DataType="vm:AboutViewModel">
<StackPanel Orientation="Vertical"
Spacing="4">
<TextBlock Text="MayShow"
@@ -17,12 +16,15 @@
FontSize="18"
FontWeight="Bold"/>
<TextBlock Text="MayShow (an intentional misspelling of 明証, pronounced may-shō, a Japanese word meaning proof, evidence, or corroboration) is a PDF report creation tool. It was built by MB for A in 2026. May the quacking of ducks always be in your favor. Thanks for using our software!"
MaxWidth="300"
TextWrapping="Wrap"
FontSize="14"/>
<TextBlock Text="App icon made using https://gauger.me/fonticon/ with FontAwesome icon 'file-invoice-dollar' and the macOS software Icon Composer."
MaxWidth="300"
TextWrapping="Wrap"
FontSize="14"/>
<TextBlock Text="Copyright 2026 - Quickity Quack Productions"
MaxWidth="300"
TextWrapping="Wrap"
HorizontalAlignment="Center"
Margin="0,4,0,4"
-35
View File
@@ -1,35 +0,0 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="MayShow.Views.ConfirmView"
xmlns:models="clr-namespace:MayShow.Models"
xmlns:vm="clr-namespace:MayShow.ViewModels"
x:DataType="vm:ConfirmViewModel">
<StackPanel Orientation="Vertical"
Spacing="4">
<TextBlock TextAlignment="Center"
FontWeight="Bold"
FontSize="18"
Text="{Binding Title}"/>
<TextBlock TextAlignment="Center"
FontWeight="Bold"
TextWrapping="Wrap"
FontSize="14"
MaxWidth="350"
Text="{Binding Message}"/>
<StackPanel Orientation="Horizontal"
Spacing="12"
HorizontalAlignment="Right"
Margin="4">
<Button Command="{Binding Decline}"
Content="{Binding DeclineTitle}"
HorizontalAlignment="Right"/>
<Button Command="{Binding Confirm}"
Classes="accent"
Content="{Binding ConfirmTitle}"
HorizontalAlignment="Right"/>
</StackPanel>
</StackPanel>
</UserControl>
-14
View File
@@ -1,14 +0,0 @@
using System;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace MayShow.Views;
public partial class ConfirmView : UserControl
{
public ConfirmView()
{
this.InitializeComponent();
}
}
+2 -4
View File
@@ -9,8 +9,7 @@
xmlns:models="clr-namespace:MayShow.Models"
xmlns:vm="clr-namespace:MayShow.ViewModels"
xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
x:DataType="vm:EditFileViewModel"
MaxWidth="350">
x:DataType="vm:EditFileViewModel">
<ScrollViewer AllowAutoHide="False">
<StackPanel Orientation="Vertical"
Spacing="4"
@@ -34,8 +33,7 @@
<Label Content="Receipt Date" />
<Calendar SelectionMode="SingleDate"
SelectedDate="{Binding ClonedFile.ReceiptDateTime}"
DisplayDate="{Binding ClonedFile.ReceiptDateTime}"
IsTodayHighlighted="False" />
DisplayDate="{Binding ClonedFile.ReceiptDateTime}" />
<StackPanel Orientation="Horizontal"
Spacing="12"
Margin="0,4,0,0"
+11 -21
View File
@@ -167,7 +167,7 @@
Margin="2"
IsEnabled="{Binding !$parent[DataGrid].((vm:MainViewModel)DataContext).IsCreatingPDF}">
<Button.Content>
<TextBlock><Run Text="&#xf044;" FontFamily="{StaticResource FontAwesomeSolid}"/> Edit</TextBlock>
<TextBlock><Run Text="&#xf1f8;" FontFamily="{StaticResource FontAwesomeSolid}"/> Edit</TextBlock>
</Button.Content>
</Button>
<Button Command="{Binding $parent[DataGrid].((vm:MainViewModel)DataContext).RemoveFile}"
@@ -210,12 +210,6 @@
<TextBlock FontSize="12"><Run Text="&#xf07c;" FontFamily="{StaticResource FontAwesomeSolid}"/> Open File</TextBlock>
</Button.Content>
</Button>
<Button Command="{Binding $parent[DataGrid].((vm:MainViewModel)DataContext).TestReceiptFinding}"
CommandParameter="{Binding}">
<Button.Content>
<TextBlock FontSize="12"><Run Text="&#xf07c;" FontFamily="{StaticResource FontAwesomeSolid}"/> TEST RECEIPT FIND</TextBlock>
</Button.Content>
</Button>
</StackPanel>
</Grid>
</DataTemplate>
@@ -229,31 +223,27 @@
<StackPanel Orientation="Horizontal"
Spacing="4">
<Button Command="{Binding AddItem}"
IsEnabled="{Binding CanAddItem}">
IsEnabled="{Binding !IsCreatingPDF}">
<TextBlock><Run Text="&#x002b;" FontFamily="{StaticResource FontAwesomeSolid}"/> Add Item(s)</TextBlock>
</Button>
<Button Command="{Binding RemoveAllItems}"
IsEnabled="{Binding IsCreatePDFButtonEnabled}"
Classes="Danger">
<TextBlock><Run Text="&#xf1f8;" FontFamily="{StaticResource FontAwesomeSolid}"/> Remove All Items</TextBlock>
</Button>
<Button Command="{Binding ResortPDFItemsByDate}"
IsEnabled="{Binding IsCreatePDFButtonEnabled}">
<TextBlock><Run Text="&#xf162;" FontFamily="{StaticResource FontAwesomeSolid}"/> Re-sort PDF Items</TextBlock>
</Button>
<Button Command="{Binding SaveInterimReportInfo}"
IsEnabled="{Binding HasWorkingFolderAndNotMakingPDF}">
<TextBlock><Run Text="&#xf0c7;" FontFamily="{StaticResource FontAwesomeSolid}"/> Save Report Info</TextBlock>
</Button>
</StackPanel>
<StackPanel Orientation="Horizontal"
Spacing="6"
HorizontalAlignment="Center">
<Button Command="{Binding ResortPDFItemsByDate}"
IsEnabled="{Binding IsCreatePDFButtonEnabled}">
<TextBlock><Run Text="&#xf162;" FontFamily="{StaticResource FontAwesomeSolid}"/> Re-sort PDF Items</TextBlock>
</Button>
<Button Command="{Binding BuildPDF}"
Classes="accent"
IsEnabled="{Binding IsCreatePDFButtonEnabled}">
<TextBlock><Run Text="&#xf1c1;" FontFamily="{StaticResource FontAwesomeSolid}"/> Create Report PDF</TextBlock>
</Button>
</StackPanel>
<StackPanel Orientation="Horizontal"
IsVisible="{Binding IsCreatingPDF}"
Spacing="6"
HorizontalAlignment="Center">
<Label Content="Creating PDF..."
IsVisible="{Binding IsCreatingPDF}"
VerticalAlignment="Center"/>
-14
View File
@@ -3,7 +3,6 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Markup.Xaml;
using MayShow.ViewModels;
namespace MayShow.Views
{
@@ -13,7 +12,6 @@ namespace MayShow.Views
{
this.InitializeComponent();
LogBlock.PropertyChanged += LogBlock_PropertyChanged;
FilesGrid.CellEditEnded += FileCellEditEnded;
}
private void LogBlock_PropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
@@ -28,18 +26,6 @@ namespace MayShow.Views
{
var topLevel = TopLevel.GetTopLevel(this);
topLevel?.FocusManager?.ClearFocus();
if (DataContext is MainViewModel mvm)
{
mvm?.HasUnsavedWork = true;
}
}
private void FileCellEditEnded(object? sender, DataGridCellEditEndedEventArgs args)
{
if (args.EditAction == DataGridEditAction.Commit && DataContext is MainViewModel mvm)
{
mvm?.HasUnsavedWork = true;
}
}
}
}
-39
View File
@@ -1,39 +0,0 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="MayShow.Views.ShutdownCheckView"
xmlns:models="clr-namespace:MayShow.Models"
xmlns:vm="clr-namespace:MayShow.ViewModels"
xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
x:DataType="vm:ShutdownCheckViewModel">
<StackPanel Orientation="Vertical"
Spacing="4">
<TextBlock TextAlignment="Center"
FontWeight="Bold"
FontSize="18"
Text="Warning: You have unsaved report data!"/>
<TextBlock TextAlignment="Center"
FontWeight="Bold"
TextWrapping="Wrap"
FontSize="14"
Text="Do you want to save your data before the program is closed?"/>
<StackPanel Orientation="Horizontal"
Spacing="8">
<Button Command="{Binding SaveAndShutdown}"
Classes="accent"
Content="Save Data and Close"
HorizontalAlignment="Right"
Margin="0,4,0,4"/>
<Button Command="{Binding DoNotSaveAndShutdown}"
Content="Do NOT Save Data and Close"
HorizontalAlignment="Right"
Margin="0,4,0,4"/>
<Button Command="{Binding CancelShutdown}"
Content="Cancel Program Shutdown"
HorizontalAlignment="Right"
Margin="0,4,0,4"/>
</StackPanel>
</StackPanel>
</UserControl>
-14
View File
@@ -1,14 +0,0 @@
using System;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace MayShow.Views;
public partial class ShutdownCheckView : UserControl
{
public ShutdownCheckView()
{
this.InitializeComponent();
}
}
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- This manifest is used on Windows only.
Don't remove it as it might cause problems with window transparency and embedded controls.
For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
<assemblyIdentity version="1.2.0.0" name="MayShow.Desktop"/>
<assemblyIdentity version="1.1.0.0" name="MayShow.Desktop"/>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>