Skip to content

Commit

Permalink
Core Data, annotation, and Not Taken changes.
Browse files Browse the repository at this point in the history
* data model now includes a notTaken flag for each BiometricData
object, as well as a deleted flag for each Sensor (see issue #53).
* Annotation segmented controls now only available for fingerprint data
* Not Taken button available to mark any result as actively skipped.
  • Loading branch information
nbcl-maronoff committed Oct 11, 2011
1 parent b4bf336 commit 456bb58
Show file tree
Hide file tree
Showing 36 changed files with 629 additions and 721 deletions.
27 changes: 27 additions & 0 deletions BiometricCollection.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//
// BiometricCollection.m
// wsabi
//
// Created by Matt Aronoff on 10/11/11.
// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
//

#import "BiometricCollection.h"
#import "BiometricData.h"
#import "Workflow.h"


@implementation BiometricCollection

@dynamic presenterId;
@dynamic isActive;
@dynamic isComplete;
@dynamic notes;
@dynamic totalLength;
@dynamic timestampStarted;
@dynamic currentPosition;
@dynamic timestampCompleted;
@dynamic workflow;
@dynamic items;

@end
30 changes: 30 additions & 0 deletions Capturer.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//
// Capturer.h
// wsabi
//
// Created by Matt Aronoff on 10/11/11.
// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
//

#import <Foundation/Foundation.h>
#import <CoreData/CoreData.h>

@class Sensor, SensorParam, Workflow;

@interface Capturer : NSManagedObject

@property (nonatomic, retain) NSNumber * positionInWorkflow;
@property (nonatomic, retain) NSNumber * captureType;
@property (nonatomic, retain) Workflow *workflow;
@property (nonatomic, retain) Sensor *sensor;
@property (nonatomic, retain) NSSet *instanceParams;
@end

@interface Capturer (CoreDataGeneratedAccessors)

- (void)addInstanceParamsObject:(SensorParam *)value;
- (void)removeInstanceParamsObject:(SensorParam *)value;
- (void)addInstanceParams:(NSSet *)values;
- (void)removeInstanceParams:(NSSet *)values;

@end
23 changes: 23 additions & 0 deletions Capturer.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//
// Capturer.m
// wsabi
//
// Created by Matt Aronoff on 10/11/11.
// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
//

#import "Capturer.h"
#import "Sensor.h"
#import "SensorParam.h"
#import "Workflow.h"


@implementation Capturer

@dynamic positionInWorkflow;
@dynamic captureType;
@dynamic workflow;
@dynamic sensor;
@dynamic instanceParams;

@end
17 changes: 17 additions & 0 deletions FaceSensor.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// FaceSensor.h
// wsabi
//
// Created by Matt Aronoff on 10/11/11.
// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
//

#import <Foundation/Foundation.h>
#import <CoreData/CoreData.h>
#import "Sensor.h"


@interface FaceSensor : Sensor


@end
15 changes: 15 additions & 0 deletions FaceSensor.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// FaceSensor.m
// wsabi
//
// Created by Matt Aronoff on 10/11/11.
// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
//

#import "FaceSensor.h"


@implementation FaceSensor


@end
16 changes: 16 additions & 0 deletions IrisSensor.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// IrisSensor.m
// wsabi
//
// Created by Matt Aronoff on 10/11/11.
// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
//

#import "IrisSensor.h"


@implementation IrisSensor

@dynamic supportsDualIris;

@end
17 changes: 17 additions & 0 deletions MultimodalSensor.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// MultimodalSensor.h
// wsabi
//
// Created by Matt Aronoff on 10/11/11.
// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
//

#import <Foundation/Foundation.h>
#import <CoreData/CoreData.h>
#import "Sensor.h"


@interface MultimodalSensor : Sensor


@end
15 changes: 15 additions & 0 deletions MultimodalSensor.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// MultimodalSensor.m
// wsabi
//
// Created by Matt Aronoff on 10/11/11.
// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
//

#import "MultimodalSensor.h"


@implementation MultimodalSensor


@end
44 changes: 44 additions & 0 deletions Sensor.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
//
// Sensor.h
// wsabi
//
// Created by Matt Aronoff on 10/11/11.
// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
//

#import <Foundation/Foundation.h>
#import <CoreData/CoreData.h>

@class Capturer, SensorModality, SensorParam;

@interface Sensor : NSManagedObject

@property (nonatomic, retain) NSDate * timestampCreated;
@property (nonatomic, retain) NSDate * timestampModified;
@property (nonatomic, retain) NSNumber * connected;
@property (nonatomic, retain) NSString * name;
@property (nonatomic, retain) NSString * uri;
@property (nonatomic, retain) NSNumber * deleted;
@property (nonatomic, retain) NSSet *params;
@property (nonatomic, retain) NSSet *modalities;
@property (nonatomic, retain) NSSet *usedInCapturers;
@end

@interface Sensor (CoreDataGeneratedAccessors)

- (void)addParamsObject:(SensorParam *)value;
- (void)removeParamsObject:(SensorParam *)value;
- (void)addParams:(NSSet *)values;
- (void)removeParams:(NSSet *)values;

- (void)addModalitiesObject:(SensorModality *)value;
- (void)removeModalitiesObject:(SensorModality *)value;
- (void)addModalities:(NSSet *)values;
- (void)removeModalities:(NSSet *)values;

- (void)addUsedInCapturersObject:(Capturer *)value;
- (void)removeUsedInCapturersObject:(Capturer *)value;
- (void)addUsedInCapturers:(NSSet *)values;
- (void)removeUsedInCapturers:(NSSet *)values;

@end
27 changes: 27 additions & 0 deletions Sensor.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//
// Sensor.m
// wsabi
//
// Created by Matt Aronoff on 10/11/11.
// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
//

#import "Sensor.h"
#import "Capturer.h"
#import "SensorModality.h"
#import "SensorParam.h"


@implementation Sensor

@dynamic timestampCreated;
@dynamic timestampModified;
@dynamic connected;
@dynamic name;
@dynamic uri;
@dynamic deleted;
@dynamic params;
@dynamic modalities;
@dynamic usedInCapturers;

@end
19 changes: 19 additions & 0 deletions SensorModality.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//
// SensorModality.h
// wsabi
//
// Created by Matt Aronoff on 10/11/11.
// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
//

#import <Foundation/Foundation.h>
#import <CoreData/CoreData.h>

@class Sensor;

@interface SensorModality : NSManagedObject

@property (nonatomic, retain) NSNumber * type;
@property (nonatomic, retain) Sensor *sensor;

@end
56 changes: 0 additions & 56 deletions Shared/BiometricCollection.m

This file was deleted.

23 changes: 0 additions & 23 deletions Shared/Capturer.h

This file was deleted.

53 changes: 0 additions & 53 deletions Shared/Capturer.m

This file was deleted.

Loading

0 comments on commit 456bb58

Please sign in to comment.