Skip to content

Adds a scale parameter to the image #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mz2 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adds a scale parameter to the image #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d23151
Reorders imports so that PARImage+ASCIInput doesn't rely on a prefix …
mz2 Mar 17, 2015
6820780
Adds an optional scale parameter to the ASCIImage drawing context.
mz2 Mar 18, 2015
f8e9a56
Oops, fixes the scale handling (some changes were missing).
mz2 Mar 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ASCIImage.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions Core/PARImage+ASCIIInput.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,7 @@
// Created by Charles Parnot on 5/29/13.
// Copyright (c) 2013 Charles Parnot. All rights reserved.


extern NSString * const ASCIIContextShapeIndex;
extern NSString * const ASCIIContextFillColor;
extern NSString * const ASCIIContextStrokeColor;
extern NSString * const ASCIIContextLineWidth;
extern NSString * const ASCIIContextShouldClose;
extern NSString * const ASCIIContextShouldAntialias;

#import <Foundation/Foundation.h>

// iOS
#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
Expand All @@ -28,8 +21,15 @@ extern NSString * const ASCIIContextShouldAntialias;
#endif


@interface PARImage (ASCIIInput)
extern NSString * const ASCIIContextShapeIndex;
extern NSString * const ASCIIContextFillColor;
extern NSString * const ASCIIContextStrokeColor;
extern NSString * const ASCIIContextLineWidth;
extern NSString * const ASCIIContextShouldClose;
extern NSString * const ASCIIContextShouldAntialias;
extern NSString * const ASCIIContextScale;

@interface PARImage (ASCIIInput)

/// @name Creating Images from ASCII Input

Expand Down
12 changes: 10 additions & 2 deletions Core/PARImage+ASCIIInput.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
NSString * const ASCIIContextLineWidth = @"ASCIIContextLineWidth";
NSString * const ASCIIContextShouldClose = @"ASCIIContextShouldClose";
NSString * const ASCIIContextShouldAntialias = @"ASCIIContextShouldAntialias";
NSString * const ASCIIContextScale = @"ASCIIContextScale";


#pragma mark - PARImage Cross-Platform Image Class
Expand Down Expand Up @@ -506,10 +507,16 @@ + (PARImage *)mac_imageWithASCIIRepresentation:(NSArray *)rep contextHandler:(vo
NSArray *strictRep = [self strictASCIIRepresentationFromLenientASCIIRepresentation:rep];
NSArray *shapes = [self shapesFromNumbersInStrictASCIIRepresentation:strictRep];

NSMutableDictionary *imgContext = [NSMutableDictionary dictionary];
contextHandler(imgContext);
CGFloat scale = imgContext[ASCIIContextScale] ? [imgContext[ASCIIContextScale] doubleValue] : 1.0f;
NSAffineTransform *scaleTransform = [NSAffineTransform new];
[scaleTransform scaleBy:scale];

// image size
NSUInteger countRows = strictRep.count;
NSUInteger countCols = [strictRep[0] length];
NSSize imageSize = NSMakeSize(countCols, countRows);
NSSize imageSize = NSMakeSize(countCols * scale, countRows * scale);

// image is drawn using the block API, so we can handle @2x drawing in HiDPI
NSImage *image = [NSImage imageWithSize:imageSize flipped:NO drawingHandler:^BOOL(NSRect dstRect)
Expand All @@ -521,6 +528,7 @@ + (PARImage *)mac_imageWithASCIIRepresentation:(NSArray *)rep contextHandler:(vo
// ... but don't let the handler mess up the graphics context
NSMutableDictionary *contextASCII = [NSMutableDictionary dictionaryWithDictionary:@{ASCIIContextShapeIndex: @(shapeIndex)}];
[[NSGraphicsContext currentContext] saveGraphicsState];

{
contextHandler(contextASCII);
}
Expand All @@ -535,7 +543,7 @@ + (PARImage *)mac_imageWithASCIIRepresentation:(NSArray *)rep contextHandler:(vo

// bezier path from shape
PARBezierPath *path = shouldClose ? [shape closedBezierPath] : [shape bezierPath];

[path transformUsingAffineTransform:scaleTransform];
// draw!
[[NSGraphicsContext currentContext] saveGraphicsState];
{
Expand Down