Inspector orientation label and PGOrientation improvements.

Author: btrask

PGAppKitAdditions.m

@@ -158,7 +158,7 @@ @implementation NSImageRep(PGAppKitAdditions)
 - (id)PG_thumbnailWithMaxSize:(NSSize)size orientation:(PGOrientation)orientation opaque:(BOOL)opaque
 {
 	if(!self) return nil;
-	NSSize const originalSize = PGRotated90CC & orientation ? NSMakeSize([self pixelsHigh], [self pixelsWide]) : NSMakeSize([self pixelsWide], [self pixelsHigh]);
+	NSSize const originalSize = PGRotated90CCW & orientation ? NSMakeSize([self pixelsHigh], [self pixelsWide]) : NSMakeSize([self pixelsWide], [self pixelsHigh]);
 	NSSize const s = PGIntegralSize(PGScaleSizeByFloat(originalSize, MIN(1.0f, MIN(size.width / originalSize.width, size.height / originalSize.height))));
 	NSBitmapImageRep *const thumbRep = [[[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:s.width pixelsHigh:s.height bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:0 bitsPerPixel:0] autorelease];
 	if(!thumbRep) return nil;

PGDisplayController.m

@@ -882,7 +882,7 @@ - (NSSize)_sizeForImageRep:(NSImageRep *)rep orientation:(PGOrientation)orientat
 {
 	if(!rep) return NSZeroSize;
 	NSSize originalSize = PGActualSizeWithDPI == scaleMode ? [rep size] : NSMakeSize([rep pixelsWide], [rep pixelsHigh]);
-	if(orientation & PGRotated90CC) {
+	if(orientation & PGRotated90CCW) {
 		CGFloat const w = originalSize.width;
 		originalSize.width = originalSize.height;
 		originalSize.height = w;
@@ -1349,9 +1349,9 @@ - (void)clipViewGestureDidEnd:(PGClipView *)sender
 	PGOrientation o;
 	switch((NSInteger)round((deg + 360.0f) / 90.0f) % 4) {
 		case 0: o = PGUpright; break;
-		case 1: o = PGRotated90CC; break;
+		case 1: o = PGRotated90CCW; break;
 		case 2: o = PGUpsideDown; break;
-		case 3: o = PGRotated270CC; break;
+		case 3: o = PGRotated90CW; break;
 		default: PGAssertNotReached(@"Rotation wasn't simplified into an orientation.");
 	}
 	[[self activeDocument] setBaseOrientation:PGAddOrientation([[self activeDocument] baseOrientation], o)];

PGFoundationAdditions.m

@@ -52,7 +52,7 @@ + (id)PG_transformWithRect:(inout NSRectPointer)rectPtr orientation:(PGOrientati
 	NSAffineTransform *const transform = [self transform];
 	if(PGUpright == orientation) return transform;
 	[transform translateXBy:NSMidX(*rectPtr) yBy:NSMidY(*rectPtr)];
-	if(orientation & PGRotated90CC) {
+	if(orientation & PGRotated90CCW) {
 		[transform rotateByDegrees:90.0f];
 		rectPtr->size = NSMakeSize(NSHeight(*rectPtr), NSWidth(*rectPtr)); // Swap.
 	}

PGGenericImageAdapter.m

@@ -80,16 +80,7 @@ - (NSDictionary *)_imageSourceOptions
 - (void)_setImageProperties:(NSDictionary *)properties
 {
 	PGOrientation const oldOrientation = _orientation;
-	switch([[properties objectForKey:(NSString *)kCGImagePropertyOrientation] unsignedIntegerValue]) {
-		case 2: _orientation = PGFlippedHorz; break;
-		case 3: _orientation = PGUpsideDown; break;
-		case 4: _orientation = PGFlippedVert; break;
-		case 5: _orientation = PGRotated90CC | PGFlippedHorz; break;
-		case 6: _orientation = PGRotated270CC; break;
-		case 7: _orientation = PGRotated90CC | PGFlippedVert; break;
-		case 8: _orientation = PGRotated90CC; break;
-		default: _orientation = PGUpright; break;
-	}
+	_orientation = PGOrientationWithTIFFOrientation([[properties objectForKey:(NSString *)kCGImagePropertyOrientation] unsignedIntegerValue]);
 	if(oldOrientation != _orientation) [self invalidateThumbnail];
 	[_imageProperties release];
 	_imageProperties = [properties copy];

PGGeometry.h

@@ -60,7 +60,9 @@ extern PGRectEdgeMask PGReadingDirectionAndLocationToRectEdgeMask(PGPageLocation
 
 #pragma mark PGOrientation
 
+extern PGOrientation PGOrientationWithTIFFOrientation(NSUInteger orientation);
 extern PGOrientation PGAddOrientation(PGOrientation o1, PGOrientation o2);
+extern NSString *PGLocalizedStringWithOrientation(PGOrientation orientation);
 
 #pragma mark PGInset
 

PGGeometry.m

@@ -172,14 +172,41 @@ PGRectEdgeMask PGReadingDirectionAndLocationToRectEdgeMask(PGPageLocation loc, P
 
 #pragma mark PGOrientation
 
+PGOrientation PGOrientationWithTIFFOrientation(NSUInteger orientation)
+{
+	switch(orientation) {
+		case 2: return PGFlippedHorz;
+		case 3: return PGUpsideDown;
+		case 4: return PGFlippedVert;
+		case 5: return PGRotated90CCW | PGFlippedHorz;
+		case 6: return PGRotated90CW;
+		case 7: return PGRotated90CCW | PGFlippedVert;
+		case 8: return PGRotated90CCW;
+		default: return PGUpright;
+	}
+}
 PGOrientation PGAddOrientation(PGOrientation o1, PGOrientation o2)
 {
 	PGOrientation n1 = o1, n2 = o2;
-	if(o1 & PGRotated90CC && !(o2 & PGRotated90CC)) n2 = ((o2 & PGFlippedHorz) >> 1) | ((o2 & PGFlippedVert) << 1);
+	if(o1 & PGRotated90CCW && !(o2 & PGRotated90CCW)) n2 = ((o2 & PGFlippedHorz) >> 1) | ((o2 & PGFlippedVert) << 1);
 	PGOrientation r = n1 ^ n2;
-	if(o1 & PGRotated90CC && o2 & PGRotated90CC) r ^= PGUpsideDown;
+	if(o1 & PGRotated90CCW && o2 & PGRotated90CCW) r ^= PGUpsideDown;
 	return r;
 }
+NSString *PGLocalizedStringWithOrientation(PGOrientation orientation)
+{
+	// TODO: Add these to the Localizable.strings files.
+	switch(orientation) {
+		case PGFlippedHorz: return NSLocalizedString(@"Flipped Horizontally", nil);
+		case PGUpsideDown: return NSLocalizedString(@"Upside Down", nil);
+		case PGFlippedVert: return NSLocalizedString(@"Flipped Vertically", nil);
+		case PGRotated90CCW | PGFlippedHorz: return NSLocalizedString(@"Rotated CCW & Flipped Horizontally", nil);
+		case PGRotated90CW: return NSLocalizedString(@"Rotated CW", nil);
+		case PGRotated90CCW | PGFlippedVert: return NSLocalizedString(@"Rotated CCW & Flipped Vertically", nil);
+		case PGRotated90CCW: return NSLocalizedString(@"Rotated CCW", nil);
+		default: return NSLocalizedString(@"Upright", nil);
+	}
+}
 
 #pragma mark PGInset
 

PGGeometryTypes.h

@@ -53,9 +53,9 @@ enum {
 	PGUpright      = 0,
 	PGFlippedVert  = 1 << 0,
 	PGFlippedHorz  = 1 << 1,
-	PGRotated90CC  = 1 << 2, // Counter-Clockwise.
+	PGRotated90CCW  = 1 << 2, // Counter-Clockwise.
 	PGUpsideDown   = PGFlippedVert | PGFlippedHorz,
-	PGRotated270CC = PGFlippedVert | PGFlippedHorz | PGRotated90CC
+	PGRotated90CW = PGFlippedVert | PGFlippedHorz | PGRotated90CCW
 };
 typedef NSUInteger PGOrientation;
 

PGImageView.m

@@ -97,7 +97,7 @@ - (NSSize)size
 }
 - (NSSize)originalSize
 {
-	return PGRotated90CC & _orientation ? NSMakeSize([_rep pixelsHigh], [_rep pixelsWide]) : NSMakeSize([_rep pixelsWide], [_rep pixelsHigh]);
+	return PGRotated90CCW & _orientation ? NSMakeSize([_rep pixelsHigh], [_rep pixelsWide]) : NSMakeSize([_rep pixelsWide], [_rep pixelsHigh]);
 }
 - (CGFloat)averageScaleFactor
 {

PGInspectorPanelController.m

@@ -34,6 +34,7 @@
 
 // Other Sources
 #import "PGFoundationAdditions.h"
+#import "PGGeometry.h"
 
 @interface NSObject(PGAdditions)
 
@@ -191,7 +192,6 @@ - (NSDictionary *)_humanReadablePropertiesWithDictionary:(NSDictionary *)dict
 	// TODO: Create special formatters for certain properties.
 	// TODO: Automatically resize the first column to fit.
 	/*
-		kCGImagePropertyOrientation
 		kCGImagePropertyExifFNumber (?)
 		kCGImagePropertyExifExposureProgram (?)
 		kCGImagePropertyExifISOSpeedRatings (?)
@@ -212,6 +212,9 @@ - (NSDictionary *)_humanReadablePropertiesWithDictionary:(NSDictionary *)dict
 
 	if([[dict objectForKey:(NSString *)kCGImagePropertyHasAlpha] boolValue]) [properties setObject:@"Yes" forKey:@"Alpha"];
 
+	PGOrientation const orientation = PGOrientationWithTIFFOrientation([[dict objectForKey:(NSString *)kCGImagePropertyOrientation] unsignedIntegerValue]);
+	if(PGUpright != orientation) [properties setObject:PGLocalizedStringWithOrientation(orientation) forKey:@"Orientation"];
+
 	NSDictionary *const TIFFDict = [dict objectForKey:(NSString *)kCGImagePropertyTIFFDictionary];
 	NSDictionary *const exifDict = [dict objectForKey:(NSString *)kCGImagePropertyExifDictionary];
 

PGOrientationMenuItemCell.m

@@ -52,7 +52,7 @@ - (NSImage *)iconForOrientation:(inout PGOrientation *)orientation highlighted:(
 			*orientation = PGUpright;
 			return [NSImage imageNamed:flag ? @"Mirror-White" : @"Mirror-Black"];
 		case PGFlippedVert:
-			*orientation = PGRotated90CC;
+			*orientation = PGRotated90CCW;
 			return [NSImage imageNamed:flag ? @"Mirror-White" : @"Mirror-Black"];
 		default: return [NSImage imageNamed:flag ? @"Silhouette-White" : @"Silhouette-Black"];
 	}

PGThumbnailView.m

@@ -322,7 +322,7 @@ - (void)drawRect:(NSRect)aRect
 			continue;
 		}
 		NSSize originalSize = [thumb size];
-		if(PGRotated90CC & _thumbnailOrientation) originalSize = NSMakeSize(originalSize.height, originalSize.width);
+		if(PGRotated90CCW & _thumbnailOrientation) originalSize = NSMakeSize(originalSize.height, originalSize.width);
 		NSRect const frame = [self frameOfItemAtIndex:i withMargin:NO];
 		NSRect const thumbnailRect = PGIntegralRect(PGCenteredSizeInRect(PGScaleSizeByFloat(originalSize, MIN(1, MIN(NSWidth(frame) / originalSize.width, NSHeight(frame) / originalSize.height))), frame));
 		BOOL const enabled = [[self dataSource] thumbnailView:self canSelectItem:item];