ATITD-Tools/Desert-Paint-Codex Changeset

Changeset - 365cbd130bf2

Parent rev.

Child rev.

[Not reviewed]

R_T10_1.5 default

0 3 0

Tess Snider (Malkyne) - 3 years ago 2021-07-26 09:20:37
this@malkyne.org

Now correctly clearing buffer reagent selections when doing a test Clear.
Also, marking inert now immediately saves, because a verification step
is not necessary or useful, in this case.

3 files changed with 10 insertions and 5 deletions:

Models/ReactionTest.cs

ViewModels/ExperimentLogViewModel.cs

ViewModels/ReactionTestViewModel.cs

0 comments (0 inline, 0 general)

Models/ReactionTest.cs

➞

Show inline comments

@@ ... / @@ -276,29 +276,34 @@ namespace DesertPaintCodex.Models @@
+        }
         public void MarkInert()
+        {
             Reaction = new Reaction(0, 0, 0);
             State = TestState.GoodResult;
             SaveReaction();
+        }
         public void ClearReaction()
+        {
             PlayerProfile? profile = ProfileManager.CurrentProfile;
             if (profile == null) return;
             profile.Reactions.Remove(Reagent1, Reagent2);
             profile.SetPairClipStatus(Reagent1, Reagent2, ClipType.None);
             if (State == TestState.Saved)
+            {
                 profile.Save();
+            }
             BufferReagentFirst = null;
             BufferReagentLast = null;
             Reaction = null;
             BadReaction = null;
             Clipped = ClipType.None;
             State = TestState.Untested;
             UpdateRecipe();
+        }
         public void SaveReaction()
+        {
             PlayerProfile? profile = ProfileManager.CurrentProfile;

ViewModels/ExperimentLogViewModel.cs

➞

Show inline comments

@@ ... / @@ -58,12 +58,13 @@ namespace DesertPaintCodex.ViewModels @@
             _testView.ReactionTest = GetSelectedReactionTest();
             TestView.SaveReaction.Subscribe(_ => OnSaveReaction());
             TestView.ClearReaction.Subscribe(_ => OnClearReaction());
             TestView.FinalizeTestResults.Subscribe(_ => OnReactionResults());
             TestView.MarkInert.Subscribe(_ => OnSaveReaction());
+        }
         private ReactionTest GetSelectedReactionTest()
+        {
             int itemIndex = (SelectedList == 0) ? SelectedRemainingTest : SelectedCompletedTest;
             if (itemIndex < 0) return Constants.StubReactionTest;

ViewModels/ReactionTestViewModel.cs

➞

Show inline comments

@@ ... / @@ -43,12 +43,13 @@ namespace DesertPaintCodex.ViewModels @@
             this.WhenAnyValue(x => x.ReactionTest)
                 .Subscribe(_ => UpdateDerivedState());
             ShowScreenSettingsDialog = new Interaction<ScreenSettingsViewModel, Unit>();
             SaveReaction = ReactiveCommand.Create(() => ReactionTest.SaveReaction());
             ClearReaction = ReactiveCommand.Create(() => ReactionTest.ClearReaction());
             MarkInert = ReactiveCommand.Create(() => ReactionTest.MarkInert());
             FinalizeTestResults = ReactiveCommand.Create(Test);
+        }
         private void UpdateDerivedState()
+        {
             // There are more "reactive" ways to pull this off, but I don't have time to figure out all those recipes
@@ ... / @@ -106,17 +107,12 @@ namespace DesertPaintCodex.ViewModels @@
             catch (OperationCanceledException)
+            {
                 Debug.WriteLine("Scan canceled.");
+            }
+        }
         public void MarkInert()
+        {
             ReactionTest.MarkInert();
+        }
         public void CancelScan()
+        {
             ReactionTest.CancelScan();
+        }
         public async Task OpenScreenSettings()
@@ ... / @@ -145,9 +141,12 @@ namespace DesertPaintCodex.ViewModels @@
+        }
         public Interaction<ScreenSettingsViewModel, Unit> ShowScreenSettingsDialog { get; }
         public ReactiveCommand<Unit, Unit> ClearReaction { get; }
         public ReactiveCommand<Unit, Unit> SaveReaction { get; }
         public ReactiveCommand<Unit, Unit> MarkInert { get; }
         public ReactiveCommand<Unit, Unit> FinalizeTestResults { get; }
+    }
+}
@@ ... / \ No newline at end of file @@

0 comments (0 inline, 0 general)