jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: image montage layout

Browse Source
This commit is contained in:
Gary Sharp
2022-12-15 16:08:24 +11:00
parent 584bc07824
commit 7194dd612d
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Expressions/Extensions/ImageResultImplementations/FileMontageImageExpressionResult.cs
+2 -3
View File
@@ -91,8 +91,7 @@ namespace Disco.Services.Expressions.Extensions.ImageResultImplementations
if (MontageHorizontalLayout) if (MontageHorizontalLayout)
DoHorizontalLayout(images, montageGraphics); DoHorizontalLayout(images, montageGraphics);
else else if (MontageVerticalLayout)
if (MontageVerticalLayout)
DoVirticalLayout(images, montageGraphics); DoVirticalLayout(images, montageGraphics);
else else
DoTableLayout(images, montageGraphics); DoTableLayout(images, montageGraphics);
@@ -164,7 +163,7 @@ namespace Disco.Services.Expressions.Extensions.ImageResultImplementations
{ {
var image = Images[imageIndex]; var image = Images[imageIndex];
var cellPoint = new PointF((cellSize.Width * columnIndex) + (Padding * columnIndex), (cellSize.Height * rowIndex) + (Padding * rowIndex)); var cellPoint = new PointF((cellSize.Width * columnIndex) + (Padding * columnIndex), (cellSize.Height * rowIndex) + (Padding * rowIndex));
MontageGraphics.Clip = new Region(new RectangleF(cellPoint, cellSize)); MontageGraphics.SetClip(new RectangleF(cellPoint, cellSize));
MontageGraphics.DrawImageResized(image); MontageGraphics.DrawImageResized(image);
imageIndex++; imageIndex++;
} }
Disco.Services/Extensions/ImagingExtensions.cs
+4 -5
View File
@@ -108,7 +108,7 @@ namespace Disco.Services
public static RectangleF CalculateResize(int SourceWidth, int SourceHeight, int TargetWidth, int TargetHeight, out float scaleRatio) public static RectangleF CalculateResize(int SourceWidth, int SourceHeight, int TargetWidth, int TargetHeight, out float scaleRatio)
{ {
scaleRatio = Math.Min((float)(TargetWidth) / SourceWidth, (float)(TargetHeight) / SourceHeight); scaleRatio = Math.Min((float)TargetWidth / SourceWidth, (float)TargetHeight / SourceHeight);
float width = SourceWidth * scaleRatio, float width = SourceWidth * scaleRatio,
height = SourceHeight * scaleRatio, height = SourceHeight * scaleRatio,
@@ -126,9 +126,7 @@ namespace Disco.Services
public static RectangleF CalculateResize(int SourceWidth, int SourceHeight, int TargetWidth, int TargetHeight) public static RectangleF CalculateResize(int SourceWidth, int SourceHeight, int TargetWidth, int TargetHeight)
{ {
float scaleRatio; return CalculateResize(SourceWidth, SourceHeight, TargetWidth, TargetHeight, out _);
return CalculateResize(SourceWidth, SourceHeight, TargetHeight, TargetHeight, out scaleRatio);
} }
public static RectangleF CalculateResize(this Image Source, int TargetWidth, int TargetHeight, out float scaleRatio) public static RectangleF CalculateResize(this Image Source, int TargetWidth, int TargetHeight, out float scaleRatio)
@@ -138,13 +136,14 @@ namespace Disco.Services
public static RectangleF CalculateResize(this Image Source, int TargetWidth, int TargetHeight) public static RectangleF CalculateResize(this Image Source, int TargetWidth, int TargetHeight)
{ {
return CalculateResize(Source.Width, Source.Height, TargetHeight, TargetHeight); return CalculateResize(Source.Width, Source.Height, TargetWidth, TargetHeight);
} }
public static void DrawImageResized(this Graphics graphics, Image SourceImage) public static void DrawImageResized(this Graphics graphics, Image SourceImage)
{ {
RectangleF clipBounds = graphics.VisibleClipBounds; RectangleF clipBounds = graphics.VisibleClipBounds;
var resizeBounds = SourceImage.CalculateResize((int)clipBounds.Width, (int)clipBounds.Height); var resizeBounds = SourceImage.CalculateResize((int)clipBounds.Width, (int)clipBounds.Height);
resizeBounds.Offset(clipBounds.Location);
graphics.DrawImage(SourceImage, resizeBounds, new RectangleF(0, 0, SourceImage.Width, SourceImage.Height), GraphicsUnit.Pixel); graphics.DrawImage(SourceImage, resizeBounds, new RectangleF(0, 0, SourceImage.Width, SourceImage.Height), GraphicsUnit.Pixel);
} }