Skip to content

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

clean a bit

roryclearf7619cbc49c6
diff --git a/clearcam/FileServer.m b/clearcam/FileServer.m
index 7874ddd..7e669c9 100644
--- a/clearcam/FileServer.m
+++ b/clearcam/FileServer.m
@@ -308,7 +308,7 @@
}
}
if (indexesParam) {
- if ([[SettingsManager sharedManager].presets objectForKey:indexesParam]) {
+ if ([[SettingsManager sharedManager].yolo_presets objectForKey:indexesParam]) {
[[SettingsManager sharedManager] updateYoloIndexesKey:indexesParam];
} else {
[[SettingsManager sharedManager] updateYoloIndexesKey:@"all"];
@@ -320,7 +320,7 @@
}
if ([filePath isEqualToString:@"get-presets"]) {
- NSDictionary *presets = [SettingsManager sharedManager].presets;
+ NSDictionary *presets = [SettingsManager sharedManager].yolo_presets;
NSError *error;
NSData *jsonData = [NSJSONSerialization dataWithJSONObject:[presets allKeys] options:0 error:&error];
diff --git a/clearcam/SettingsManager.h b/clearcam/SettingsManager.h
index c0ade2e..8c54450 100644
--- a/clearcam/SettingsManager.h
+++ b/clearcam/SettingsManager.h
@@ -9,9 +9,9 @@
@property (nonatomic, strong) NSString *width;
@property (nonatomic, strong) NSString *height;
@property (nonatomic, strong) NSString *text_size;
-@property (nonatomic, strong) NSString *preset;
+@property (nonatomic, strong) NSString *preset; //todo, resolution
@property (nonatomic, strong) NSString *yolo_preset;
-@property (nonatomic, strong) NSMutableDictionary *presets;
+@property (nonatomic, strong) NSMutableDictionary *yolo_presets;
+ (instancetype)sharedManager;
diff --git a/clearcam/SettingsManager.m b/clearcam/SettingsManager.m
index a834bd4..85cb9a2 100644
--- a/clearcam/SettingsManager.m
+++ b/clearcam/SettingsManager.m
@@ -16,10 +16,17 @@
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]
- }];
+ NSDictionary *savedPresets = [[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"];
+ if (!savedPresets) {
+ self.yolo_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]
+ }];
+ [[NSUserDefaults standardUserDefaults] setObject:self.yolo_presets forKey:@"yolo_presets"];
+ } else {
+ self.yolo_presets = [savedPresets mutableCopy];
+ }
+ [[NSUserDefaults standardUserDefaults] synchronize];
[self loadResolutionSettings];
[self loadEvents];
[self loadDeleteOnLaunch];
diff --git a/clearcam/SettingsViewController.m b/clearcam/SettingsViewController.m
index 1f00eac..1b45c81 100644
--- a/clearcam/SettingsViewController.m
+++ b/clearcam/SettingsViewController.m
@@ -135,7 +135,7 @@
message:nil
preferredStyle:UIAlertControllerStyleActionSheet];
SettingsManager *settingsManager = [SettingsManager sharedManager];
- NSArray *presetKeys = [settingsManager.presets allKeys];
+ NSArray *presetKeys = [settingsManager.yolo_presets allKeys];
for (NSString *presetKey in presetKeys) {
UIAlertAction *action = [UIAlertAction actionWithTitle:presetKey
style:UIAlertActionStyleDefault
@@ -220,12 +220,12 @@
message:@"Select a preset to edit"
preferredStyle:UIAlertControllerStyleActionSheet];
SettingsManager *settingsManager = [SettingsManager sharedManager];
- NSArray *presetKeys = [settingsManager.presets allKeys];
+ NSArray *presetKeys = [settingsManager.yolo_presets allKeys];
for (NSString *presetKey in presetKeys) {
UIAlertAction *action = [UIAlertAction actionWithTitle:presetKey
style:UIAlertActionStyleDefault
handler:^(UIAlertAction * _Nonnull action) {
- NSArray *selectedIndexes = settingsManager.presets[presetKey];
+ NSArray *selectedIndexes = settingsManager.yolo_presets[presetKey];
[self showNumberSelectionForPreset:presetKey selectedIndexes:selectedIndexes];
}];
[alert addAction:action];
@@ -243,7 +243,7 @@
numberSelectionVC.selectedIndexes = [selectedIndexes mutableCopy];
numberSelectionVC.completionHandler = ^(NSArray<NSNumber *> *selectedIndexes) {
SettingsManager *settingsManager = [SettingsManager sharedManager];
- settingsManager.presets[presetKey] = selectedIndexes;
+ settingsManager.yolo_presets[presetKey] = selectedIndexes;
[[NSUserDefaults standardUserDefaults] synchronize];
[self.tableView reloadData];
};
@@ -255,13 +255,13 @@
message:@"Select a preset to delete"
preferredStyle:UIAlertControllerStyleActionSheet];
SettingsManager *settingsManager = [SettingsManager sharedManager];
- NSArray *presetKeys = [settingsManager.presets allKeys];
+ NSArray *presetKeys = [settingsManager.yolo_presets allKeys];
for (NSString *presetKey in presetKeys) {
if (![presetKey isEqualToString:@"all"]) { // Prevent deletion of the "all" preset
UIAlertAction *action = [UIAlertAction actionWithTitle:presetKey
style:UIAlertActionStyleDestructive
handler:^(UIAlertAction * _Nonnull action) {
- [settingsManager.presets removeObjectForKey:presetKey];
+ [settingsManager.yolo_presets removeObjectForKey:presetKey];
[[NSUserDefaults standardUserDefaults] synchronize];
[self.tableView reloadData];
}];
diff --git a/clearcam/Yolo.m b/clearcam/Yolo.m
index 9551109..c4193b5 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].presets[[SettingsManager sharedManager].yolo_preset];
+ NSArray<NSNumber *> *yoloIndexes = [SettingsManager sharedManager].yolo_presets[[SettingsManager sharedManager].yolo_preset];
NSMutableArray *boxes = [NSMutableArray array];
int numPredictions = pow(self.yolo_res / 32, 2) * 21;