From acac42727dfe6aa150a41a5238d9b7c0dea58716 Mon Sep 17 00:00:00 2001 From: tanjera Date: Wed, 20 Jul 2022 21:16:44 -0400 Subject: [PATCH] IISIM 2.2.3, IISE 1.0.2 Simulator 2.2.3 - Improved UX re: progression listing on playing loaded scenario (#151) - Made descriptions show more clearly - If no progression description, then target Step description is shown - Rather than showing additional "Default" progression, just tags the default - Bugfix: Tracing scaling was visible after switching to non-scaling input (#153) Scenario Editor 1.0.2 - Added panel description to "currently editing" step information pane - Bugfix: Scenario.Step[i] not deleted in DeleteStep(i) --- II Scenario Editor/II Scenario Editor.csproj | 2 +- .../Windows/PanelParameters.axaml.cs | 4 +- .../Windows/PanelStepEditor.axaml.cs | 7 +++- II Simulator/Controls/DefibTracing.axaml.cs | 4 ++ II Simulator/Controls/IABPTracing.axaml.cs | 4 ++ II Simulator/Controls/MonitorTracing.axaml.cs | 4 ++ II Simulator/II Simulator.csproj | 2 +- II Simulator/Windows/WindowMain.axaml.cs | 37 ++++++++----------- 8 files changed, 38 insertions(+), 26 deletions(-) diff --git a/II Scenario Editor/II Scenario Editor.csproj b/II Scenario Editor/II Scenario Editor.csproj index 847aa5d..1abfd99 100644 --- a/II Scenario Editor/II Scenario Editor.csproj +++ b/II Scenario Editor/II Scenario Editor.csproj @@ -7,7 +7,7 @@ copyused true Infirmary Integrated Scenario Editor - 1.0.1 + 1.0.2 Infirmary Integrated License.md https://www.infirmary-integrated.com/ diff --git a/II Scenario Editor/Windows/PanelParameters.axaml.cs b/II Scenario Editor/Windows/PanelParameters.axaml.cs index 2cfe3a2..c0011df 100644 --- a/II Scenario Editor/Windows/PanelParameters.axaml.cs +++ b/II Scenario Editor/Windows/PanelParameters.axaml.cs @@ -376,7 +376,9 @@ private async Task UpdateViewModel () { PropertyInt pintIAP = this.FindControl ("pintIAP"); PropertyInt pintPacemakerThreshold = this.FindControl ("pintPacemakerThreshold"); - lblActiveStep.Content = String.Format ("Editing Step: {0}", Step is null ? "N/A" : Step.Name); + lblActiveStep.Content = String.Format ("Editing Step: {0} ({1})", + Step is null ? "N/A" : Step.Name, + Step is null ? "N/A" : Step.Description); // Enable/Disable controls based on if Patient is null! chkClampVitals.IsEnabled = (Patient != null); diff --git a/II Scenario Editor/Windows/PanelStepEditor.axaml.cs b/II Scenario Editor/Windows/PanelStepEditor.axaml.cs index d06d476..eea6313 100644 --- a/II Scenario Editor/Windows/PanelStepEditor.axaml.cs +++ b/II Scenario Editor/Windows/PanelStepEditor.axaml.cs @@ -330,11 +330,14 @@ private async Task DeleteStep (ItemStep item) { // Remove all progressions targeting the Step being removed for (int i = s.Step.Progressions.Count - 1; i >= 0; i--) { - if (s.Step.Progressions [i].DestinationUUID == item.UUID) - s.Step.Progressions.RemoveAt (i); + if (s.Step?.Progressions [i].DestinationUUID == item.UUID) + s.Step?.Progressions.RemoveAt (i); } } + // Remove the Step from the Scenario model + Scenario.Steps.RemoveAll (s => s.UUID == item.UUID); + await UpdateIProgressions (); await DrawIProgressions (); } diff --git a/II Simulator/Controls/DefibTracing.axaml.cs b/II Simulator/Controls/DefibTracing.axaml.cs index 9aa6645..057c51f 100644 --- a/II Simulator/Controls/DefibTracing.axaml.cs +++ b/II Simulator/Controls/DefibTracing.axaml.cs @@ -162,6 +162,10 @@ private void UpdateInterface (object sender, EventArgs e) { if (uiMenuToggleAutoScale is not null) uiMenuToggleAutoScale.IsEnabled = Strip?.CanScale ?? false; + lblScaleAuto.IsVisible = Strip?.CanScale ?? false; + lblScaleMin.IsVisible = Strip?.CanScale ?? false; + lblScaleMax.IsVisible = Strip?.CanScale ?? false; + if (Strip?.CanScale ?? false) { lblScaleAuto.Foreground = TracingBrush; lblScaleMin.Foreground = TracingBrush; diff --git a/II Simulator/Controls/IABPTracing.axaml.cs b/II Simulator/Controls/IABPTracing.axaml.cs index 74f8da5..ecc1386 100644 --- a/II Simulator/Controls/IABPTracing.axaml.cs +++ b/II Simulator/Controls/IABPTracing.axaml.cs @@ -65,6 +65,10 @@ private void UpdateInterface (object sender, EventArgs e) { lblLead.Foreground = TracingBrush; lblLead.Content = Instance?.Language.Localize (Lead.LookupString (Lead.Value)); + lblScaleAuto.IsVisible = Strip?.CanScale ?? false; + lblScaleMin.IsVisible = Strip?.CanScale ?? false; + lblScaleMax.IsVisible = Strip?.CanScale ?? false; + if (Strip?.CanScale ?? false) { lblScaleAuto.Foreground = TracingBrush; lblScaleMin.Foreground = TracingBrush; diff --git a/II Simulator/Controls/MonitorTracing.axaml.cs b/II Simulator/Controls/MonitorTracing.axaml.cs index 0cb9b67..c50de82 100644 --- a/II Simulator/Controls/MonitorTracing.axaml.cs +++ b/II Simulator/Controls/MonitorTracing.axaml.cs @@ -164,6 +164,10 @@ private void UpdateInterface (object sender, EventArgs e) { if (uiMenuToggleAutoScale is not null) uiMenuToggleAutoScale.IsEnabled = Strip?.CanScale ?? false; + lblScaleAuto.IsVisible = Strip?.CanScale ?? false; + lblScaleMin.IsVisible = Strip?.CanScale ?? false; + lblScaleMax.IsVisible = Strip?.CanScale ?? false; + if (Strip?.CanScale ?? false) { lblScaleAuto.Foreground = TracingBrush; lblScaleMin.Foreground = TracingBrush; diff --git a/II Simulator/II Simulator.csproj b/II Simulator/II Simulator.csproj index 5e90243..1d77fae 100644 --- a/II Simulator/II Simulator.csproj +++ b/II Simulator/II Simulator.csproj @@ -8,7 +8,7 @@ Infirmary Integrated © 2017-2022, Ibi Keller Ibi Keller - 2.2.2 + 2.2.3 Infirmary Integrated License.md https://www.infirmary-integrated.com/ diff --git a/II Simulator/Windows/WindowMain.axaml.cs b/II Simulator/Windows/WindowMain.axaml.cs index 8a20cb0..9f8fbe1 100644 --- a/II Simulator/Windows/WindowMain.axaml.cs +++ b/II Simulator/Windows/WindowMain.axaml.cs @@ -1059,50 +1059,45 @@ private void OnStepChanged (object? sender, EventArgs e) { } private Task InitStep () { - Scenario.Step s = Instance?.Scenario?.Current ?? new Scenario.Step (); + Scenario.Step step = Instance?.Scenario?.Current ?? new Scenario.Step (); Label lblScenarioStep = this.FindControl