github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-21 22:13:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed the autocrop to be able to take a rectangle specifying the area where it has to look. In this case, we take the CropRectangle where there was any.

Browse source
This commit is contained in:
Robin Krom 2022-03-12 22:19:31 +01:00
commit 29f93cfacf
No known key found for this signature in database
GPG key ID: BCC01364F1371490
3 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/Greenshot.Base/Core/ImageHelper.cs
View file

@ -190,12 +190,14 @@ namespace Greenshot.Base.Core
/// <summary>
/// Private helper method for the FindAutoCropRectangle
/// </summary>
/// <param name="fastBitmap"></param>
/// <param name="colorPoint"></param>
/// <param name="cropDifference"></param>
/// <param name="fastBitmap">IFastBitmap</param>
/// <param name="colorPoint">Point</param>
/// <param name="cropDifference">int</param>
/// <param name="area">Rectangle with optional area to scan in</param>
/// <returns>Rectangle</returns>
private static Rectangle FindAutoCropRectangle(IFastBitmap fastBitmap, Point colorPoint, int cropDifference)
private static Rectangle FindAutoCropRectangle(IFastBitmap fastBitmap, Point colorPoint, int cropDifference, Rectangle? area = null)
{
area ??= new Rectangle(0, 0, fastBitmap.Width, fastBitmap.Height);
Rectangle cropRectangle = Rectangle.Empty;
Color referenceColor = fastBitmap.GetColorAt(colorPoint.X, colorPoint.Y);
Point min = new Point(int.MaxValue, int.MaxValue);
@ -203,9 +205,9 @@ namespace Greenshot.Base.Core
if (cropDifference > 0)
{
for (int y = 0; y < fastBitmap.Height; y++)
for (int y = area.Value.Top; y < area.Value.Bottom; y++)
{
for (int x = 0; x < fastBitmap.Width; x++)
for (int x = area.Value.Left; x < area.Value.Right; x++)
{
Color currentColor = fastBitmap.GetColorAt(x, y);
int diffR = Math.Abs(currentColor.R - referenceColor.R);
@ -225,9 +227,9 @@ namespace Greenshot.Base.Core
}
else
{
for (int y = 0; y < fastBitmap.Height; y++)
for (int y = area.Value.Top; y < area.Value.Bottom; y++)
{
for (int x = 0; x < fastBitmap.Width; x++)
for (int x = area.Value.Left; x < area.Value.Right; x++)
{
Color currentColor = fastBitmap.GetColorAt(x, y);
if (!referenceColor.Equals(currentColor))
@ -243,7 +245,7 @@ namespace Greenshot.Base.Core
}
}
if (!(Point.Empty.Equals(min) && max.Equals(new Point(fastBitmap.Width - 1, fastBitmap.Height - 1))))
if (!(Point.Empty.Equals(min) && max.Equals(new Point(area.Value.Width - 1, area.Value.Height - 1))))
{
if (!(min.X == int.MaxValue || min.Y == int.MaxValue || max.X == int.MinValue || min.X == int.MinValue))
{
@ -257,18 +259,20 @@ namespace Greenshot.Base.Core
/// <summary>
/// Get a rectangle for the image which crops the image of all colors equal to that on 0,0
/// </summary>
/// <param name="image"></param>
/// <param name="cropDifference"></param>
/// <param name="image">Image</param>
/// <param name="cropDifference">int</param>
/// <param name="area">Rectangle with optional area</param>
/// <returns>Rectangle</returns>
public static Rectangle FindAutoCropRectangle(Image image, int cropDifference)
public static Rectangle FindAutoCropRectangle(Image image, int cropDifference, Rectangle? area = null)
{
area ??= new Rectangle(0, 0, image.Width, image.Height);
Rectangle cropRectangle = Rectangle.Empty;
var checkPoints = new List<Point>
{
new Point(0, 0),
new Point(0, image.Height - 1),
new Point(image.Width - 1, 0),
new Point(image.Width - 1, image.Height - 1)
new Point(area.Value.Left, area.Value.Top),
new Point(area.Value.Left, area.Value.Bottom - 1),
new Point(area.Value.Right - 1, area.Value.Top),
new Point(area.Value.Right - 1, area.Value.Bottom - 1)
};
// Top Left
// Bottom Left
@ -279,7 +283,7 @@ namespace Greenshot.Base.Core
// find biggest area
foreach (Point checkPoint in checkPoints)
{
var currentRectangle = FindAutoCropRectangle(fastBitmap, checkPoint, cropDifference);
var currentRectangle = FindAutoCropRectangle(fastBitmap, checkPoint, cropDifference, area);
if (currentRectangle.Width * currentRectangle.Height > cropRectangle.Width * cropRectangle.Height)
{
cropRectangle = currentRectangle;
@ -295,7 +299,7 @@ namespace Greenshot.Base.Core
/// </summary>
/// <param name="sourceImage">Bitmap</param>
/// <param name="effect">IEffect</param>
/// <param name="matrix"></param>
/// <param name="matrix">Matrix</param>
/// <returns>Bitmap</returns>
public static Image ApplyEffect(Image sourceImage, IEffect effect, Matrix matrix)
{

7
src/Greenshot.Editor/Drawing/Surface.cs
View file

@ -973,13 +973,14 @@ namespace Greenshot.Editor.Drawing
/// <summary>
/// Auto crop the image
/// </summary>
/// <param name="cropArea">Rectangle with optional area to find a crop region</param>
/// <returns>true if cropped</returns>
public bool AutoCrop()
public bool AutoCrop(Rectangle? cropArea = null)
{
Rectangle cropRectangle;
using (Image tmpImage = GetImageForExport())
{
cropRectangle = ImageHelper.FindAutoCropRectangle(tmpImage, conf.AutoCropDifference);
cropRectangle = ImageHelper.FindAutoCropRectangle(tmpImage, conf.AutoCropDifference, cropArea);
}
if (!IsCropPossible(ref cropRectangle, CropContainer.CropModes.AutoCrop))
@ -1062,7 +1063,7 @@ namespace Greenshot.Editor.Drawing
/// check if a crop is possible
/// </summary>
/// <param name="cropRectangle">Rectangle adapted to the dimensions of the image</param>
/// <param name="cropMode"></param>
/// <param name="cropMode">CropModes</param>
/// <returns>true if this is possible</returns>
public bool IsCropPossible(ref Rectangle cropRectangle, CropContainer.CropModes cropMode)
{

5
src/Greenshot.Editor/Forms/ImageEditorForm.cs
View file

@ -25,6 +25,7 @@ using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
using System.IO;
using System.Linq;
using System.Threading;
using System.Windows.Forms;
using Greenshot.Base;
@ -1598,12 +1599,14 @@ namespace Greenshot.Editor.Forms
private void InitCropMode(CropContainer.CropModes mode)
{
var cropArea = _surface.Elements.FirstOrDefault(c => c is CropContainer)?.Bounds;
_surface.DrawingMode = DrawingModes.None;
_surface.RemoveCropContainer();
if (mode == CropContainer.CropModes.AutoCrop)
{
if (!_surface.AutoCrop())
if (!_surface.AutoCrop(cropArea))
{
//not AutoCrop possible automatic switch to default crop mode
_surface.DrawingMode = DrawingModes.Crop;