Skip to content

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

simplify events for now

roryclearf198aa6c7079
diff --git a/clearcam/SceneState.h b/clearcam/SceneState.h
index 59fa345..a7df10d 100644
--- a/clearcam/SceneState.h
+++ b/clearcam/SceneState.h
@@ -5,7 +5,7 @@
@property (nonatomic, strong) NSMutableArray<NSDictionary *> *lastN;
@property (nonatomic, strong) NSMutableDictionary *lastN_total;
@property (nonatomic, strong) NSMutableDictionary *lastN_state;
-@property (nonatomic, strong) NSArray<NSArray<NSNumber *> *> *events;
+@property (nonatomic, strong) NSArray<NSNumber *> *events;
- (void)processOutput:(NSArray *)array;
- (void)writeToFileWithString:(NSString *)customString;
diff --git a/clearcam/SceneState.m b/clearcam/SceneState.m
index dc2695a..3dfda5a 100644
--- a/clearcam/SceneState.m
+++ b/clearcam/SceneState.m
@@ -23,21 +23,21 @@
[self.lastN addObject:frame];
for(int i = 0; i < self.events.count; i++){
- NSNumber *totalValue = self.lastN_total[self.events[i][0]] ?: @0;
- NSNumber *frameValue = frame[self.events[i][0]] ?: @0;
- self.lastN_total[self.events[i][0]] = @(totalValue.intValue + frameValue.intValue);
+ NSNumber *totalValue = self.lastN_total[self.events[i]] ?: @0;
+ NSNumber *frameValue = frame[self.events[i]] ?: @0;
+ self.lastN_total[self.events[i]] = @(totalValue.intValue + frameValue.intValue);
if(self.lastN.count > 10){
- totalValue = self.lastN_total[self.events[i][0]] ?: @0;
- frameValue = self.lastN[0][self.events[i][0]] ?: @0;
- self.lastN_total[self.events[i][0]] = @(totalValue.intValue - frameValue.intValue);
+ totalValue = self.lastN_total[self.events[i]] ?: @0;
+ frameValue = self.lastN[0][self.events[i]] ?: @0;
+ self.lastN_total[self.events[i]] = @(totalValue.intValue - frameValue.intValue);
}
- int current_state = (int)roundf((self.lastN_total[self.events[i][0]] ? [self.lastN_total[self.events[i][0]] floatValue] : 0.0) / 10.0);
- if(!self.lastN_state[self.events[i][0]]){
- self.lastN_state[self.events[i][0]] = 0;
+ int current_state = (int)roundf((self.lastN_total[self.events[i]] ? [self.lastN_total[self.events[i]] floatValue] : 0.0) / 10.0);
+ if(!self.lastN_state[self.events[i]]){
+ self.lastN_state[self.events[i]] = 0;
}
- if(current_state != [self.lastN_state[self.events[i][0]] intValue]){
+ if(current_state != [self.lastN_state[self.events[i]] intValue]){
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
NSString *documentsDirectory = [paths firstObject];
NSString *filePath = [documentsDirectory stringByAppendingPathComponent:@"events.txt"];
@@ -51,12 +51,12 @@
[dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
NSString *timestamp = [dateFormatter stringFromDate:[NSDate date]];
- NSString *contentToWrite = [NSString stringWithFormat:@"%@ class: %@ x%@\n", timestamp, self.events[i][0], @(current_state)];
+ NSString *contentToWrite = [NSString stringWithFormat:@"%@ class: %@ x%@\n", timestamp, self.events[i], @(current_state)];
NSFileHandle *fileHandle = [NSFileHandle fileHandleForWritingAtPath:filePath];
[fileHandle seekToEndOfFile];
[fileHandle writeData:[contentToWrite dataUsingEncoding:NSUTF8StringEncoding]];
[fileHandle closeFile];
- self.lastN_state[self.events[i][0]] = @(current_state);
+ self.lastN_state[self.events[i]] = @(current_state);
}
}
diff --git a/clearcam/SettingsManager.h b/clearcam/SettingsManager.h
index cb3b70a..482b5e2 100644
--- a/clearcam/SettingsManager.h
+++ b/clearcam/SettingsManager.h
@@ -3,7 +3,7 @@
@interface SettingsManager : NSObject
@property (nonatomic, strong) NSArray<NSNumber *> *yolo_indexes;
-@property (nonatomic, strong) NSArray<NSArray<NSNumber *> *> *events;
+@property (nonatomic, strong) NSArray<NSNumber *> *events;
+ (instancetype)sharedManager;
diff --git a/clearcam/SettingsManager.m b/clearcam/SettingsManager.m
index 06eb00c..8e41640 100644
--- a/clearcam/SettingsManager.m
+++ b/clearcam/SettingsManager.m
@@ -62,10 +62,10 @@
}
}
-- (NSArray<NSArray<NSNumber *> *> *)generateDefaultEvents {
- NSMutableArray<NSArray<NSNumber *> *> *defaultEvenets = [NSMutableArray array];
- [defaultEvenets addObject:@[@0,@1]]; // 1 person for now // todo, default will be none, +/- person will be a bool
- [defaultEvenets addObject:@[@2,@1]]; // 1 car why not?
+- (NSArray<NSNumber *> *)generateDefaultEvents {
+ NSMutableArray<NSNumber *> *defaultEvenets = [NSMutableArray array];
+ [defaultEvenets addObject:@0]; // 1 person for now // todo, default will be none, +/- person will be a bool
+ [defaultEvenets addObject:@2]; // 1 car why not?
return [defaultEvenets copy];
}