Compare commits
1 Commits
fix/659
...
fix/win2d-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a1463dfeb9 |
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
|
||||
using Microsoft.Graphics.Canvas;
|
||||
using Microsoft.Graphics.Canvas.Printing;
|
||||
using Windows.Data.Pdf;
|
||||
using Windows.Graphics.Display;
|
||||
using Windows.Graphics.Printing;
|
||||
using Windows.Graphics.Printing.OptionDetails;
|
||||
using Windows.Storage.Streams;
|
||||
@@ -135,6 +136,11 @@ public class PrintService : IPrintService
|
||||
|
||||
private async void OnDocumentTaskOptionsChanged(CanvasPrintDocument sender, CanvasPrintTaskOptionsChangedEventArgs args)
|
||||
{
|
||||
System.Diagnostics.Debug.WriteLine("[PrintService] OnDocumentTaskOptionsChanged starting...");
|
||||
DisplayInformation di = DisplayInformation.GetForCurrentView();
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] DisplayInformation.RawPixelsPerViewPixel: {di.RawPixelsPerViewPixel}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] DisplayInformation.LogicalDpi: {di.LogicalDpi}");
|
||||
|
||||
var deferral = args.GetDeferral();
|
||||
|
||||
try
|
||||
@@ -142,6 +148,10 @@ public class PrintService : IPrintService
|
||||
await LoadPDFPageBitmapsAsync(sender);
|
||||
|
||||
var pageDesc = args.PrintTaskOptions.GetPageDescription(1);
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] pageDesc.PageSize.Width (DIPs): {pageDesc.PageSize.Width}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] pageDesc.PageSize.Height (DIPs): {pageDesc.PageSize.Height}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] pageDesc.DpiX: {pageDesc.DpiX}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] pageDesc.DpiY: {pageDesc.DpiY}");
|
||||
var newPageSize = pageDesc.PageSize.ToVector2();
|
||||
|
||||
if (pageSize == newPageSize && pageCount != -1)
|
||||
@@ -176,6 +186,10 @@ public class PrintService : IPrintService
|
||||
// Calculate the page count
|
||||
bitmapCount = bitmaps.Count;
|
||||
pageCount = (int)Math.Ceiling(bitmapCount / (double)bitmapsPerPage);
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Calculated columns: {columns}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Calculated rows: {rows}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Calculated bitmapsPerPage: {bitmapsPerPage}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Calculated pageCount: {pageCount}");
|
||||
sender.SetPageCount((uint)pageCount);
|
||||
|
||||
// Set the preview page to the one that has the item that was currently displayed in the last preview
|
||||
@@ -185,11 +199,31 @@ public class PrintService : IPrintService
|
||||
{
|
||||
deferral.Complete();
|
||||
}
|
||||
System.Diagnostics.Debug.WriteLine("[PrintService] OnDocumentTaskOptionsChanged finished.");
|
||||
}
|
||||
|
||||
|
||||
private async Task LoadPDFPageBitmapsAsync(CanvasPrintDocument sender)
|
||||
{
|
||||
System.Diagnostics.Debug.WriteLine("[PrintService] LoadPDFPageBitmapsAsync starting...");
|
||||
DisplayInformation displayInfo = DisplayInformation.GetForCurrentView();
|
||||
float rawPixelsPerViewPixel = (float)displayInfo.RawPixelsPerViewPixel;
|
||||
if (rawPixelsPerViewPixel == 0)
|
||||
{
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Warning: RawPixelsPerViewPixel was 0, defaulting to 1.0f");
|
||||
rawPixelsPerViewPixel = 1.0f; // Sanity check
|
||||
}
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] DisplayInformation.RawPixelsPerViewPixel: {rawPixelsPerViewPixel}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] DisplayInformation.LogicalDpi: {displayInfo.LogicalDpi}");
|
||||
|
||||
float printerDpi = sender.Dpi;
|
||||
if (printerDpi == 0)
|
||||
{
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Warning: sender.Dpi (printerDpi) was 0, defaulting to 96.0f");
|
||||
printerDpi = 96.0f; // Sanity check
|
||||
}
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] sender.Dpi (CanvasPrintDocument.Dpi, used as PrinterDPI): {printerDpi}");
|
||||
|
||||
ClearBitmaps();
|
||||
|
||||
bitmaps ??= new List<CanvasBitmap>();
|
||||
@@ -197,10 +231,39 @@ public class PrintService : IPrintService
|
||||
for (int i = 0; i < pdfDocument.PageCount; i++)
|
||||
{
|
||||
var page = pdfDocument.GetPage((uint)i);
|
||||
var stream = new InMemoryRandomAccessStream();
|
||||
await page.RenderToStreamAsync(stream);
|
||||
var bitmap = await CanvasBitmap.LoadAsync(sender, stream);
|
||||
bitmaps.Add(bitmap);
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Processing page.Index: {page.Index}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] page.Dimensions.MediaBox.Width (PDF points): {page.Dimensions.MediaBox.Width}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] page.Dimensions.MediaBox.Height (PDF points): {page.Dimensions.MediaBox.Height}");
|
||||
|
||||
double pageWidthInPoints = page.Dimensions.MediaBox.Width;
|
||||
double pageHeightInPoints = page.Dimensions.MediaBox.Height;
|
||||
|
||||
double pageWidthInInches = pageWidthInPoints / 72.0;
|
||||
double pageHeightInInches = pageHeightInPoints / 72.0;
|
||||
|
||||
// Calculate the desired pixel dimensions of the bitmap based on printer DPI
|
||||
uint targetPixelWidth = (uint)(pageWidthInInches * printerDpi);
|
||||
uint targetPixelHeight = (uint)(pageHeightInInches * printerDpi);
|
||||
|
||||
// Calculate DestinationWidth/Height for PdfPageRenderOptions in DIPs
|
||||
PdfPageRenderOptions options = new PdfPageRenderOptions();
|
||||
options.DestinationWidth = (uint)(targetPixelWidth / rawPixelsPerViewPixel);
|
||||
options.DestinationHeight = (uint)(targetPixelHeight / rawPixelsPerViewPixel);
|
||||
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Page {i}, Calculated PdfPageRenderOptions.DestinationWidth (DIPs): {options.DestinationWidth}, DestinationHeight (DIPs): {options.DestinationHeight}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Page {i}, TargetPixelWidth: {targetPixelWidth}, TargetPixelHeight: {targetPixelHeight}");
|
||||
|
||||
using (var stream = new InMemoryRandomAccessStream())
|
||||
{
|
||||
await page.RenderToStreamAsync(stream, options); // Use the options
|
||||
var bitmap = await CanvasBitmap.LoadAsync(sender, stream);
|
||||
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] bitmap.SizeInPixels.Width: {bitmap.SizeInPixels.Width}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] bitmap.SizeInPixels.Height: {bitmap.SizeInPixels.Height}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] bitmap.Dpi: {bitmap.Dpi}");
|
||||
|
||||
bitmaps.Add(bitmap);
|
||||
}
|
||||
}
|
||||
|
||||
largestBitmap = Vector2.Zero;
|
||||
@@ -210,6 +273,7 @@ public class PrintService : IPrintService
|
||||
largestBitmap.X = Math.Max(largestBitmap.X, (float)bitmap.Size.Width);
|
||||
largestBitmap.Y = Math.Max(largestBitmap.Y, (float)bitmap.Size.Height);
|
||||
}
|
||||
System.Diagnostics.Debug.WriteLine("[PrintService] LoadPDFPageBitmapsAsync finished.");
|
||||
}
|
||||
|
||||
|
||||
@@ -262,4 +326,153 @@ public class PrintService : IPrintService
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// --- START SIMULATION CODE ---
|
||||
private async Task RunSimulationAsync(float simulatedRawPixelsPerViewPixel, string callingMethodName)
|
||||
{
|
||||
// --- Simulate LoadPDFPageBitmapsAsync ---
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] SIMULATING from {callingMethodName} for {simulatedRawPixelsPerViewPixel}");
|
||||
System.Diagnostics.Debug.WriteLine("[PrintService] LoadPDFPageBitmapsAsync starting...");
|
||||
|
||||
// Mock DisplayInformation
|
||||
float actualRawPixelsPerViewPixel = simulatedRawPixelsPerViewPixel; // Override
|
||||
if (actualRawPixelsPerViewPixel == 0)
|
||||
{
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Warning: actualRawPixelsPerViewPixel was 0, defaulting to 1.0f");
|
||||
actualRawPixelsPerViewPixel = 1.0f; // Sanity check
|
||||
}
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] DisplayInformation.RawPixelsPerViewPixel: {actualRawPixelsPerViewPixel}");
|
||||
// LogicalDpi is not directly used in calculations we are testing, so we can use a placeholder.
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] DisplayInformation.LogicalDpi: 96.0f (Simulated)");
|
||||
|
||||
|
||||
// Mock CanvasPrintDocument sender for DPI
|
||||
float printerDpi = 300.0f; // As per subtask
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] sender.Dpi (CanvasPrintDocument.Dpi, used as PrinterDPI): {printerDpi}");
|
||||
|
||||
// Clear any previous simulation state for bitmaps
|
||||
// In a real scenario, ClearBitmaps() would be called. Here we just reset relevant fields.
|
||||
this.bitmaps.Clear(); // Assuming 'bitmaps' is the List<CanvasBitmap>
|
||||
this.largestBitmap = Vector2.Zero;
|
||||
|
||||
|
||||
// Simulate pdfDocument.PageCount = 1 and loop once
|
||||
int simulatedPageCount = 1;
|
||||
for (int i = 0; i < simulatedPageCount; i++)
|
||||
{
|
||||
// Mock PdfPage
|
||||
uint pageIndex = (uint)i;
|
||||
double pageWidthInPoints = 612.0; // Letter size
|
||||
double pageHeightInPoints = 792.0; // Letter size
|
||||
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Processing page.Index: {pageIndex}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] page.Dimensions.MediaBox.Width (PDF points): {pageWidthInPoints}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] page.Dimensions.MediaBox.Height (PDF points): {pageHeightInPoints}");
|
||||
|
||||
double pageWidthInInches = pageWidthInPoints / 72.0;
|
||||
double pageHeightInInches = pageHeightInPoints / 72.0;
|
||||
|
||||
uint targetPixelWidth = (uint)(pageWidthInInches * printerDpi);
|
||||
uint targetPixelHeight = (uint)(pageHeightInInches * printerDpi);
|
||||
|
||||
PdfPageRenderOptions options = new PdfPageRenderOptions();
|
||||
options.DestinationWidth = (uint)(targetPixelWidth / actualRawPixelsPerViewPixel);
|
||||
options.DestinationHeight = (uint)(targetPixelHeight / actualRawPixelsPerViewPixel);
|
||||
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Page {i}, Calculated PdfPageRenderOptions.DestinationWidth (DIPs): {options.DestinationWidth}, DestinationHeight (DIPs): {options.DestinationHeight}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Page {i}, TargetPixelWidth: {targetPixelWidth}, TargetPixelHeight: {targetPixelHeight}");
|
||||
|
||||
// Mock CanvasBitmap properties (as we can't actually render)
|
||||
uint mockBitmapSizeInPixelsWidth = targetPixelWidth;
|
||||
uint mockBitmapSizeInPixelsHeight = targetPixelHeight;
|
||||
float mockBitmapDpi = printerDpi;
|
||||
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] bitmap.SizeInPixels.Width: {mockBitmapSizeInPixelsWidth} (Simulated)");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] bitmap.SizeInPixels.Height: {mockBitmapSizeInPixelsHeight} (Simulated)");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] bitmap.Dpi: {mockBitmapDpi} (Simulated)");
|
||||
|
||||
// Simulate adding to bitmaps list and tracking largest
|
||||
// We don't add a real CanvasBitmap, just update what's needed for OnDocumentTaskOptionsChanged
|
||||
this.largestBitmap.X = Math.Max(this.largestBitmap.X, mockBitmapSizeInPixelsWidth);
|
||||
this.largestBitmap.Y = Math.Max(this.largestBitmap.Y, mockBitmapSizeInPixelsHeight);
|
||||
// bitmaps.Add(null); // Not adding real bitmaps
|
||||
}
|
||||
this.bitmapCount = simulatedPageCount; // Set based on simulation
|
||||
|
||||
System.Diagnostics.Debug.WriteLine("[PrintService] LoadPDFPageBitmapsAsync finished.");
|
||||
|
||||
// --- Simulate OnDocumentTaskOptionsChanged ---
|
||||
System.Diagnostics.Debug.WriteLine("[PrintService] OnDocumentTaskOptionsChanged starting...");
|
||||
// DisplayInformation logs already done in LoadPDFPageBitmapsAsync simulation part
|
||||
|
||||
// Mock PageDescription (from PrintTaskOptions)
|
||||
// For Letter paper (8.5x11 inches) at 300 DPI:
|
||||
// Pixel size = (8.5*300) x (11*300) = 2550 x 3300 pixels
|
||||
// DIP size = (PixelSize / rawPixelsPerViewPixel)
|
||||
float pageDescPageSizeWidth = (2550.0f / actualRawPixelsPerViewPixel);
|
||||
float pageDescPageSizeHeight = (3300.0f / actualRawPixelsPerViewPixel);
|
||||
float pageDescDpiX = 300.0f;
|
||||
float pageDescDpiY = 300.0f;
|
||||
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] pageDesc.PageSize.Width (DIPs): {pageDescPageSizeWidth} (Simulated)");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] pageDesc.PageSize.Height (DIPs): {pageDescPageSizeHeight} (Simulated)");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] pageDesc.DpiX: {pageDescDpiX} (Simulated)");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] pageDesc.DpiY: {pageDescDpiY} (Simulated)");
|
||||
|
||||
this.pageSize = new Vector2(pageDescPageSizeWidth, pageDescPageSizeHeight);
|
||||
// sender.InvalidatePreview(); // Cannot call
|
||||
|
||||
// Calculate the new layout
|
||||
var printablePageSize = this.pageSize * 0.9f; // Assuming default behavior
|
||||
this.imagePadding = new Vector2(64, 64); // Default from class
|
||||
this.cellSize = this.largestBitmap + this.imagePadding;
|
||||
|
||||
var cellsPerPage = printablePageSize / this.cellSize;
|
||||
|
||||
this.columns = Math.Max(1, (int)Math.Floor(cellsPerPage.X));
|
||||
this.rows = Math.Max(1, (int)Math.Floor(cellsPerPage.Y));
|
||||
this.bitmapsPerPage = this.columns * this.rows;
|
||||
this.pageCount = (int)Math.Ceiling(this.bitmapCount / (double)this.bitmapsPerPage);
|
||||
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Calculated columns: {this.columns}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Calculated rows: {this.rows}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Calculated bitmapsPerPage: {this.bitmapsPerPage}");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] Calculated pageCount: {this.pageCount}");
|
||||
// sender.SetPageCount((uint)this.pageCount); // Cannot call
|
||||
|
||||
System.Diagnostics.Debug.WriteLine("[PrintService] OnDocumentTaskOptionsChanged finished.");
|
||||
System.Diagnostics.Debug.WriteLine($"[PrintService] SIMULATION END for {simulatedRawPixelsPerViewPixel}");
|
||||
System.Diagnostics.Debug.WriteLine("---"); // Separator
|
||||
}
|
||||
|
||||
public async Task SimulatePrintScalingAsync()
|
||||
{
|
||||
// Temporarily store and clear global state that might interfere
|
||||
var originalBitmaps = new List<CanvasBitmap>(this.bitmaps);
|
||||
var originalLargestBitmap = this.largestBitmap;
|
||||
var originalPageSize = this.pageSize;
|
||||
var originalCellSize = this.cellSize;
|
||||
int originalBitmapCount = this.bitmapCount;
|
||||
int originalColumns = this.columns;
|
||||
int originalRows = this.rows;
|
||||
int originalBitmapsPerPage = this.bitmapsPerPage;
|
||||
int originalPageCount = this.pageCount;
|
||||
|
||||
|
||||
await RunSimulationAsync(1.0f, nameof(SimulatePrintScalingAsync));
|
||||
await RunSimulationAsync(1.25f, nameof(SimulatePrintScalingAsync));
|
||||
await RunSimulationAsync(1.5f, nameof(SimulatePrintScalingAsync));
|
||||
|
||||
// Restore original state if necessary, though for this task it's just about logs
|
||||
this.bitmaps = originalBitmaps;
|
||||
this.largestBitmap = originalLargestBitmap;
|
||||
this.pageSize = originalPageSize;
|
||||
this.cellSize = originalCellSize;
|
||||
this.bitmapCount = originalBitmapCount;
|
||||
this.columns = originalColumns;
|
||||
this.rows = originalRows;
|
||||
this.bitmapsPerPage = originalBitmapsPerPage;
|
||||
this.pageCount = originalPageCount;
|
||||
}
|
||||
// --- END SIMULATION CODE ---
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user