Health analyzer UI improve (#17280)

Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml

@@ -1,9 +1,33 @@
 <DefaultWindow xmlns="https://spacestation14.io"
-            MinSize="250 100"
     SetSize="250 100">
-    <BoxContainer Orientation="Vertical">
+    <ScrollContainer
+        VerticalExpand="True">
+        <BoxContainer
+            Name="RootContainer"
+            Orientation="Vertical">
             <Label
-            Name="Diagnostics"
+                Name="NoPatientDataText"
                 Text="{Loc health-analyzer-window-no-patient-data-text}" />
+            <BoxContainer
+                Name="PatientDataContainer"
+                Orientation="Vertical"
+                Margin="0 0 5 10">
+                <Label
+                    Name="PatientName"/>
+                <Label
+                    Name="Temperature"
+                    Margin="0 5 0 0"/>
+                <Label
+                    Name="BloodLevel"
+                    Margin="0 5 0 0"/>
+                <Label
+                    Name="patientDamageAmount"
+                    Margin="0 15 0 0"/>
             </BoxContainer>
+            <BoxContainer
+                Name="GroupsContainer"
+                Orientation="Vertical">
+            </BoxContainer>
+        </BoxContainer>
+    </ScrollContainer>
 </DefaultWindow>

Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs

@@ -1,5 +1,5 @@
+using System.Linq;
 using System.Numerics;
-using System.Text;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
@@ -8,85 +8,182 @@ using Content.Shared.MedicalScanner;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.ResourceManagement;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 
 namespace Content.Client.HealthAnalyzer.UI
 {
     [GenerateTypedNameReferences]
     public sealed partial class HealthAnalyzerWindow : DefaultWindow
     {
+        private readonly IEntityManager _entityManager;
+        private readonly SpriteSystem _spriteSystem;
+        private readonly IPrototypeManager _prototypes;
+        private readonly IResourceCache _cache;
+
+        private const int AnalyzerHeight = 430;
+        private const int AnalyzerWidth = 300;
+
         public HealthAnalyzerWindow()
         {
             RobustXamlLoader.Load(this);
+
+            var dependencies = IoCManager.Instance!;
+            _entityManager = dependencies.Resolve<IEntityManager>();
+            _spriteSystem = _entityManager.System<SpriteSystem>();
+            _prototypes = dependencies.Resolve<IPrototypeManager>();
+            _cache = dependencies.Resolve<IResourceCache>();
         }
 
         public void Populate(HealthAnalyzerScannedUserMessage msg)
         {
-            var text = new StringBuilder();
+            GroupsContainer.RemoveAllChildren();
-            var entities = IoCManager.Resolve<IEntityManager>();
-            var target = entities.GetEntity(msg.TargetEntity);
 
-            if (msg.TargetEntity != null && entities.TryGetComponent<DamageableComponent>(target, out var damageable))
+            var target = _entityManager.GetEntity(msg.TargetEntity);
+
+            if (target == null
+                || !_entityManager.TryGetComponent<DamageableComponent>(target, out var damageable))
             {
-                string entityName = "Unknown";
+                NoPatientDataText.Visible = true;
-                if (msg.TargetEntity != null &&
+                return;
-                    entities.HasComponent<MetaDataComponent>(target.Value))
-                {
-                    entityName = Identity.Name(target.Value, entities);
             }
 
-                IReadOnlyDictionary<string, FixedPoint2> damagePerGroup = damageable.DamagePerGroup;
+            NoPatientDataText.Visible = false;
+
+            string entityName = Loc.GetString("health-analyzer-window-entity-unknown-text");
+            if (_entityManager.HasComponent<MetaDataComponent>(target.Value))
+            {
+                entityName = Identity.Name(target.Value, _entityManager);
+            }
+
+            PatientName.Text = Loc.GetString(
+                "health-analyzer-window-entity-health-text",
+                ("entityName", entityName)
+            );
+
+            Temperature.Text = Loc.GetString("health-analyzer-window-entity-temperature-text",
+                ("temperature", float.IsNaN(msg.Temperature) ? "N/A" : $"{msg.Temperature - 273f:F1} °C")
+            );
+
+            BloodLevel.Text = Loc.GetString("health-analyzer-window-entity-blood-level-text",
+                ("bloodLevel", float.IsNaN(msg.BloodLevel) ? "N/A" : $"{msg.BloodLevel * 100:F1} %")
+            );
+
+            patientDamageAmount.Text = Loc.GetString(
+                "health-analyzer-window-entity-damage-total-text",
+                ("amount", damageable.TotalDamage)
+            );
+
+            var damageSortedGroups =
+                damageable.DamagePerGroup.OrderBy(damage => damage.Value)
+                    .ToDictionary(x => x.Key, x => x.Value);
             IReadOnlyDictionary<string, FixedPoint2> damagePerType = damageable.Damage.DamageDict;
 
-                text.Append($"{Loc.GetString("health-analyzer-window-entity-health-text", ("entityName", entityName))}\n\n");
+            DrawDiagnosticGroups(damageSortedGroups, damagePerType);
 
+            SetHeight = AnalyzerHeight;
+            SetWidth = AnalyzerWidth;
+        }
 
-                text.Append($"{Loc.GetString("health-analyzer-window-entity-temperature-text", ("temperature", float.IsNaN(msg.Temperature) ? "N/A" : $"{msg.Temperature - 273f:F1} °C"))}\n");
+        private void DrawDiagnosticGroups(
-
+            Dictionary<string, FixedPoint2> groups, IReadOnlyDictionary<string, FixedPoint2> damageDict)
-
+        {
-                text.Append($"{Loc.GetString("health-analyzer-window-entity-blood-level-text", ("bloodLevel", float.IsNaN(msg.BloodLevel) ? "N/A" : $"{msg.BloodLevel * 100:F1} %"))}\n\n");
-
-
-                // Damage
-                text.Append($"{Loc.GetString("health-analyzer-window-entity-damage-total-text", ("amount", damageable.TotalDamage))}\n");
-
             HashSet<string> shownTypes = new();
 
-                var protos = IoCManager.Resolve<IPrototypeManager>();
-
             // Show the total damage and type breakdown for each damage group.
-                foreach (var (damageGroupId, damageAmount) in damagePerGroup)
+            foreach (var (damageGroupId, damageAmount) in groups.Reverse())
             {
                 if (damageAmount == 0)
-                    {
                     continue;
-                    }
+
-                    text.Append($"\n{Loc.GetString("health-analyzer-window-damage-group-text", ("damageGroup", Loc.GetString("health-analyzer-window-damage-group-" + damageGroupId)), ("amount", damageAmount))}");
+                var groupTitleText = $"{Loc.GetString(
+                    "health-analyzer-window-damage-group-text",
+                    ("damageGroup", Loc.GetString("health-analyzer-window-damage-group-" + damageGroupId)),
+                    ("amount", damageAmount)
+                )}";
+
+                var groupContainer = new BoxContainer
+                {
+                    Margin = new Thickness(0, 0, 0, 15),
+                    Align = BoxContainer.AlignMode.Begin,
+                    Orientation = BoxContainer.LayoutOrientation.Vertical,
+                };
+
+                groupContainer.AddChild(CreateDiagnosticGroupTitle(groupTitleText, damageGroupId, damageAmount.Int()));
+
+                GroupsContainer.AddChild(groupContainer);
 
                 // Show the damage for each type in that group.
-                    var group = protos.Index<DamageGroupPrototype>(damageGroupId);
+                var group = _prototypes.Index<DamageGroupPrototype>(damageGroupId);
+
                 foreach (var type in group.DamageTypes)
                 {
-                        if (damagePerType.TryGetValue(type, out var typeAmount) )
+                    if (damageDict.TryGetValue(type, out var typeAmount) && typeAmount > 0)
-                        {
-                            // If damage types are allowed to belong to more than one damage group, they may appear twice here. Mark them as duplicate.
-                            if (!shownTypes.Contains(type) && typeAmount > 0)
                     {
+                        // If damage types are allowed to belong to more than one damage group,
+                        // they may appear twice here. Mark them as duplicate.
+                        if (shownTypes.Contains(type))
+                            continue;
+
                         shownTypes.Add(type);
-                                text.Append($"\n- {Loc.GetString("health-analyzer-window-damage-type-text", ("damageType", Loc.GetString("health-analyzer-window-damage-type-" + type)), ("amount", typeAmount))}");
+
+                        var damageString = Loc.GetString(
+                            "health-analyzer-window-damage-type-text",
+                            ("damageType", Loc.GetString("health-analyzer-window-damage-type-" + type)),
+                            ("amount", typeAmount)
+                        );
+
+                        groupContainer.AddChild(CreateDiagnosticItemLabel(damageString.Insert(0, "- ")));
                     }
                 }
             }
-                    text.AppendLine();
         }
-                Diagnostics.Text = text.ToString();
+
-                SetSize = new Vector2(250, 600);
+        private Texture GetTexture(string texture)
-            }
-            else
         {
-                Diagnostics.Text = Loc.GetString("health-analyzer-window-no-patient-data-text");
+            var rsiPath = new ResPath("/Textures/Objects/Devices/health_analyzer.rsi");
-                SetSize = new Vector2(250, 100);
+            var rsiSprite = new SpriteSpecifier.Rsi(rsiPath, texture);
-            }
+
+            var rsi = _cache.GetResource<RSIResource>(rsiSprite.RsiPath).RSI;
+            if (!rsi.TryGetState(rsiSprite.RsiState, out var state))
+            {
+                rsiSprite = new SpriteSpecifier.Rsi(rsiPath, "unknown");
+            }
+
+            return _spriteSystem.Frame0(rsiSprite);
+        }
+
+        private static Label CreateDiagnosticItemLabel(string text)
+        {
+            return new Label
+            {
+                Margin = new Thickness(2, 2),
+                Text = text,
+            };
+        }
+
+        private BoxContainer CreateDiagnosticGroupTitle(string text, string id, int damageAmount)
+        {
+            var rootContainer = new BoxContainer
+            {
+                VerticalAlignment = VAlignment.Bottom,
+                Orientation = BoxContainer.LayoutOrientation.Horizontal
+            };
+
+            rootContainer.AddChild(new TextureRect
+            {
+                Margin = new Thickness(0, 3),
+                SetSize = new Vector2(30, 30),
+                Texture = GetTexture(id.ToLower())
+            });
+
+            rootContainer.AddChild(CreateDiagnosticItemLabel(text));
+
+            return rootContainer;
         }
     }
 }

Resources/Locale/en-US/medical/components/health-analyzer-component.ftl

@@ -1,4 +1,5 @@
 health-analyzer-window-no-patient-data-text = No patient data.
+health-analyzer-window-entity-unknown-text = unknown
 health-analyzer-window-entity-health-text = {$entityName}'s health:
 health-analyzer-window-entity-temperature-text = Temperature: {$temperature}
 health-analyzer-window-entity-blood-level-text = Blood Level: {$bloodLevel}

Resources/Textures/Objects/Devices/health_analyzer.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "airloss, brute, toxin and burn edited from /tg/station https://github.com/tgstation/tgstation/tree/master genetic edited from https://iconscout.com/free-icon/dna-2130814 with license CC BY 4.0",
+  "states": [
+    {
+      "name": "airloss"
+    },
+    {
+      "name": "genetic"
+    },
+    {
+      "name": "brute"
+    },
+    {
+      "name": "toxin"
+    },
+    {
+      "name": "burn"
+    },
+    {
+      "name": "unknown"
+    }
+  ]
+}