Removed Freehand rotate, didn't get it working and changed the resx files from Version 4 to 2 as this causes problems in Visual C# Express 2010

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1743 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-04-02 17:09:45 +00:00
commit a506c15d18
5 changed files with 27 additions and 31 deletions

View file

@ -592,6 +592,12 @@ namespace Greenshot.Drawing {
Invalidate();
}
public virtual bool CanRotate {
get {
return true;
}
}
public virtual void Rotate(RotateFlipType rotateFlipType) {
// somehow the rotation is the wrong way?
int angle = 90;

View file

@ -169,25 +169,13 @@ namespace Greenshot.Drawing {
myBounds = Rectangle.Round(freehandPath.GetBounds());
}
public override void Rotate(RotateFlipType rotateFlipType) {
int angle = 270;
if (rotateFlipType == RotateFlipType.Rotate90FlipNone) {
angle = 90;
/// <summary>
/// Currently we can't rotate the freehand
/// </summary>
public override bool CanRotate {
get {
return false;
}
LOG.DebugFormat("Bounds before: {0} - {1}", Bounds, freehandPath.GetBounds());
Matrix rotateMatrix = new Matrix();
rotateMatrix.Translate(-(parent.Width >> 1), -(parent.Height >> 1));
freehandPath.Transform(rotateMatrix);
rotateMatrix = new Matrix();
rotateMatrix.Rotate(360 - angle);
freehandPath.Transform(rotateMatrix);
rotateMatrix = new Matrix();
rotateMatrix.Translate(parent.Height >> 1, parent.Width >> 1);
freehandPath.Transform(rotateMatrix);
LOG.DebugFormat("Bounds after: {0} - {1}", Bounds, freehandPath.GetBounds());
//base.Rotate(rotateFlipType);
}
/// <summary>

View file

@ -582,7 +582,9 @@ namespace Greenshot.Drawing {
rotateFlipType = RotateFlipType.Rotate90FlipNone;
}
foreach (DrawableContainer drawableContainer in elements) {
drawableContainer.Rotate(rotateFlipType);
if (drawableContainer.CanRotate) {
drawableContainer.Rotate(rotateFlipType);
}
}
newImage = ImageHelper.RotateFlip((Bitmap)Image, rotateFlipType);
break;