mbabienco/MayShow
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Small code tweaks for readability

Browse Source
This commit is contained in:
Michael Babienco
2026-04-03 10:06:14 +09:00
parent 3e0852ead9
commit a2452e2585
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MayShow.Shared/Models/ReportPDFCreator.cs
+10 -10
View File
@@ -84,10 +84,10 @@ class ReportPDFCreator : ChangeNotifier
} }
// https://forum.pdfsharp.net/viewtopic.php?f=2&t=1025 // https://forum.pdfsharp.net/viewtopic.php?f=2&t=1025
public async Task<string?> CreatePDF(List<ReportFile> reportFiles, string reportTitle, string folderPath, PDFFontResolver fontResolver, Settings appSettings) public async Task<string?> CreatePDF(List<ReportFile> reportFiles, string reportTitle, string workingDirPath, PDFFontResolver fontResolver, Settings appSettings)
{ {
// safety checks // safety checks
var outputDir = appSettings.SaveOutputPdfInWorkingDir ? folderPath : appSettings.OutputPdfDir; var outputDir = appSettings.SaveOutputPdfInWorkingDir ? workingDirPath : appSettings.OutputPdfDir;
if (!Directory.Exists(outputDir)) if (!Directory.Exists(outputDir))
{ {
await DialogHost.Show(new WarningViewModel("Output directory not found! Please adjust your application Settings before continuing. Output directory: " + outputDir)); await DialogHost.Show(new WarningViewModel("Output directory not found! Please adjust your application Settings before continuing. Output directory: " + outputDir));
@@ -96,6 +96,7 @@ class ReportPDFCreator : ChangeNotifier
// setup globals and consts... // setup globals and consts...
GlobalFontSettings.FontResolver = fontResolver; GlobalFontSettings.FontResolver = fontResolver;
GlobalFontSettings.FallbackFontResolver = new FailsafeFontResolver(); GlobalFontSettings.FallbackFontResolver = new FailsafeFontResolver();
const int maxImageWidth = 425;
const decimal pageWidth = 8.5m; const decimal pageWidth = 8.5m;
const decimal pageHeight = 11.0m; const decimal pageHeight = 11.0m;
const decimal margin = 0.5m; const decimal margin = 0.5m;
@@ -103,17 +104,15 @@ class ReportPDFCreator : ChangeNotifier
const int imageInsertMarginPixels = 30; // we calculate max available; use max - this # for max image size const int imageInsertMarginPixels = 30; // we calculate max available; use max - this # for max image size
const decimal reduceImageSizeAmount = 0.95m; const decimal reduceImageSizeAmount = 0.95m;
var maxItemPxWidth = ((pageWidth - (2 * margin)) * imageResolution) - imageInsertMarginPixels; var maxItemPxWidth = ((pageWidth - (2 * margin)) * imageResolution) - imageInsertMarginPixels;
// start making PDF!
var pdfDoc = new Document();
var outputFileName = reportTitle + ".pdf";
var folderName = new DirectoryInfo(folderPath).Name;
const int maxImageWidth = 425;
var convertedDir = Utilities.GetTempConvertedImagesFolderPath();
var imageLineFormat = new MigraDoc.DocumentObjectModel.Shapes.LineFormat() var imageLineFormat = new MigraDoc.DocumentObjectModel.Shapes.LineFormat()
{ {
Color = Colors.Black, Color = Colors.Black,
Width = Unit.FromPoint(2), Width = Unit.FromPoint(2),
};; };;
// start making PDF!
var outputFileName = reportTitle + ".pdf";
var convertedDir = Utilities.GetTempConvertedImagesFolderPath();
var folderName = new DirectoryInfo(workingDirPath).Name;
if (folderName.Contains('-')) if (folderName.Contains('-'))
{ {
// see if year/month format // see if year/month format
@@ -128,7 +127,8 @@ class ReportPDFCreator : ChangeNotifier
_logger?.LogInfo("Auto-changed output file name to " + outputFileName); _logger?.LogInfo("Auto-changed output file name to " + outputFileName);
} }
} }
// setup initial section (for page characteristics) // create doc and setup initial section (for page characteristics)
var pdfDoc = new Document();
var section = pdfDoc.AddSection(); var section = pdfDoc.AddSection();
section.PageSetup.PageFormat = PageFormat.Letter; section.PageSetup.PageFormat = PageFormat.Letter;
section.PageSetup.PageWidth = pageWidth + "in"; section.PageSetup.PageWidth = pageWidth + "in";
@@ -171,7 +171,7 @@ class ReportPDFCreator : ChangeNotifier
var pdfRenderer = new PdfDocumentRenderer var pdfRenderer = new PdfDocumentRenderer
{ {
Document = pdfDoc, Document = pdfDoc,
WorkingDirectory = folderPath WorkingDirectory = workingDirPath
}; };
var hasAddedData = false; var hasAddedData = false;
for (var i = 0; i < reportFiles.Count; i++) for (var i = 0; i < reportFiles.Count; i++)