8000 Use Agg for rendering in the Mac OSX backend by mdboom · Pull Request #6178 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Use Agg for rendering in the Mac OSX backend #6178

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

Merged
merged 6 commits into from
Mar 28, 2016
Merged

Use Agg for rendering in the Mac OSX backend #6178

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eea4d80
Use Agg for rendering in the Mac OSX backend
mdboom Mar 17, 2016
142d9fc
Make animation work in OSX backend
mdboom Mar 21, 2016
cf435b8
Simplify
mdboom Mar 21, 2016
cb57075
Remove Numpy dependency
mdboom Mar 21, 2016
742d698
Remove unnecessary bitmap writing code
mdboom Mar 21, 2016
79be27d
Fix scaling of mouse events
mdboom Mar 21, 2016
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
Prev Previous commit
Next Next commit
Remove unnecessary bitmap writing code
  • Loading branch information
@mdboom
mdboom committed Mar 21, 2016
commit 742d6984d6dc12ea0141261c43cfffb341dde037
90 changes: 0 additions & 90 deletions src/_macosx.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,90 +486,6 @@ static CGFloat _get_device_scale(CGContextRef cr)
return image;
}

static PyObject*
FigureCanvas_write_bitmap(FigureCanvas* self, PyObject* args)
{
View* view = self->view;
int n;
const unichar* characters;
NSSize size;
double width, height, dpi;

if(!view)
{
PyErr_SetString(PyExc_RuntimeError, "NSView* is NULL");
return NULL;
}
/* NSSize contains CGFloat; cannot use size directly */
if(!PyArg_ParseTuple(args, "u#ddd",
&characters, &n, &width, &height, &dpi)) return NULL;
size.width = width;
size.height = height;

/* This function may be called from inside the event loop, when an
* autorelease pool is available, or from Python, when no autorelease
* pool is available. To be able to handle the latter case, we need to
* create an autorelease pool here. */

NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];

NSRect rect = [view bounds];

NSString* filename = [NSString stringWithCharacters: characters
length: (unsigned)n];
NSString* extension = [filename pathExtension];

/* Calling dataWithPDFInsideRect on the view causes its update status
* to be cleared. Save the status here, and invalidate the view if not
* up to date after calling dataWithPDFInsideRect. */
const BOOL invalid = [view needsDisplay];
NSData* data = [view dataWithPDFInsideRect: rect];
if (invalid) [view setNeedsDisplay: YES];

NSImage* image = [[NSImage alloc] initWithData: data];
NSImage *resizedImage = [[NSImage alloc] initWithSize:size];

[resizedImage lockFocus];
[image drawInRect:NSMakeRect(0, 0, width, height) fromRect:NSZeroRect C9AD operation:NSCompositeSourceOver fraction:1.0];
[resizedImage unlockFocus];
data = [resizedImage TIFFRepresentation];
[image release];
[resizedImage release];

NSBitmapImageRep* rep = [NSBitmapImageRep imageRepWithData:data];

NSSize pxlSize = NSMakeSize([rep pixelsWide], [rep pixelsHigh]);
NSSize newSize = NSMakeSize(72.0 * pxlSize.width / dpi, 72.0 * pxlSize.height / dpi);

[rep setSize:newSize];

NSBitmapImageFileType filetype;
if ([extension isEqualToString: @"bmp"])
filetype = NSBMPFileType;
else if ([extension isEqualToString: @"gif"])
filetype = NSGIFFileType;
else if ([extension isEqualToString: @"jpg"] ||
[extension isEqualToString: @"jpeg"])
filetype = NSJPEGFileType;
else if ([extension isEqualToString: @"png"])
filetype = NSPNGFileType;
else if ([extension isEqualToString: @"tiff"] ||
[extension isEqualToString: @"tif"])
filetype = NSTIFFFileType;
else
{ PyErr_SetString(PyExc_ValueError, "Unknown file type");
return NULL;
}

data = [rep representationUsingType:filetype properties:[NSDictionary dictionary]];

[data writeToFile: filename atomically: YES];
[pool release];

Py_INCREF(Py_None);
return Py_None;
}

static PyObject*
FigureCanvas_start_event_loop(FigureCanvas* self, PyObject* args, PyObject* keywords)
{
Expand Down Expand Up @@ -685,12 +601,6 @@ static CGFloat _get_device_scale(CGContextRef cr)
METH_NOARGS,
"Removes the current rubberband rectangle."
},
{"write_bitmap",
(PyCFunction)FigureCanvas_write_bitmap,
METH_VARARGS,
"Saves the figure to the specified file as a bitmap\n"
"(bmp, gif, jpeg, or png).\n"
},
{"start_event_loop",
(PyCFunction)FigureCanvas_start_event_loop,
METH_KEYWORDS | METH_VARARGS,
Expand Down
0