Skip to content

Add object detection, tracking, mobile notifications, and search to any security camera.

fix preset bug

roryclear14b685006388
diff --git a/clearcam/SettingsManager.h b/clearcam/SettingsManager.h
index 3808055..c0ade2e 100644
--- a/clearcam/SettingsManager.h
+++ b/clearcam/SettingsManager.h
@@ -2,7 +2,6 @@
@interface SettingsManager : NSObject
-@property (nonatomic, strong) NSArray<NSNumber *> *yolo_indexes;
@property (nonatomic, strong) NSArray<NSNumber *> *events;
@property (nonatomic, strong) NSDictionary *alerts;
@property (nonatomic, assign) BOOL *delete_on_launch;
@@ -11,6 +10,7 @@
@property (nonatomic, strong) NSString *height;
@property (nonatomic, strong) NSString *text_size;
@property (nonatomic, strong) NSString *preset;
+@property (nonatomic, strong) NSString *yolo_preset;
@property (nonatomic, strong) NSMutableDictionary *presets;
diff --git a/clearcam/SettingsManager.m b/clearcam/SettingsManager.m
index 83243a8..a834bd4 100644
--- a/clearcam/SettingsManager.m
+++ b/clearcam/SettingsManager.m
@@ -14,35 +14,22 @@
- (instancetype)init {
self = [super init];
if (self) {
+ self.yolo_preset = @"all";
+ [[NSUserDefaults standardUserDefaults] setObject:@"all" forKey:@"yolo_indexes_key"];
self.presets = [[NSMutableDictionary alloc] initWithDictionary:@{
@"all": @[@0, @1, @2, @3, @4, @5, @6, @7, @8, @9, @10, @11, @12, @13, @14, @15, @16, @17, @18, @19, @20, @21, @22, @23, @24, @25, @26, @27, @28, @29, @30, @31, @32, @33, @34, @35, @36, @37, @38, @39, @40, @41, @42, @43, @44, @45, @46, @47, @48, @49, @50, @51, @52, @53, @54, @55, @56, @57, @58, @59, @60, @61, @62, @63, @64, @65, @66, @67, @68, @69, @70, @71, @72, @73, @74, @75, @76, @77, @78, @79],
@"People+Vehicles": @[@0, @1, @2, @3, @5, @7]
}];
[self loadResolutionSettings];
- [self loadYoloIndexes];
[self loadEvents];
[self loadDeleteOnLaunch];
}
return self;
}
-- (void)saveYoloIndexes {
- if (self.yolo_indexes) {
- [[NSUserDefaults standardUserDefaults] setObject:self.yolo_indexes forKey:@"yolo_indexes"];
- [[NSUserDefaults standardUserDefaults] synchronize];
- }
-}
-
-- (void)loadYoloIndexes {
- NSString *savedKey = [[NSUserDefaults standardUserDefaults] stringForKey:@"yolo_indexes_key"];
- NSArray<NSNumber *> *indexes = self.presets[savedKey] ?: self.presets[@"all"];
- self.yolo_indexes = indexes;
-}
-
- (void)updateYoloIndexesKey:(NSString *)key {
[[NSUserDefaults standardUserDefaults] setObject:key forKey:@"yolo_indexes_key"];
- NSArray<NSNumber *> *indexes = self.presets[key] ?: self.presets[@"all"];
- self.yolo_indexes = indexes;
+ self.yolo_preset = key;
[[NSUserDefaults standardUserDefaults] synchronize];
}
diff --git a/clearcam/Yolo.m b/clearcam/Yolo.m
index 86dc20b..9551109 100644
--- a/clearcam/Yolo.m
+++ b/clearcam/Yolo.m
@@ -164,7 +164,7 @@ UInt8 *rgbData;
}
- (NSArray *)processOutput:(const float *)output {
- NSArray<NSNumber *> *yoloIndexes = [SettingsManager sharedManager].yolo_indexes;
+ NSArray<NSNumber *> *yoloIndexes = [SettingsManager sharedManager].presets[[SettingsManager sharedManager].yolo_preset];
NSMutableArray *boxes = [NSMutableArray array];
int numPredictions = pow(self.yolo_res / 32, 2) * 21;