gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 07:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add basic implementation for gui part of colour gradients.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28864 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2009-10-21 07:12:12 +00:00
parent 358214ef48
commit c5952044b7
7 changed files with 477 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2009-10-21 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSColor.m (-colorUsingColorSpace): Add some dummy
implementation for this method.
* Source/NSColorSpace.m: Correct indention.
* Header/AppKit/NSGradient.h,
* Source/NSGradient.m: New files implementing the gui part of
colour gradients.
* Headers/AppKit/AppKit.h: Add include for NSGradient.h
* Source/GNUmakefile: Add new files.
2009-10-20 Wolfgang Lux <wolfgang.lux@gmail.com>
* Source/NSDocumentController.m(-openDocumentWithContentsOfURL:display:,

7
Headers/AppKit/AppKit.h
View file

@ -45,7 +45,6 @@
#include <AppKit/NSGraphics.h>
#include <AppKit/NSActionCell.h>
#include <AppKit/NSAnimation.h>
#include <AppKit/NSApplication.h>
#include <AppKit/NSAttributedString.h>
#include <AppKit/NSBitmapImageRep.h>
@ -103,8 +102,6 @@
#include <AppKit/NSScreen.h>
#include <AppKit/NSScroller.h>
#include <AppKit/NSScrollView.h>
#include <AppKit/NSSegmentedCell.h>
#include <AppKit/NSSegmentedControl.h>
#include <AppKit/NSSelection.h>
#include <AppKit/NSSlider.h>
#include <AppKit/NSSliderCell.h>
@ -121,6 +118,7 @@
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
#include <AppKit/NSAlert.h>
#include <AppKit/NSAnimation.h>
#include <AppKit/NSAffineTransform.h>
#include <AppKit/NSArrayController.h>
#include <AppKit/NSBezierPath.h>
@ -132,6 +130,7 @@
#include <AppKit/NSDrawer.h>
#include <AppKit/NSFileWrapper.h>
#include <AppKit/NSFontDescriptor.h>
#include <AppKit/NSGradient.h>
#include <AppKit/NSGraphicsContext.h>
#include <AppKit/NSHelpManager.h>
#include <AppKit/NSInputManager.h>
@ -156,6 +155,8 @@
#include <AppKit/NSSearchField.h>
#include <AppKit/NSSearchFieldCell.h>
#include <AppKit/NSSecureTextField.h>
#include <AppKit/NSSegmentedCell.h>
#include <AppKit/NSSegmentedControl.h>
#include <AppKit/NSSound.h>
#include <AppKit/NSSpeechSynthesizer.h>
#include <AppKit/NSStepper.h>

85
Headers/AppKit/NSGradient.h Normal file
View file

@ -0,0 +1,85 @@
/* -*-objc-*-
NSGradient.h
GUI implementation of a colour gradient.
Copyright (C) 2009 Free Software Foundation, Inc.
Author: Fred Kiefer <fredkiefer@gmx.de>
Date: Oct 2009
This file is part of the GNUstep GUI Library.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; see the file COPYING.LIB.
If not, see <http://www.gnu.org/licenses/> or write to the
Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifndef _GNUstep_H_NSGradient
#define _GNUstep_H_NSGradient
#import <GNUstepBase/GSVersionMacros.h>
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
#import <Foundation/Foundation.h>
typedef NSUInteger NSGradientDrawingOptions;
enum {
NSGradientDrawsBeforeStartingLocation = 1,
NSGradientDrawsAfterEndingLocation = 2
};
@class NSBezierPath;
@class NSColor;
@class NSColorSpace;
@interface NSGradient : NSObject <NSCopying, NSCoding>
{
NSColorSpace *_colorSpace;
NSArray *_colors;
CGFloat *_locations;
NSInteger _numberOfColorStops;
}
- (NSColorSpace *) colorSpace;
- (void) drawFromCenter: (NSPoint)startCenter
radius: (CGFloat)startRadius
toCenter: (NSPoint)endCenter
radius: (CGFloat)endRadius
options: (NSGradientDrawingOptions)options;
- (void) drawFromPoint: (NSPoint)startPoint
toPoint: (NSPoint)endPoint
options: (NSGradientDrawingOptions)options;
- (void) drawInBezierPath: (NSBezierPath *)path angle: (CGFloat)angle;
- (void) drawInBezierPath: (NSBezierPath *)path
relativeCenterPosition: (NSPoint)relativeCenterPoint;
- (void) drawInRect: (NSRect)rect angle: (CGFloat)angle;
- (void) drawInRect: (NSRect)rect relativeCenterPosition: (NSPoint)relativeCenterPoint;
- (void) getColor: (NSColor **)color
location: (CGFloat *)locatuib
atIndex: (NSInteger)index;
- (id) initWithColors: (NSArray *)colArray;
- (id) initWithColors: (NSArray *)colArray
atLocations: (const CGFloat *)locs
colorSpace: (NSColorSpace *)colSpace;
- (id) initWithColorsAndLocations: (NSColor *)color, ...;
- (id) initWithStartingColor: (NSColor *)startColor endingColor: (NSColor *)endColor;
- (NSColor *) interpolatedColorAtLocation: (CGFloat)location;
- (NSInteger) numberOfColorStops;
@end
#endif
#endif // _GNUstep_H_NSGradient

2
Source/GNUmakefile
View file

@ -94,6 +94,7 @@ NSFontManager.m \
NSFontPanel.m \
NSForm.m \
NSFormCell.m \
NSGradient.m \
NSGlyphGenerator.m \
NSGraphicsContext.m \
NSHelpPanel.m \
@ -295,6 +296,7 @@ NSFontManager.h \
NSFontPanel.h \
NSForm.h \
NSFormCell.h \
NSGradient.h \
NSGlyphGenerator.h \
NSGraphicsContext.h \
NSHelpPanel.h \

28
Source/NSColor.m
View file

@ -1186,7 +1186,7 @@ systemColorWithName(NSString *name)
alpha: comp[4]];
}
return nil;
return nil;
}
/*
@ -1216,7 +1216,31 @@ systemColorWithName(NSString *name)
- (NSColor *) colorUsingColorSpace: (NSColorSpace *)space
{
// FIXME
return nil;
NSString *colorSpaceName;
if ([space isEqualTo: [self colorSpace]])
{
return self;
}
switch ([space colorSpaceModel])
{
default:
case NSUnknownColorSpaceModel:
return nil;
case NSGrayColorSpaceModel:
colorSpaceName = NSDeviceWhiteColorSpace;
case NSRGBColorSpaceModel:
colorSpaceName = NSDeviceRGBColorSpace;
case NSCMYKColorSpaceModel:
colorSpaceName = NSDeviceCMYKColorSpace;
case NSLABColorSpaceModel:
return nil;
case NSDeviceNColorSpaceModel:
return nil;
}
return [self colorUsingColorSpaceName: colorSpaceName
device: nil];
}
- (NSUInteger) hash

30
Source/NSColorSpace.m
View file

@ -35,20 +35,20 @@
- (id) _initWithColorSpaceModel: (NSColorSpaceModel)model
{
if ((self = [super init]))
{
if ((self = [super init]))
{
// FIXME: Load corresponding data
_colorSpaceModel = model;
}
return self;
}
return self;
}
#define COLORSPACE(model) \
static NSColorSpace *csp; \
if (!csp) \
csp = [[self alloc] _initWithColorSpaceModel: model]; \
return csp;
static NSColorSpace *csp; \
if (!csp) \
csp = [[self alloc] _initWithColorSpaceModel: model]; \
return csp;
+ (NSColorSpace *) deviceCMYKColorSpace
{
@ -82,8 +82,8 @@
- (id) initWithColorSyncProfile: (void *)prof
{
if ((self = [super init]))
{
if ((self = [super init]))
{
_colorSyncProfile = prof;
_colorSpaceModel = NSUnknownColorSpaceModel;
}
@ -92,8 +92,8 @@
- (id) initWithICCProfileData: (NSData *)iccData
{
if ((self = [super init]))
{
if ((self = [super init]))
{
ASSIGN(_iccData, iccData);
_colorSpaceModel = NSUnknownColorSpaceModel;
}
@ -163,7 +163,7 @@
- (void) encodeWithCoder: (NSCoder *)coder
{
// FIXME
if ([coder allowsKeyedCoding])
if ([coder allowsKeyedCoding])
{
}
else
@ -174,13 +174,13 @@
- (id) initWithCoder: (NSCoder *)aDecoder
{
// FIXME
if ([aDecoder allowsKeyedCoding])
if ([aDecoder allowsKeyedCoding])
{
}
else
{
}
return self;
return self;
}
@end

334
Source/NSGradient.m Normal file
View file

@ -0,0 +1,334 @@
/*
NSGradient.m
GUI implementation of a colour gradient.
Copyright (C) 2009 Free Software Foundation, Inc.
Author: Fred Kiefer <fredkiefer@gmx.de>
Date: Oct 2009
Author: H. Nikolaus Schaller <hns@computer.org>
Date: Dec 2007
This file is part of the GNUstep GUI Library.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; see the file COPYING.LIB.
If not, see <http://www.gnu.org/licenses/> or write to the
Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#import <Foundation/NSGeometry.h>
#import "AppKit/NSBezierPath.h"
#import "AppKit/NSColor.h"
#import "AppKit/NSColorSpace.h"
#import "AppKit/NSGradient.h"
#include <math.h>
@implementation NSGradient
- (NSColorSpace *) colorSpace;
{
return _colorSpace;
}
- (void) drawFromCenter: (NSPoint)startCenter
radius: (CGFloat)startRadius
toCenter: (NSPoint)endCenter
radius: (CGFloat)endRadius
options: (NSGradientDrawingOptions)options
{
// FIXME: New backend call
}
- (void) drawFromPoint: (NSPoint)startPoint
toPoint: (NSPoint)endPoint
options: (NSGradientDrawingOptions)options
{
// FIXME: New backend call
}
- (void) drawInBezierPath: (NSBezierPath *)path angle: (CGFloat)angle
{
[path addClip];
[self drawInRect: [path bounds] angle: angle];
}
- (void) drawInBezierPath: (NSBezierPath *)path
relativeCenterPosition: (NSPoint)relativeCenterPoint
{
[path addClip];
[self drawInRect: [path bounds] relativeCenterPosition: relativeCenterPoint];
}
- (void) drawInRect: (NSRect)rect angle: (CGFloat)angle
{
NSPoint startPoint;
NSPoint endPoint;
// Normalize to 0.0 <= angle <= 360.0
while (angle < 0.0)
{
angle += 360.0;
}
while (angle > 360.0)
{
angle -= 360.0;
}
// FIXME: Does not take angle fully into account to compute endPoint
if (angle < 90.0)
{
startPoint = NSMakePoint(NSMinX(rect), NSMinY(rect));
endPoint = NSMakePoint(NSMaxX(rect), NSMaxY(rect));
}
else if (angle < 180.0)
{
startPoint = NSMakePoint(NSMaxX(rect), NSMinY(rect));
endPoint = NSMakePoint(NSMinX(rect), NSMaxY(rect));
}
else if (angle < 180.0)
{
startPoint = NSMakePoint(NSMaxX(rect), NSMaxY(rect));
endPoint = NSMakePoint(NSMinX(rect), NSMinY(rect));
}
else
{
startPoint = NSMakePoint(NSMinX(rect), NSMaxY(rect));
endPoint = NSMakePoint(NSMaxX(rect), NSMinY(rect));
}
[NSBezierPath clipRect: rect];
[self drawFromPoint: startPoint
toPoint: endPoint
options: 0];
}
static inline float sqr(float a)
{
return a * a;
}
static inline float euclidian_distance(NSPoint start, NSPoint end)
{
return sqrt(sqr(end.x - start.x) + sqr(end.y - start.y));
}
- (void) drawInRect: (NSRect)rect
relativeCenterPosition: (NSPoint)relativeCenterPoint
{
NSPoint startCenter;
NSPoint endCenter;
CGFloat endRadius;
CGFloat distance;
NSAssert(relativeCenterPoint.x >= 0.0 && relativeCenterPoint.x <= 1.0, @"invalid relative center point");
NSAssert(relativeCenterPoint.y >= 0.0 && relativeCenterPoint.y <= 1.0, @"invalid relative center point");
startCenter = NSMakePoint(NSMidX(rect), NSMidY(rect));
endCenter = NSMakePoint(startCenter.x + rect.size.width * relativeCenterPoint.x,
startCenter.y + rect.size.height * relativeCenterPoint.y);
endRadius = 0.0;
distance = euclidian_distance(endCenter, NSMakePoint(NSMinX(rect), NSMinY(rect)));
if (endRadius < distance)
endRadius = distance;
distance = euclidian_distance(endCenter, NSMakePoint(NSMaxX(rect), NSMinY(rect)));
if (endRadius < distance)
endRadius = distance;
distance = euclidian_distance(endCenter, NSMakePoint(NSMinX(rect), NSMaxY(rect)));
if (endRadius < distance)
endRadius = distance;
distance = euclidian_distance(endCenter, NSMakePoint(NSMaxX(rect), NSMaxY(rect)));
if (endRadius < distance)
endRadius = distance;
[NSBezierPath clipRect: rect];
[self drawFromCenter: startCenter
radius: 0.0
toCenter: endCenter
radius: endRadius
options: 0];
}
- (void) getColor: (NSColor **)color
location: (CGFloat *)location
atIndex: (NSInteger)index
{
NSAssert(index >= 0 && index < _numberOfColorStops, @"invalid index");
if (color)
*color = [_colors objectAtIndex: index];
if (location)
*location = _locations[index];
}
- (id) initWithColors: (NSArray *)colorArray;
{
return [self initWithColors: colorArray
atLocations: NULL
colorSpace: [[colorArray objectAtIndex: 0] colorSpace]];
}
- (id) initWithColors: (NSArray *)colorArray
atLocations: (const CGFloat *)locations
colorSpace: (NSColorSpace *)colorSpace;
{
if ((self = [super init]))
{
_numberOfColorStops = [colorArray count];
NSAssert(_numberOfColorStops >= 2, @"needs at least 2 locations");
// FIXME: Convert all colours to colour space
ASSIGN(_colors, colorArray);
_locations = objc_malloc(sizeof(CGFloat)*_numberOfColorStops);
if (locations)
{
// FIXME: Check that the locations are properly ordered
memcpy(_locations, locations, sizeof(CGFloat) * _numberOfColorStops);
}
else
{
unsigned int i;
// evenly spaced
for (i = 0; i < _numberOfColorStops; i++)
_locations[i] = (float)i / (_numberOfColorStops - 1);
}
ASSIGN(_colorSpace, colorSpace);
}
return self;
}
- (id) initWithColorsAndLocations: (NSColor *)color, ...
{
va_list ap;
unsigned int max = 128;
unsigned int count = 0;
CGFloat *locations = (CGFloat*)objc_malloc(max * sizeof(CGFloat));
NSMutableArray *colorArray = [[NSMutableArray alloc] init];
va_start(ap, color);
while (color != nil)
{
if (max <= count)
{
max *= 2;
locations = (CGFloat*)objc_realloc(locations, max * sizeof(CGFloat));
}
[colorArray addObject: color];
// gcc insists on using double here
locations[count++] = (CGFloat)va_arg(ap, double);
color = va_arg(ap, id);
}
va_end(ap);
self = [self initWithColors: colorArray
atLocations: locations
colorSpace: [[colorArray objectAtIndex: 0] colorSpace]];
RELEASE(colorArray);
objc_free(locations);
return self;
}
- (id) initWithStartingColor: (NSColor *)startColor endingColor: (NSColor *)endColor
{
return [self initWithColors: [NSArray arrayWithObjects: startColor, endColor, nil]];
}
- (void) dealloc
{
RELEASE(_colorSpace);
RELEASE(_colors);
objc_free(_locations);
[super dealloc];
}
- (NSColor *) interpolatedColorAtLocation: (CGFloat)location
{
unsigned int i;
if (location <= _locations[0])
{
return [_colors objectAtIndex: 0];
}
if (location >= _locations[_numberOfColorStops - 1])
{
return [_colors objectAtIndex: _numberOfColorStops - 1];
}
for (i = 1; i < _numberOfColorStops; i++)
{
if (location <= _locations[i])
{
NSColor *c1 = [_colors objectAtIndex: i - 1];
NSColor *c2 = [_colors objectAtIndex: i];
float fraction = (_locations[i] - location) / (_locations[i] - _locations[i - 1]);
// FIXME: Works only for RGB colours and does not respect the colour space
return [c1 blendedColorWithFraction: fraction
ofColor: c2];
}
}
return nil;
}
- (NSInteger) numberOfColorStops
{
return _numberOfColorStops;
}
/*
* Copying
*/
- (id) copyWithZone: (NSZone*)zone
{
NSGradient *g = (NSGradient*)NSCopyObject(self, 0, zone);
RETAIN(g->_colorSpace);
RETAIN(g->_colors);
g->_locations = objc_malloc(sizeof(CGFloat) * _numberOfColorStops);
memcpy(g->_locations, _locations, sizeof(CGFloat) * _numberOfColorStops);
return g;
}
/*
* NSCoding protocol
*/
- (void) encodeWithCoder: (NSCoder*)aCoder
{
if ([aCoder allowsKeyedCoding])
{
}
else
{
}
}
- (id) initWithCoder: (NSCoder*)aDecoder
{
if ([aDecoder allowsKeyedCoding])
{
}
else
{
}
return self;
}
@end