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

Redo image resizing

Browse Source 
Hack fix guesswork sizing
This commit is contained in:
Michael Babienco
2026-03-12 20:21:41 +09:00
parent 5dda88521d
commit 1fae3f5341
1 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ViewModels/MainViewModel.cs
+31 -19
View File
@@ -28,6 +28,7 @@ using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing;
using System.Reflection.Metadata.Ecma335; using System.Reflection.Metadata.Ecma335;
using Docnet.Core.Readers; using Docnet.Core.Readers;
using MigraDoc.DocumentObjectModel.Visitors;
namespace MayShow.ViewModels; namespace MayShow.ViewModels;
@@ -627,7 +628,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
var pdfDoc = new Document(); var pdfDoc = new Document();
var outputFileName = ReportTitle + ".pdf"; var outputFileName = ReportTitle + ".pdf";
var folderName = new DirectoryInfo(folderPath).Name; var folderName = new DirectoryInfo(folderPath).Name;
const int imageWidth = 425; const int maxImageWidth = 425;
var imageLineFormat = new MigraDoc.DocumentObjectModel.Shapes.LineFormat() var imageLineFormat = new MigraDoc.DocumentObjectModel.Shapes.LineFormat()
{ {
Color = Colors.Black, Color = Colors.Black,
@@ -649,12 +650,15 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
} }
var section = pdfDoc.AddSection(); var section = pdfDoc.AddSection();
section.PageSetup.PageFormat = PageFormat.Letter; section.PageSetup.PageFormat = PageFormat.Letter;
section.PageSetup.PageWidth = "8.5in"; const decimal pageWidth = 8.5m;
section.PageSetup.PageHeight = "11in"; const decimal pageHeight = 11.0m;
section.PageSetup.TopMargin = "0.5in"; const decimal margin = 0.5m;
section.PageSetup.RightMargin = "0.5in"; section.PageSetup.PageWidth = pageWidth + "in";
section.PageSetup.BottomMargin = "0.5in"; section.PageSetup.PageHeight = pageHeight + "in";
section.PageSetup.LeftMargin = "0.5in"; section.PageSetup.TopMargin = margin + "in";
section.PageSetup.RightMargin = margin + "in";
section.PageSetup.BottomMargin = margin + "in";
section.PageSetup.LeftMargin = margin + "in";
// setup footer for page number // setup footer for page number
var footerPar = new Paragraph(); var footerPar = new Paragraph();
footerPar.Format.Alignment = ParagraphAlignment.Center; footerPar.Format.Alignment = ParagraphAlignment.Center;
@@ -781,18 +785,26 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
var paragraph = section.AddParagraph(); var paragraph = section.AddParagraph();
paragraph.Format.Alignment = ParagraphAlignment.Center; paragraph.Format.Alignment = ParagraphAlignment.Center;
var image = paragraph.AddImage(filePath); var image = paragraph.AddImage(filePath);
image.LockAspectRatio = true; const int imageResolution = 72;
if (loadedImageHeight > 600) image.Resolution = imageResolution; // dots per inch
{ paragraph.Tag = "ImageParagraphTag";
image.Height = 550; // make sure it will fit on one page //
} //var maxItemPxWidth = ((pageWidth - (2 * margin)) * imageResolution) - 20;
else //var maxItemPxHeight = ((pageHeight - (2 * margin)) * imageResolution) - 20;
//Console.WriteLine("Max width test: {0}; height: {1}", maxItemPxWidth, maxItemPxHeight);
image.LineFormat = imageLineFormat.Clone(); image.LineFormat = imageLineFormat.Clone();
// image.LockAspectRatio = true;
while (loadedImageHeight > 600 || loadedImageWidth > 550)
{ {
image.Width = imageWidth; // can't be too wide now...not sure why...maybe due to margins... // Console.WriteLine("Image height = {0}, width = {1}; decreasing size by 5% to h={2}, w={3}", loadedImageHeight, loadedImageWidth, (uint)Math.Floor(loadedImageHeight * 0.95), (uint)Math.Floor(loadedImageWidth * 0.95));
// keep reducing size by 10% until it fits on the page
loadedImageHeight = (uint)Math.Floor(loadedImageHeight * 0.95);
loadedImageWidth = (uint)Math.Floor(loadedImageWidth * 0.95);
} }
image.Height = loadedImageHeight;
image.Width = loadedImageWidth;
} }
else else // isPDF
{ {
// need to render PDF to images // need to render PDF to images
if (_settings.UseDocnetPDFImageRendering) if (_settings.UseDocnetPDFImageRendering)
@@ -832,7 +844,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
var paragraph = section.AddParagraph(); var paragraph = section.AddParagraph();
paragraph.Format.Alignment = ParagraphAlignment.Center; paragraph.Format.Alignment = ParagraphAlignment.Center;
var image = paragraph.AddImage(convertedPdfImagePath); var image = paragraph.AddImage(convertedPdfImagePath);
image.Width = imageWidth; image.Width = maxImageWidth;
image.LockAspectRatio = true; image.LockAspectRatio = true;
image.LineFormat = imageLineFormat.Clone(); image.LineFormat = imageLineFormat.Clone();
for (var j = 1; j < pgCount; j++) for (var j = 1; j < pgCount; j++)
@@ -843,7 +855,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
convertedPdfImagePath = RenderPdfPageToImage(docReader, j); convertedPdfImagePath = RenderPdfPageToImage(docReader, j);
image = paragraph.AddImage(convertedPdfImagePath); image = paragraph.AddImage(convertedPdfImagePath);
image.LockAspectRatio = true; image.LockAspectRatio = true;
image.Width = imageWidth; image.Width = maxImageWidth;
image.LineFormat = imageLineFormat.Clone(); image.LineFormat = imageLineFormat.Clone();
} }
} }
@@ -855,7 +867,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
paragraph.Format.Alignment = ParagraphAlignment.Center; paragraph.Format.Alignment = ParagraphAlignment.Center;
var image = paragraph.AddImage(filePath); var image = paragraph.AddImage(filePath);
image.LockAspectRatio = true; image.LockAspectRatio = true;
image.Width = imageWidth; // can't be too wide now...not sure why...maybe due to margins... image.Width = maxImageWidth; // can't be too wide now...not sure why...maybe due to margins...
image.LineFormat = imageLineFormat.Clone(); image.LineFormat = imageLineFormat.Clone();
// render other PDF pages, if any // render other PDF pages, if any
// see: https://stackoverflow.com/a/65091204/3938401 // see: https://stackoverflow.com/a/65091204/3938401
@@ -871,7 +883,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
paragraph.Format.Alignment = ParagraphAlignment.Center; paragraph.Format.Alignment = ParagraphAlignment.Center;
image = paragraph.AddImage(filePath + "#" + j); image = paragraph.AddImage(filePath + "#" + j);
image.LockAspectRatio = true; image.LockAspectRatio = true;
image.Width = imageWidth; image.Width = maxImageWidth;
image.LineFormat = imageLineFormat.Clone(); image.LineFormat = imageLineFormat.Clone();
} }
} }