fix warning display
This commit is contained in:
@@ -263,8 +263,8 @@ public class DrawUserPair
|
|||||||
if (_performanceConfigService.Current.ShowPerformanceIndicator
|
if (_performanceConfigService.Current.ShowPerformanceIndicator
|
||||||
&& !_performanceConfigService.Current.UIDsToIgnore
|
&& !_performanceConfigService.Current.UIDsToIgnore
|
||||||
.Exists(uid => string.Equals(uid, UserPair.User.Alias, StringComparison.Ordinal) || string.Equals(uid, UserPair.User.UID, StringComparison.Ordinal))
|
.Exists(uid => string.Equals(uid, UserPair.User.Alias, StringComparison.Ordinal) || string.Equals(uid, UserPair.User.UID, StringComparison.Ordinal))
|
||||||
&& (_performanceConfigService.Current.VRAMSizeWarningThresholdMiB * 1024 * 1024 < _pair.LastAppliedApproximateVRAMBytes
|
&& ((_performanceConfigService.Current.VRAMSizeWarningThresholdMiB > 0 && _performanceConfigService.Current.VRAMSizeWarningThresholdMiB * 1024 * 1024 < _pair.LastAppliedApproximateVRAMBytes)
|
||||||
|| _performanceConfigService.Current.TrisWarningThresholdThousands * 1000 < _pair.LastAppliedDataTris)
|
|| (_performanceConfigService.Current.TrisWarningThresholdThousands > 0 && _performanceConfigService.Current.TrisWarningThresholdThousands * 1000 < _pair.LastAppliedDataTris))
|
||||||
&& (!_pair.UserPair.OwnPermissions.IsSticky()
|
&& (!_pair.UserPair.OwnPermissions.IsSticky()
|
||||||
|| _performanceConfigService.Current.WarnOnPreferredPermissionsExceedingThresholds))
|
|| _performanceConfigService.Current.WarnOnPreferredPermissionsExceedingThresholds))
|
||||||
{
|
{
|
||||||
@@ -274,12 +274,14 @@ public class DrawUserPair
|
|||||||
|
|
||||||
string userWarningText = "WARNING: This user exceeds one or more of your defined thresholds:" + UiSharedService.TooltipSeparator;
|
string userWarningText = "WARNING: This user exceeds one or more of your defined thresholds:" + UiSharedService.TooltipSeparator;
|
||||||
bool shownVram = false;
|
bool shownVram = false;
|
||||||
if (_performanceConfigService.Current.VRAMSizeWarningThresholdMiB * 1024 * 1024 < _pair.LastAppliedApproximateVRAMBytes)
|
if (_performanceConfigService.Current.VRAMSizeWarningThresholdMiB > 0
|
||||||
|
&& _performanceConfigService.Current.VRAMSizeWarningThresholdMiB * 1024 * 1024 < _pair.LastAppliedApproximateVRAMBytes)
|
||||||
{
|
{
|
||||||
shownVram = true;
|
shownVram = true;
|
||||||
userWarningText += $"Approx. VRAM Usage: Used: {UiSharedService.ByteToString(_pair.LastAppliedApproximateVRAMBytes)}, Threshold: {_performanceConfigService.Current.VRAMSizeWarningThresholdMiB} MiB";
|
userWarningText += $"Approx. VRAM Usage: Used: {UiSharedService.ByteToString(_pair.LastAppliedApproximateVRAMBytes)}, Threshold: {_performanceConfigService.Current.VRAMSizeWarningThresholdMiB} MiB";
|
||||||
}
|
}
|
||||||
if (_performanceConfigService.Current.TrisWarningThresholdThousands * 1024 < _pair.LastAppliedDataTris)
|
if (_performanceConfigService.Current.TrisWarningThresholdThousands > 0
|
||||||
|
&& _performanceConfigService.Current.TrisWarningThresholdThousands * 1024 < _pair.LastAppliedDataTris)
|
||||||
{
|
{
|
||||||
if (shownVram) userWarningText += Environment.NewLine;
|
if (shownVram) userWarningText += Environment.NewLine;
|
||||||
userWarningText += $"Approx. Triangle count: Used: {_pair.LastAppliedDataTris}, Threshold: {_performanceConfigService.Current.TrisWarningThresholdThousands * 1000}";
|
userWarningText += $"Approx. Triangle count: Used: {_pair.LastAppliedDataTris}, Threshold: {_performanceConfigService.Current.TrisWarningThresholdThousands * 1000}";
|
||||||
|
|||||||
Reference in New Issue
Block a user