Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Modified code to work with universal build.

Browse Source
pull/8307/head
Jaime O. Rios 8 years ago
parent 8e8da3f5b0
commit 2d20aa4ed0
1 changed files with 88 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 138
      modules/highgui/src/window_cocoa.mm

138
modules/highgui/src/window_cocoa.mm
Unescape View File

@ -83,11 +83,23 @@ static NSMutableDictionary *windows = nil;
static bool wasInitialized = false; static bool wasInitialized = false;
@interface CVView : NSView @interface CVView : NSView
{
NSImage *_image;
}
@property(strong) NSImage *image; @property(strong) NSImage *image;
- (void)setImageData:(CvArr *)arr; - (void)setImageData:(CvArr *)arr;
@end @end
@interface CVSlider : NSView @interface CVSlider : NSView
{
NSSlider *_slider;
NSTextField *_name;
int *_value;
void *_userData;
CvTrackbarCallback _callback;
CvTrackbarCallback2 _callback2;
}
@property(strong) NSSlider *slider; @property(strong) NSSlider *slider;
@property(strong) NSTextField *name; @property(strong) NSTextField *name;
@property(assign) int *value; @property(assign) int *value;
@ -97,6 +109,14 @@ static bool wasInitialized = false;
@end @end
@interface CVWindow : NSWindow @interface CVWindow : NSWindow
{
CvMouseCallback _mouseCallback;
void *_mouseParam;
BOOL _autosize;
BOOL _firstContent;
NSMutableDictionary *_sliders;
int _status;
}
@property(assign) CvMouseCallback mouseCallback; @property(assign) CvMouseCallback mouseCallback;
@property(assign) void *mouseParam; @property(assign) void *mouseParam;
@property(assign) BOOL autosize; @property(assign) BOOL autosize;
@ -681,14 +701,21 @@ void cv::setWindowTitle(const String& winname, const String& title)
} }
@implementation CVWindow @implementation CVWindow
#if defined(__LP64__)
@synthesize mouseCallback; @synthesize mouseCallback;
@synthesize mouseParam; @synthesize mouseParam;
@synthesize autosize; @synthesize autosize;
@synthesize firstContent; @synthesize firstContent;
@synthesize sliders; @synthesize sliders;
@synthesize status; @synthesize status;
#else
@synthesize mouseCallback = _mouseCallback;
@synthesize mouseParam = _mouseParam;
@synthesize autosize = _autosize;
@synthesize firstContent = _firstContent;
@synthesize sliders = _sliders;
@synthesize status = _status;
#endif
- (void)cvSendMouseEvent:(NSEvent *)event type:(int)type flags:(int)flags { - (void)cvSendMouseEvent:(NSEvent *)event type:(int)type flags:(int)flags {
(void)event; (void)event;
//cout << "cvSendMouseEvent" << endl; //cout << "cvSendMouseEvent" << endl;
@ -713,12 +740,13 @@ void cv::setWindowTitle(const String& winname, const String& title)
mp.y = mp.y * imageSize.height / std::max(viewHeight, 1.); mp.y = mp.y * imageSize.height / std::max(viewHeight, 1.);
if( mp.x >= 0 && mp.y >= 0 && mp.x < imageSize.width && mp.y < imageSize.height ) if( mp.x >= 0 && mp.y >= 0 && mp.x < imageSize.width && mp.y < imageSize.height )
mouseCallback(type, mp.x, mp.y, flags, mouseParam); _mouseCallback(type, mp.x, mp.y, flags, _mouseParam);
} }
- (void)cvMouseEvent:(NSEvent *)event { - (void)cvMouseEvent:(NSEvent *)event {
//cout << "cvMouseEvent" << endl; //cout << "cvMouseEvent" << endl;
if(!mouseCallback)
if([self mouseCallback] == nil)
return; return;
int flags = 0; int flags = 0;
@ -778,13 +806,13 @@ void cv::setWindowTitle(const String& winname, const String& title)
- (void)createSliderWithName:(const char *)name maxValue:(int)max value:(int *)value callback:(CvTrackbarCallback)callback { - (void)createSliderWithName:(const char *)name maxValue:(int)max value:(int *)value callback:(CvTrackbarCallback)callback {
//cout << "createSliderWithName" << endl; //cout << "createSliderWithName" << endl;
if(sliders == nil) if(_sliders == nil)
sliders = [[NSMutableDictionary alloc] init]; _sliders = [[NSMutableDictionary alloc] init];
NSString *cvname = [NSString stringWithFormat:@"%s", name]; NSString *cvname = [NSString stringWithFormat:@"%s", name];
// Avoid overwriting slider // Avoid overwriting slider
if([sliders valueForKey:cvname]!=nil) if([_sliders valueForKey:cvname]!=nil)
return; return;
// Create slider // Create slider
@ -803,11 +831,11 @@ void cv::setWindowTitle(const String& winname, const String& title)
[slider setCallback:callback]; [slider setCallback:callback];
// Save slider // Save slider
[sliders setValue:slider forKey:cvname]; [_sliders setValue:slider forKey:cvname];
[[self contentView] addSubview:slider]; [[self contentView] addSubview:slider];
//update contentView size to contain sliders //update contentView size to contain _sliders
NSSize viewSize=[[self contentView] frame].size, NSSize viewSize=[[self contentView] frame].size,
sliderSize=[slider frame].size; sliderSize=[slider frame].size;
viewSize.height += sliderSize.height; viewSize.height += sliderSize.height;
@ -817,7 +845,7 @@ void cv::setWindowTitle(const String& winname, const String& title)
[[self contentView] setFrameSize:viewSize]; [[self contentView] setFrameSize:viewSize];
[[self contentView] setNeedsDisplay:YES]; [[self contentView] setNeedsDisplay:YES];
//update window size to contain sliders //update window size to contain _sliders
NSRect rect = [self frame]; NSRect rect = [self frame];
rect.size.height += [slider frame].size.height; rect.size.height += [slider frame].size.height;
rect.size.width = std::max<int>(rect.size.width, MIN_SLIDER_WIDTH); rect.size.width = std::max<int>(rect.size.width, MIN_SLIDER_WIDTH);
@ -834,13 +862,16 @@ void cv::setWindowTitle(const String& winname, const String& title)
@end @end
@implementation CVView @implementation CVView
#if defined(__LP64__)
@synthesize image; @synthesize image;
#else
@synthesize image = _image;
#endif
- (id)init { - (id)init {
//cout << "CVView init" << endl; //cout << "CVView init" << endl;
[super init]; [super init];
image = [[NSImage alloc] init]; _image = [[NSImage alloc] init];
return self; return self;
} }
@ -895,11 +926,11 @@ void cv::setWindowTitle(const String& winname, const String& title)
dst[i * 4 + 2] = src[i * 3 + 2]; dst[i * 4 + 2] = src[i * 3 + 2];
} }
if( image ) if( _image )
[image release]; [_image release];
image = [[NSImage alloc] init]; _image = [[NSImage alloc] init];
[image addRepresentation:bitmap]; [_image addRepresentation:bitmap];
[bitmap release]; [bitmap release];
/*CGColorSpaceRelease(colorspace); /*CGColorSpaceRelease(colorspace);
@ -920,7 +951,7 @@ void cv::setWindowTitle(const String& winname, const String& title)
int height = size.height; int height = size.height;
CVWindow *cvwindow = (CVWindow *)[self window]; CVWindow *cvwindow = (CVWindow *)[self window];
if ([cvwindow respondsToSelector:@selector(sliders)]) { if ([cvwindow respondsToSelector:@selector(_sliders)]) {
for(NSString *key in [cvwindow sliders]) { for(NSString *key in [cvwindow sliders]) {
NSSlider *slider = [[cvwindow sliders] valueForKey:key]; NSSlider *slider = [[cvwindow sliders] valueForKey:key];
NSRect r = [slider frame]; NSRect r = [slider frame];
@ -940,17 +971,17 @@ void cv::setWindowTitle(const String& winname, const String& title)
NSAutoreleasePool* localpool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool* localpool = [[NSAutoreleasePool alloc] init];
CVWindow *cvwindow = (CVWindow *)[self window]; CVWindow *cvwindow = (CVWindow *)[self window];
int height = 0; int height = 0;
if ([cvwindow respondsToSelector:@selector(sliders)]) { if ([cvwindow respondsToSelector:@selector(_sliders)]) {
for(NSString *key in [cvwindow sliders]) { for(NSString *key in [cvwindow sliders]) {
height += [[[cvwindow sliders] valueForKey:key] frame].size.height; height += [[[cvwindow sliders] valueForKey:key] frame].size.height;
} }
} }
NSRect imageRect = {{0,0}, {[image size].width, [image size].height}}; NSRect imageRect = {{0,0}, {[_image size].width, [_image size].height}};
if(image != nil) { if(_image != nil) {
[image drawInRect: imageRect [_image drawInRect: imageRect
fromRect: NSZeroRect fromRect: NSZeroRect
operation: NSCompositeSourceOver operation: NSCompositeSourceOver
fraction: 1.0]; fraction: 1.0];
@ -962,40 +993,47 @@ void cv::setWindowTitle(const String& winname, const String& title)
@end @end
@implementation CVSlider @implementation CVSlider
#if defined(__LP64__)
@synthesize slider; @synthesize slider;
@synthesize name; @synthesize name;
@synthesize value; @synthesize value;
@synthesize userData; @synthesize userData;
@synthesize callback; @synthesize callback;
@synthesize callback2; @synthesize callback2;
#else
@synthesize slider = _slider;
@synthesize name = _name;
@synthesize value = _value;
@synthesize userData = _userData;
@synthesize callback = _callback;
@synthesize callback2 = _callback2;
#endif
- (id)init { - (id)init {
[super init]; [super init];
callback = NULL; _callback = NULL;
value = NULL; _value = NULL;
userData = NULL; _userData = NULL;
[self setFrame:NSMakeRect(0,0,200,30)]; [self setFrame:NSMakeRect(0,0,200,30)];
name = [[NSTextField alloc] initWithFrame:NSMakeRect(10, 0,110, 25)]; _name = [[NSTextField alloc] initWithFrame:NSMakeRect(10, 0,110, 25)];
[name setEditable:NO]; [_name setEditable:NO];
[name setSelectable:NO]; [_name setSelectable:NO];
[name setBezeled:NO]; [_name setBezeled:NO];
[name setBordered:NO]; [_name setBordered:NO];
[name setDrawsBackground:NO]; [_name setDrawsBackground:NO];
[[name cell] setLineBreakMode:NSLineBreakByTruncatingTail]; [[_name cell] setLineBreakMode:NSLineBreakByTruncatingTail];
[self addSubview:name]; [self addSubview:_name];
slider = [[NSSlider alloc] initWithFrame:NSMakeRect(120, 0, 70, 25)]; _slider = [[NSSlider alloc] initWithFrame:NSMakeRect(120, 0, 70, 25)];
[slider setAutoresizingMask:NSViewWidthSizable]; [_slider setAutoresizingMask:NSViewWidthSizable];
[slider setMinValue:0]; [_slider setMinValue:0];
[slider setMaxValue:100]; [_slider setMaxValue:100];
[slider setContinuous:YES]; [_slider setContinuous:YES];
[slider setTarget:self]; [_slider setTarget:self];
[slider setAction:@selector(sliderChanged:)]; [_slider setAction:@selector(sliderChanged:)];
[self addSubview:slider]; [self addSubview:_slider];
[self setAutoresizingMask:NSViewWidthSizable]; [self setAutoresizingMask:NSViewWidthSizable];
@ -1006,13 +1044,13 @@ void cv::setWindowTitle(const String& winname, const String& title)
- (void)sliderChanged:(NSNotification *)notification { - (void)sliderChanged:(NSNotification *)notification {
(void)notification; (void)notification;
int pos = [slider intValue]; int pos = [_slider intValue];
if(value) if(_value)
*value = pos; *_value = pos;
if(callback) if(_callback)
callback(pos); _callback(pos);
if(callback2) if(_callback2)
callback2(pos, userData); _callback2(pos, _userData);
} }
@end @end

Write Preview
Loading…
Cancel
Save