Improved the reset graph code to happen at the XRGDataSet level.

mikepj · Feb 7, 2020 · b4aaa76 · b4aaa76
1 parent f3f41f5
commit b4aaa76
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 27 deletions.
diff --git a/Data Miners/XRGCPUMiner.h b/Data Miners/XRGCPUMiner.h
@@ -57,9 +57,9 @@
 @property CGFloat currentLoadAverage;
 
 @property NSInteger *fastValues;
-@property NSMutableArray *userValues;
-@property NSMutableArray *systemValues;
-@property NSMutableArray *niceValues;
+@property NSMutableArray<XRGDataSet *> *userValues;
+@property NSMutableArray<XRGDataSet *> *systemValues;
+@property NSMutableArray<XRGDataSet *> *niceValues;
 
 - (void)graphUpdate:(NSTimer *)aTimer;
 - (void)fastUpdate:(NSTimer *)aTimer;

diff --git a/Data Miners/XRGCPUMiner.m b/Data Miners/XRGCPUMiner.m
@@ -226,11 +226,17 @@ - (CGFloat)getLoadAverage {
 }
 
 - (void)reset {
-    self.userValues = nil;
-    self.systemValues = nil;
-    self.niceValues = nil;
-
-    [self setDataSize:numSamples];
+    for (XRGDataSet *set in self.userValues) {
+        [set reset];
+    }
+
+    for (XRGDataSet *set in self.systemValues) {
+        [set reset];
+    }
+
+    for (XRGDataSet *set in self.niceValues) {
+        [set reset];
+    }
 }
 
 - (void)setCurrentUptime {

diff --git a/Data Miners/XRGMemoryMiner.m b/Data Miners/XRGMemoryMiner.m
@@ -74,11 +74,9 @@ - (void)setDataSize:(int)newNumSamples {
 }
 
 - (void)reset {
-    values1 = nil;
-    values2 = nil;
-    values3 = nil;
-
-    [self setDataSize:numSamples];
+    [values1 reset];
+    [values2 reset];
+    [values3 reset];
 }
 
 - (void)getLatestMemoryInfo {

diff --git a/Data Miners/XRGNetMiner.m b/Data Miners/XRGNetMiner.m
@@ -153,11 +153,9 @@ - (CGFloat)currentRX {
 }
 
 - (void)reset {
-    _rxValues = nil;
-    _txValues = nil;
-    _totalValues = nil;
-
-    [self setDataSize:self.numSamples];
+    [self.rxValues reset];
+    [self.txValues reset];
+    [self.totalValues reset];
 }
 
 - (void)setCurrentBandwidth {

diff --git a/Data Miners/XRGTemperatureMiner.h b/Data Miners/XRGTemperatureMiner.h
@@ -59,9 +59,9 @@
 @private
 
     int                         numSamples;					// for the XRGDataSets, number of samples to record.
-	NSMutableArray				*locationKeysInOrder;		// locations in certain order, returned by locationKeysInOrder, generated by regenerateLocationKeyOrder.
+	NSMutableArray<NSString *>	*locationKeysInOrder;		// locations in certain order, returned by locationKeysInOrder, generated by regenerateLocationKeyOrder.
 
-	NSMutableDictionary			*sensorData;
+	NSMutableDictionary<NSString *,NSDictionary *> *sensorData;
     SMCSensors					*smcSensors;
 }
 

diff --git a/Data Miners/XRGTemperatureMiner.m b/Data Miners/XRGTemperatureMiner.m
@@ -59,10 +59,9 @@ - (instancetype)init {
 }
 
 - (void)reset {
-    int width = numSamples;
-
-    [self setDataSize:0];
-    [self setDataSize:width];
+    for (NSDictionary *sensorValue in [sensorData allValues]) {
+        [sensorValue[GSDataSetKey] reset];
+    }
 }
 
 - (int)numberOfCPUs {

diff --git a/Graph Views/XRGDiskView.m b/Graph Views/XRGDiskView.m
@@ -451,9 +451,11 @@ - (void)openDiskPreferences:(NSEvent *)theEvent {
 }
 
 - (void)clearData:(NSEvent *)theEvent {
-    int width = numSamples;
-    [self setWidth:1];
-    [self setWidth:width];
+    for (NSInteger i = 0; i < numSamples; i++) {
+        values[i] = 0;
+        readValues[i] = 0;
+        writeValues[i] = 0;
+    }
 }
 
 - (BOOL)acceptsFirstMouse:(NSEvent *)theEvent {       

diff --git a/Utility/XRGDataSet.h b/Utility/XRGDataSet.h
@@ -42,6 +42,7 @@
 - (CGFloat) currentValue;
 - (void) valuesInOrder:(CGFloat *)destinationArray;
 
+- (void) reset;
 - (void) resize:(size_t)newNumValues;
 - (void) setNextValue:(CGFloat)nextVal;
 - (void) setAllValues:(CGFloat)value;

diff --git a/Utility/XRGDataSet.m b/Utility/XRGDataSet.m
@@ -99,6 +99,12 @@ - (void) valuesInOrder:(CGFloat *)destinationArray {
     }
 }
 
+- (void) reset {
+    for (NSInteger i = 0; i < self.numValues; i++) {
+        _values[i] = 0;
+    }
+}
+
 - (void) resize:(size_t)newNumValues {
     if (newNumValues == 0) {
         self.min = 0;