Skip to content
This repository was archived by the owner on Oct 12, 2018. It is now read-only.

Commit cfebcf3

Browse files
CozmonatCozmonat
committed
Merge branch 'develop'
* develop: Update menubar sensors then changing temperature units Battery sensors fixes. Workaround for Maveriks multiple displays. Other fixes. GK110B support, thank to MysticalOS for testing. HWMonitor updates GUI in background threads fix Minor fixes Minor fixes HWMonitor wake after sleep paused fix. Untested - support for newest Kepler cards.
2 parents abd255e + 2d790ac commit cfebcf3

35 files changed

+416
-310
lines changed

‎GPUSensors/NouveauSensors/nouveau.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ bool nouveau_identify(struct nouveau_device *device)
5252
/* determine chipset and derive architecture from it */
5353
if ((boot0 & 0x0f000000) > 0) {
5454
device->chipset = (boot0 & 0xff00000) >> 20;
55-
switch (device->chipset & 0xf0) {
55+
switch (device->chipset & ~0xf) {
5656
case 0x40:
5757
case 0x60: device->card_type = NV_40; break;
5858
case 0x50:
@@ -62,7 +62,8 @@ bool nouveau_identify(struct nouveau_device *device)
6262
case 0xc0: device->card_type = NV_C0; break;
6363
case 0xd0: device->card_type = NV_D0; break;
6464
case 0xe0:
65-
case 0xf0: device->card_type = NV_E0; break;
65+
case 0xf0:
66+
case 0x100: device->card_type = NV_E0; break;
6667
default:
6768
break;
6869
}

‎GPUSensors/NouveauSensors/nve0.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,11 @@ bool nve0_identify(struct nouveau_device *device)
5454
case 0xf0:
5555
device->cname = "GK110";
5656
break;
57+
case 0xf1:
58+
device->cname = "GK110B";
59+
break;
5760
default:
58-
nv_fatal(device, "unknown Kepler chipset\n");
61+
nv_fatal(device, "unknown Kepler chipset 0x%x\n", device->chipset);
5962
return false;
6063
}
6164

‎HWMonitor.xcodeproj/project.pbxproj

+23-7
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
7E2042051730D04100C13B65 /* AppController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7E2042041730D04000C13B65 /* AppController.xib */; };
3333
7E268C621837A41C004F16E3 /* HWMIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E268C611837A41C004F16E3 /* HWMIcon.m */; };
3434
7E268C681837C13B004F16E3 /* HWMItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E268C671837C13B004F16E3 /* HWMItem.m */; };
35+
7E3A93121848A8A70097F83E /* HWMEngine.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 7E3A93101848A8A70097F83E /* HWMEngine.xcdatamodeld */; };
3536
7E420F9D1820E04900331D2B /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E420F9C1820E04900331D2B /* XCTest.framework */; };
3637
7E420FA31820E04900331D2B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7E420FA11820E04900331D2B /* InfoPlist.strings */; };
3738
7E420FA51820E04900331D2B /* HWMonitor_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E420FA41820E04900331D2B /* HWMonitor_Tests.m */; };
@@ -85,7 +86,6 @@
8586
7EA2494416D8EA95002231B2 /* smc.c in Sources */ = {isa = PBXBuildFile; fileRef = 7EA2493F16D8EA95002231B2 /* smc.c */; };
8687
7EA2494D16D8EB2D002231B2 /* StatusItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EA2494C16D8EB2D002231B2 /* StatusItemView.m */; };
8788
7EA2494F16D8EBC1002231B2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7EA2494E16D8EBC0002231B2 /* IOKit.framework */; };
88-
7EA3E98818377425002D93AC /* HWMEngine.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 7ED3C8A91832D963000E3C0E /* HWMEngine.xcdatamodeld */; };
8989
7EA50F0517F3771D00FDA3AA /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7EA50F0417F3771D00FDA3AA /* Sparkle.framework */; };
9090
7EA50F0617F3772500FDA3AA /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7EA50F0417F3771D00FDA3AA /* Sparkle.framework */; };
9191
7EBA20DB17ED9C98008E54C5 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 7EBA20DA17ED9C98008E54C5 /* dsa_pub.pem */; };
@@ -104,6 +104,8 @@
104104
7EDA1AD116DA83AF0012A0DC /* GraphsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EDA1AD016DA83AF0012A0DC /* GraphsController.m */; };
105105
7EDDC87316FA5DA50072B15B /* Localizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EDDC87216FA5DA50072B15B /* Localizer.m */; };
106106
7EDEA333173E3B94003ADE86 /* hwsensors.icns in Resources */ = {isa = PBXBuildFile; fileRef = 7EDEA332173E3B94003ADE86 /* hwsensors.icns */; };
107+
7EEB2D6B1847E82C008B6D1C /* SmcHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EEB2D6A1847E82C008B6D1C /* SmcHelper.m */; };
108+
7EEB2D6C1847E8FE008B6D1C /* SmcHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EEB2D6A1847E82C008B6D1C /* SmcHelper.m */; };
107109
7EED6D6F1734F8E700248870 /* 16-line-chart.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EED6D6B1734F8E700248870 /* 16-line-chart.png */; };
108110
7EED6D701734F8E700248870 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 7EED6D6C1734F8E700248870 /* [email protected] */; };
109111
7EED6D7D1734F9CF00248870 /* 19-gear.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EED6D7B1734F9CF00248870 /* 19-gear.png */; };
@@ -198,6 +200,7 @@
198200
7E268C661837C13B004F16E3 /* HWMItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HWMItem.h; sourceTree = "<group>"; };
199201
7E268C671837C13B004F16E3 /* HWMItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HWMItem.m; sourceTree = "<group>"; };
200202
7E2FE0A3178D18CA00802D38 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
203+
7E3A93111848A8A70097F83E /* HWMEngine.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = HWMEngine.xcdatamodel; sourceTree = "<group>"; };
201204
7E420F9B1820E04900331D2B /* HWMonitor Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HWMonitor Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
202205
7E420F9C1820E04900331D2B /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
203206
7E420FA01820E04900331D2B /* HWMonitor Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "HWMonitor Tests-Info.plist"; sourceTree = "<group>"; };
@@ -289,7 +292,6 @@
289292
7ECDDE4016DEB5F600085FFF /* GraphsGroupCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GraphsGroupCell.m; sourceTree = "<group>"; };
290293
7ED3004B180285400020D818 /* JLNFadingScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JLNFadingScrollView.h; sourceTree = "<group>"; };
291294
7ED3004E1802895E0020D818 /* JLNFadingScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JLNFadingScrollView.m; sourceTree = "<group>"; };
292-
7ED3C8AA1832D963000E3C0E /* HWMEngine.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = HWMEngine.xcdatamodel; sourceTree = "<group>"; };
293295
7EDA1A6B16D901100012A0DC /* PopupController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopupController.h; sourceTree = "<group>"; };
294296
7EDA1A6C16D901100012A0DC /* PopupController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PopupController.m; sourceTree = "<group>"; };
295297
7EDA1A7316D903740012A0DC /* PopupGroupCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopupGroupCell.h; sourceTree = "<group>"; };
@@ -306,6 +308,8 @@
306308
7EDDC87216FA5DA50072B15B /* Localizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Localizer.m; sourceTree = "<group>"; };
307309
7EDEA331173E3B83003ADE86 /* hwsensors.psd */ = {isa = PBXFileReference; lastKnownFileType = file; path = hwsensors.psd; sourceTree = "<group>"; };
308310
7EDEA332173E3B94003ADE86 /* hwsensors.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = hwsensors.icns; sourceTree = "<group>"; };
311+
7EEB2D691847E82C008B6D1C /* SmcHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmcHelper.h; sourceTree = "<group>"; };
312+
7EEB2D6A1847E82C008B6D1C /* SmcHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SmcHelper.m; sourceTree = "<group>"; };
309313
7EED6D6B1734F8E700248870 /* 16-line-chart.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "16-line-chart.png"; sourceTree = "<group>"; };
310314
7EED6D6C1734F8E700248870 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
311315
7EED6D7B1734F9CF00248870 /* 19-gear.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "19-gear.png"; sourceTree = "<group>"; };
@@ -468,6 +472,7 @@
468472
children = (
469473
7E1261D316E0094A00622F92 /* FakeSMCDefinitions.h */,
470474
7E2678B6182523EA00B405DE /* Kernel */,
475+
7EEB2D681847E819008B6D1C /* Cocoa */,
471476
7EB7E708178341D80071B3F0 /* Versioning */,
472477
);
473478
name = Shared;
@@ -782,7 +787,7 @@
782787
7EC8E7CE183356F4006F85FE /* CoreData */ = {
783788
isa = PBXGroup;
784789
children = (
785-
7ED3C8A91832D963000E3C0E /* HWMEngine.xcdatamodeld */,
790+
7E3A93101848A8A70097F83E /* HWMEngine.xcdatamodeld */,
786791
7E19DEC61843D30200229B0E /* Sensors */,
787792
7E19DEC51843D2F500229B0E /* Graphs */,
788793
7E19DEC71843D30E00229B0E /* Engine */,
@@ -813,6 +818,15 @@
813818
name = Graphics;
814819
sourceTree = "<group>";
815820
};
821+
7EEB2D681847E819008B6D1C /* Cocoa */ = {
822+
isa = PBXGroup;
823+
children = (
824+
7EEB2D691847E82C008B6D1C /* SmcHelper.h */,
825+
7EEB2D6A1847E82C008B6D1C /* SmcHelper.m */,
826+
);
827+
name = Cocoa;
828+
sourceTree = "<group>";
829+
};
816830
7EF2A0FF17303C3600D8641C /* About Panel */ = {
817831
isa = PBXGroup;
818832
children = (
@@ -1052,6 +1066,7 @@
10521066
isa = PBXSourcesBuildPhase;
10531067
buildActionMask = 2147483647;
10541068
files = (
1069+
7EEB2D6C1847E8FE008B6D1C /* SmcHelper.m in Sources */,
10551070
7E9060F517089A7100BF5BBF /* smc.c in Sources */,
10561071
7E9060E81708951800BF5BBF /* main.m in Sources */,
10571072
);
@@ -1063,6 +1078,7 @@
10631078
files = (
10641079
7EA248F816D8E93A002231B2 /* main.m in Sources */,
10651080
7E1900B0184279CD00C6A0E8 /* HWMGraph.m in Sources */,
1081+
7E3A93121848A8A70097F83E /* HWMEngine.xcdatamodeld in Sources */,
10661082
7EA248FF16D8E93A002231B2 /* AppController.m in Sources */,
10671083
7E19DED31843E97300229B0E /* HWMConfiguration.m in Sources */,
10681084
7EA2494116D8EA95002231B2 /* ATAGenericDrive.m in Sources */,
@@ -1076,6 +1092,7 @@
10761092
7EDA1A6D16D901100012A0DC /* PopupController.m in Sources */,
10771093
7EDA1A7816D903740012A0DC /* PopupGroupCell.m in Sources */,
10781094
7EDA1A7916D903740012A0DC /* PopupSensorCell.m in Sources */,
1095+
7EEB2D6B1847E82C008B6D1C /* SmcHelper.m in Sources */,
10791096
7EDA1ACB16D956EA0012A0DC /* GraphsView.m in Sources */,
10801097
7EDA1AD116DA83AF0012A0DC /* GraphsController.m in Sources */,
10811098
7ED3004F1802895E0020D818 /* JLNFadingScrollView.m in Sources */,
@@ -1098,7 +1115,6 @@
10981115
7E7D61FB1704453B00F7222F /* FadingButton.m in Sources */,
10991116
7E16FD8A1706BB3000FB253E /* TransparentSplitView.m in Sources */,
11001117
95A15D161825201000AA30D1 /* CreditsScrollView.m in Sources */,
1101-
7EA3E98818377425002D93AC /* HWMEngine.xcdatamodeld in Sources */,
11021118
7E93E29E183E832600957EDF /* HWMColorTheme.m in Sources */,
11031119
7EFE61B1183581090009BD0D /* HWMAtaSmartSensor.m in Sources */,
11041120
7EF2A0F61730379C00D8641C /* AboutController.m in Sources */,
@@ -1377,12 +1393,12 @@
13771393
/* End XCConfigurationList section */
13781394

13791395
/* Begin XCVersionGroup section */
1380-
7ED3C8A91832D963000E3C0E /* HWMEngine.xcdatamodeld */ = {
1396+
7E3A93101848A8A70097F83E /* HWMEngine.xcdatamodeld */ = {
13811397
isa = XCVersionGroup;
13821398
children = (
1383-
7ED3C8AA1832D963000E3C0E /* HWMEngine.xcdatamodel */,
1399+
7E3A93111848A8A70097F83E /* HWMEngine.xcdatamodel */,
13841400
);
1385-
currentVersion = 7ED3C8AA1832D963000E3C0E /* HWMEngine.xcdatamodel */;
1401+
currentVersion = 7E3A93111848A8A70097F83E /* HWMEngine.xcdatamodel */;
13861402
path = HWMEngine.xcdatamodeld;
13871403
sourceTree = "<group>";
13881404
versionGroupType = wrapper.xcdatamodel;

‎HWMonitor/AppController.m

+7-3
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,14 @@ -(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NS
126126
[_monitorEngine setNeedsRecalculateSensorValues];
127127
}
128128
else if ([keyPath isEqual:@"monitorEngine.configuration.favorites"]) {
129-
[_favoritesTableView reloadData];
129+
dispatch_async(dispatch_get_main_queue(), ^{
130+
[_favoritesTableView reloadData];
131+
});
130132
}
131133
else if ([keyPath isEqual:@"monitorEngine.iconsWithSensorsAndGroups"]) {
132-
[_sensorsTableView reloadData];
134+
dispatch_async(dispatch_get_main_queue(), ^{
135+
[_favoritesTableView reloadData];
136+
});
133137
}
134138
}
135139

@@ -449,7 +453,7 @@ - (BOOL)tableView:(NSTableView *)tableView acceptDrop:(id <NSDraggingInfo>)info
449453
// [tableView insertRowsAtIndexes:[NSIndexSet indexSetWithIndex:toRow] withAnimation:NSTableViewAnimationEffectGap];
450454
//
451455
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0f * NSEC_PER_SEC)), dispatch_get_global_queue( DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void){
452-
[_monitorEngine insertItemToFavorites:item atIndex:toRow > 0 ? toRow - 1 : 0];
456+
[_monitorEngine insertItemIntoFavorites:item atIndex:toRow > 0 ? toRow - 1 : 0];
453457
// });
454458
}
455459
}

‎HWMonitor/GraphsController.m

+2-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,8 @@ -(id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn
246246
-(NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
247247
{
248248
id item = [_monitorEngine.graphsAndGroups objectAtIndex:row];
249-
return [tableView makeViewWithIdentifier:[item identifier] owner:self];
249+
id view = [tableView makeViewWithIdentifier:[item identifier] owner:self];
250+
return view;
250251
}
251252

252253
@end

‎HWMonitor/GraphsController.xib

+2-2
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
<binding destination="Cd6-Ee-dS1" name="value" keyPath="objectValue.sensor.formattedValue" id="YJs-ub-y8H"/>
168168
</connections>
169169
</textField>
170-
<colorWell bordered="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nq5-Vi-SNC">
170+
<colorWell bordered="NO" continuous="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nq5-Vi-SNC">
171171
<rect key="frame" x="3" y="1" width="17" height="17"/>
172172
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
173173
<constraints>
@@ -214,7 +214,7 @@
214214
</constraints>
215215
<connections>
216216
<outlet property="checkBox" destination="ovP-2f-YU6" id="iEb-Pq-OgB"/>
217-
<outlet property="colorWell" destination="nq5-Vi-SNC" id="NYL-9Y-0I5"/>
217+
<outlet property="colorWell" destination="nq5-Vi-SNC" id="Dr6-cI-EBm"/>
218218
<outlet property="textField" destination="65M-u0-GnR" id="lbB-xZ-AbE"/>
219219
<outlet property="valueField" destination="Bk6-mR-Grw" id="d18-X1-hKR"/>
220220
</connections>

‎HWMonitor/GraphsSensorCell.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
// Copyright (c) 2013 kozlek. All rights reserved.
77
//
88

9+
@class GraphsColorWell;
10+
911
@interface GraphsSensorCell : NSTableCellView
1012

11-
@property (assign) IBOutlet NSColorWell *colorWell;
13+
@property (assign) IBOutlet GraphsColorWell *colorWell;
1214
@property (assign) IBOutlet NSButton *checkBox;
1315
@property (assign) IBOutlet NSTextField *valueField;
1416

‎HWMonitor/GraphsView.h

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838

3939
NSDictionary *_legendAttributes;
4040
NSString *_legendFormat;
41+
42+
BOOL _isTemperatureGroup;
4143
}
4244

4345
@property (assign) IBOutlet GraphsController *graphsController;

‎HWMonitor/GraphsView.m

+15-12
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@
3232

3333
#import "HWMGraph.h"
3434
#import "HWMGraphsGroup.h"
35+
#import "HWMSensorsGroup.h"
3536
#import "HWMSensor.h"
3637
#import "HWMEngine.h"
3738
#import "HWMConfiguration.h"
3839

3940
#define LeftViewMargin 1
40-
#define TopViewMargin 1
41+
#define TopViewMargin 2
4142
#define RightViewMargin 1
42-
#define BottomViewMargin 1
43+
#define BottomViewMargin 2
4344

4445
@implementation GraphsView
4546

@@ -51,25 +52,27 @@ -(void)setGraphsGroup:(HWMGraphsGroup *)group
5152

5253
_graphsGroup = group;
5354

54-
if (_graphsGroup.selectors & (kHWMGroupTemperature | kHWMGroupSmartTemperature)) {
55+
if ([_graphsGroup.selectors containsObject:@kHWMGroupTemperature] ||
56+
[_graphsGroup.selectors containsObject:@kHWMGroupSmartTemperature]) {
5557
_legendFormat = @"%1.0f°";
58+
_isTemperatureGroup = YES;
5659
}
57-
else if (_graphsGroup.selectors & kHWMGroupFrequency) {
60+
else if ([_graphsGroup.selectors containsObject:@kHWMGroupFrequency]) {
5861
_legendFormat = GetLocalizedString(@"%1.0f MHz");
5962
}
60-
else if (_graphsGroup.selectors & kHWMGroupTachometer) {
63+
else if ([_graphsGroup.selectors containsObject:@kHWMGroupTachometer]) {
6164
_legendFormat = GetLocalizedString(@"%1.0f rpm");
6265
}
63-
else if (_graphsGroup.selectors & kHWMGroupVoltage) {
66+
else if ([_graphsGroup.selectors containsObject:@kHWMGroupVoltage]) {
6467
_legendFormat = GetLocalizedString(@"%1.3f V");
6568
}
66-
else if (_graphsGroup.selectors & kHWMGroupCurrent) {
69+
else if ([_graphsGroup.selectors containsObject:@kHWMGroupCurrent]) {
6770
_legendFormat = GetLocalizedString(@"%1.3f A");
6871
}
69-
else if (_graphsGroup.selectors & kHWMGroupPower) {
72+
else if ([_graphsGroup.selectors containsObject:@kHWMGroupPower]) {
7073
_legendFormat = GetLocalizedString(@"%1.3f W");
7174
}
72-
else if (_graphsGroup.selectors & kHWMGroupBattery) {
75+
else if ([_graphsGroup.selectors containsObject:@kHWMGroupBattery]) {
7376
_legendFormat = @"%1.0f%";
7477
}
7578

@@ -148,7 +151,7 @@ - (void)calculateGraphBoundsFindExtremes:(BOOL)findExtremes
148151
}
149152
else {
150153

151-
double minY = _minY <= 0 ? _minY : _minY - _minY * 0.2;
154+
double minY = _minY <= 0 ? _minY : _minY - _minY * 0.05;
152155
double maxY = _maxY + _maxY * 0.1;
153156

154157
_graphBounds = NSMakeRect(0, minY, _maxPoints, maxY - minY);
@@ -272,11 +275,11 @@ - (void)drawRect:(NSRect)rect
272275
[context setShouldAntialias:YES];
273276

274277
NSAttributedString *maxExtremeTitle = [[NSAttributedString alloc]
275-
initWithString:[NSString stringWithFormat:_legendFormat, (_graphsGroup.selectors & (kHWMGroupTemperature | kHWMGroupSmartTemperature) && self.graphsController.monitorEngine.configuration.useFahrenheit.boolValue ? _maxY * (9.0f / 5.0f) + 32.0f : _maxY )]
278+
initWithString:[NSString stringWithFormat:_legendFormat, _isTemperatureGroup && self.graphsController.monitorEngine.configuration.useFahrenheit.boolValue ? _maxY * (9.0f / 5.0f) + 32.0f : _maxY]
276279
attributes:_legendAttributes];
277280

278281
NSAttributedString *minExtremeTitle = [[NSAttributedString alloc]
279-
initWithString:[NSString stringWithFormat:_legendFormat, (_graphsGroup.selectors & (kHWMGroupTemperature | kHWMGroupSmartTemperature) && self.graphsController.monitorEngine.configuration.useFahrenheit.boolValue ? _minY * (9.0f / 5.0f) + 32.0f : _minY )]
282+
initWithString:[NSString stringWithFormat:_legendFormat, _isTemperatureGroup && self.graphsController.monitorEngine.configuration.useFahrenheit.boolValue ? _minY * (9.0f / 5.0f) + 32.0f : _minY]
280283
attributes:_legendAttributes];
281284

282285
if ([self graphPointToView:NSMakePoint(0, _maxY)].y + 2 + [maxExtremeTitle size].height > [self graphPointToView:NSMakePoint(0, _graphBounds.origin.y + _graphBounds.size.height)].y || [self graphPointToView:NSMakePoint(0, _minY)].y - [minExtremeTitle size].height < [self graphPointToView:_graphBounds.origin].y) {

0 commit comments

Comments
 (0)