t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only show byte sizes in MiB, format Tris in data analysis window

Browse Source
This commit is contained in:
Loporrit
2025-02-17 02:25:09 +00:00
parent aafdb45b5e
commit 9bf36765e4
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MareSynchronos/UI/DataAnalysisUi.cs
View File

@@ -171,7 +171,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
UiSharedService.AttachToolTip("Click \"Start analysis\" to calculate download size"); UiSharedService.AttachToolTip("Click \"Start analysis\" to calculate download size");
} }
} }
ImGui.TextUnformatted($"Total modded model triangles: {_cachedAnalysis.Sum(c => c.Value.Sum(f => f.Value.Triangles))}"); ImGui.TextUnformatted($"Total modded model triangles: {UiSharedService.TrisToString(_cachedAnalysis.Sum(c => c.Value.Sum(f => f.Value.Triangles)))}");
ImGui.Separator(); ImGui.Separator();
using var tabbar = ImRaii.TabBar("objectSelection"); using var tabbar = ImRaii.TabBar("objectSelection");
@@ -226,7 +226,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
{ {
ImGui.TextUnformatted(UiSharedService.ByteToString(vramUsage.Sum(f => f.OriginalSize))); ImGui.TextUnformatted(UiSharedService.ByteToString(vramUsage.Sum(f => f.OriginalSize)));
} }
ImGui.TextUnformatted($"{kvp.Key} modded model triangles: {kvp.Value.Sum(f => f.Value.Triangles)}"); ImGui.TextUnformatted($"{kvp.Key} modded model triangles: {UiSharedService.TrisToString(kvp.Value.Sum(f => f.Value.Triangles))}");
ImGui.Separator(); ImGui.Separator();
if (_selectedObjectTab != kvp.Key) if (_selectedObjectTab != kvp.Key)
@@ -482,7 +482,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
if (string.Equals(fileGroup.Key, "mdl", StringComparison.Ordinal)) if (string.Equals(fileGroup.Key, "mdl", StringComparison.Ordinal))
{ {
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.TextUnformatted(item.Triangles.ToString()); ImGui.TextUnformatted(UiSharedService.TrisToString(item.Triangles));
if (ImGui.IsItemClicked()) _selectedHash = item.Hash; if (ImGui.IsItemClicked()) _selectedHash = item.Hash;
} }
} }

4
MareSynchronos/UI/SettingsUi.cs
View File

@@ -798,12 +798,12 @@ public class SettingsUi : WindowMediatorSubscriberBase
_uiShared.DrawCacheDirectorySetting(); _uiShared.DrawCacheDirectorySetting();
ImGui.AlignTextToFramePadding(); ImGui.AlignTextToFramePadding();
if (_cacheMonitor.FileCacheSize >= 0) if (_cacheMonitor.FileCacheSize >= 0)
ImGui.TextUnformatted($"Currently utilized local storage: {UiSharedService.ByteToString(_cacheMonitor.FileCacheSize)}"); ImGui.TextUnformatted($"Currently utilized local storage: {_cacheMonitor.FileCacheSize / 1024.0 / 1024.0 / 1024.0:0.00} GiB");
else else
ImGui.TextUnformatted($"Currently utilized local storage: Calculating..."); ImGui.TextUnformatted($"Currently utilized local storage: Calculating...");
bool isLinux = _dalamudUtilService.IsWine; bool isLinux = _dalamudUtilService.IsWine;
if (!isLinux) if (!isLinux)
ImGui.TextUnformatted($"Remaining space free on drive: {UiSharedService.ByteToString(_cacheMonitor.FileCacheDriveFree)}"); ImGui.TextUnformatted($"Remaining space free on drive: {_cacheMonitor.FileCacheDriveFree / 1024.0 / 1024.0 / 1024.0:0.00} GiB");
bool useFileCompactor = _configService.Current.UseCompactor; bool useFileCompactor = _configService.Current.UseCompactor;
if (!useFileCompactor && !isLinux) if (!useFileCompactor && !isLinux)
{ {

17
MareSynchronos/UI/UISharedService.cs
View File

@@ -184,15 +184,16 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
public static string ByteToString(long bytes, bool addSuffix = true) public static string ByteToString(long bytes, bool addSuffix = true)
{ {
string[] suffix = ["B", "KiB", "MiB", "GiB", "TiB"]; _ = addSuffix;
int i; double dblSByte = bytes / 1048576.0;
double dblSByte = bytes; if (dblSByte > 0.0 && dblSByte < 0.01)
for (i = 0; i < suffix.Length && bytes >= 1024; i++, bytes /= 1024) dblSByte = 0.01;
{ return $"{dblSByte:0.00} MiB";
dblSByte = bytes / 1024.0; }
}
return addSuffix ? $"{dblSByte:0.00} {suffix[i]}" : $"{dblSByte:0.00}"; public static string TrisToString(long tris)
{
return tris > 1000 ? $"{tris / 1000.0:0.0}k" : $"{tris}";
} }
public static void CenterNextWindow(float width, float height, ImGuiCond cond = ImGuiCond.None) public static void CenterNextWindow(float width, float height, ImGuiCond cond = ImGuiCond.None)