Keep old graphs data while rebuilding sensors list

Author: Cozmonat

HWMonitor/GraphsView.h

@@ -32,7 +32,6 @@
 @interface GraphsView : NSView
 {
     NSMutableArray *_items;
-    NSMutableDictionary *_graphs;
 
     NSRect _graphBounds;
     double _minY;
@@ -49,6 +48,7 @@
 @property (nonatomic, assign) BOOL useSmoothing;
 @property (nonatomic, assign) float graphScale;
 @property (nonatomic, assign) HWSensorGroup sensorGroup;
+@property (readonly) NSMutableDictionary *graphs;
 
 - (NSArray*)addItemsFromList:(NSArray*)itemsList forSensorGroup:(HWSensorGroup)sensorsGroup;
 - (void)calculateGraphBoundsFindExtremes:(BOOL)findExtremes;

HWMonitor/GraphsView.m

@@ -30,13 +30,24 @@
 #import "HWMonitorDefinitions.h"
 #import "Localizer.h"
 
+static NSMutableDictionary *graphs_history = nil;
+
 @implementation GraphsView
 
 #define LeftViewMargin      1
 #define TopViewMargin       1
 #define RightViewMargin     1
 #define BottomViewMargin    1
 
+-(NSMutableDictionary *)graphs
+{
+    if (!graphs_history) {
+        graphs_history = [[NSMutableDictionary alloc] init];
+    }
+
+    return graphs_history;
+}
+
 -(id)init
 {
     self = [super init];
@@ -92,17 +103,12 @@ - (NSArray*)addItemsFromList:(NSArray*)itemsList forSensorGroup:(HWSensorGroup)s
     else {
         [_items removeAllObjects];
     }
-    
-    if (!_graphs) {
-        _graphs = [[NSMutableDictionary alloc] init];
-    }
-    else {
-        [_graphs removeAllObjects];
-    }
 
     for (HWMonitorItem *item in itemsList) {
         [_items addObject:item];
-        [_graphs setObject:[[NSMutableArray alloc] init] forKey:[[item sensor] name]];
+        if (![self.graphs objectForKey:item.sensor.name]) {
+            [self.graphs setObject:[[NSMutableArray alloc] init] forKey:[[item sensor] name]];
+        }
     }
 
     [self calculateGraphBoundsFindExtremes:YES];
@@ -114,7 +120,7 @@ - (void)captureDataToHistoryNow;
 {
     for (HWMonitorItem *item in _items) {
         HWMonitorSensor *sensor = [item sensor];
-        NSMutableArray *history = [_graphs objectForKey:[sensor name]];
+        NSMutableArray *history = [self.graphs objectForKey:[sensor name]];
 
         if ([sensor rawValue]) {
             [history addObject:[sensor rawValue]];
@@ -142,7 +148,7 @@ - (void)calculateGraphBoundsFindExtremes:(BOOL)findExtremes
                 continue;
 
             HWMonitorSensor *sensor = [item sensor];
-            NSArray *points = [_graphs objectForKey:[sensor name]];
+            NSArray *points = [self.graphs objectForKey:[sensor name]];
 
             if (points) {
                 for (NSNumber *point in points) {
@@ -235,7 +241,7 @@ - (void)drawRect:(NSRect)rect
             continue;
 
         HWMonitorSensor *sensor = [item sensor];
-        NSArray *values = [_graphs objectForKey:[sensor name]];
+        NSArray *values = [self.graphs objectForKey:[sensor name]];
 
         if (!values || [values count] < 2)
             continue;