From 05f1612cbb7e33cf9135a346fc2505cc0e87e853 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Thu, 23 Feb 2012 02:13:56 +0000 Subject: Warning: this branch commit is largely untested, and known to throw exceptions as database structure retrieval is currently missing! Further work on SPMySQLFramework integration: - Improve SPMySQL framework build settings including correct ppc builds and a Distribution configuration for the build distributions to match - Add new convenience querying and result methods to the framework - Amend Sequel Pro source to use the new SPMySQL.framework methods everywhere, replacing MCPKit methods where they differ and improving some functions - Remove MCPKit from the source - Fix a number of warnings on Release-style builds --- Source/SPGeometryDataView.m | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Source/SPGeometryDataView.m') diff --git a/Source/SPGeometryDataView.m b/Source/SPGeometryDataView.m index d68bb57b..3150bc19 100644 --- a/Source/SPGeometryDataView.m +++ b/Source/SPGeometryDataView.m @@ -43,7 +43,7 @@ */ - (id)initWithCoordinates:(NSDictionary*)coord { - return [self initWithCoordinates:coord targetDimension:400.0]; + return [self initWithCoordinates:coord targetDimension:400.0f]; } /** @@ -56,7 +56,7 @@ - (id)initWithCoordinates:(NSDictionary*)coord targetDimension:(CGFloat)targetDimension { - margin_offset = 10.0; + margin_offset = 10.0f; type = [coord objectForKey:@"type"]; coordinates = [coord objectForKey:@"coordinates"]; @@ -72,7 +72,7 @@ if(maxDim != 0) zoom_factor = targetDimension/maxDim; else - zoom_factor = 1.0; + zoom_factor = 1.0f; width*=zoom_factor; height*=zoom_factor; @@ -85,14 +85,14 @@ lineColor = [NSColor blackColor]; borderLineColor = [NSColor grayColor]; - backgroundColor = [NSColor colorWithCalibratedRed:1 green:1 blue:1 alpha:0.96]; + backgroundColor = [NSColor colorWithCalibratedRed:1 green:1 blue:1 alpha:0.96f]; pointFillColor = [NSColor redColor]; pointStrokeColor = [NSColor grayColor]; - polygonFillColor1 = [NSColor colorWithCalibratedRed:0.0 green:1.0 blue:0.0 alpha:0.1]; - polygonFillColor2 = [NSColor colorWithCalibratedRed:0.0 green:1.0 blue:1.0 alpha:0.1]; - polygonFillColor3 = [NSColor colorWithCalibratedRed:1.0 green:0.0 blue:0.0 alpha:0.1]; + polygonFillColor1 = [NSColor colorWithCalibratedRed:0.0f green:1.0f blue:0.0f alpha:0.1f]; + polygonFillColor2 = [NSColor colorWithCalibratedRed:0.0f green:1.0f blue:1.0f alpha:0.1f]; + polygonFillColor3 = [NSColor colorWithCalibratedRed:1.0f green:0.0f blue:0.0f alpha:0.1f]; - lineWidth = 1.0; + lineWidth = 1.0f; return self; } @@ -109,7 +109,7 @@ // Draw a rect as border path = [NSBezierPath bezierPathWithRect:[self bounds]]; - [path setLineWidth:0.1]; + [path setLineWidth:0.1f]; [backgroundColor set]; [path fill]; [borderLineColor set]; -- cgit v1.2.3