ATITD-Tools/Desert-Paint-Codex Changeset

Changeset - f1d4569c0495

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

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

3 way reactions should now allow you to change the position of the buffer
reagent from first to last.

4 files changed with 178 insertions and 39 deletions:

Models/ReactionTest.cs

101

Services/ReactionScannerService.cs

ViewModels/ReactionTestViewModel.cs

Views/ReactionTestView.axaml

0 comments (0 inline, 0 general)

Models/ReactionTest.cs

➞

Show inline comments

@@ ... / @@ -25,27 +25,49 @@ namespace DesertPaintCodex.Models @@
         public Reagent Reagent2 { get; }
         private Reagent? _bufferReagent;
         public Reagent? BufferReagent
         private Reagent? _bufferReagentFirst;
         public Reagent? BufferReagentFirst
+        {
             get => _bufferReagentFirst;
             set
+        {
             get => _bufferReagent;
                 if (_bufferReagentFirst == value) return;
                 _bufferReagentFirst = value;
                 UpdateRecipe();
                 NotifyPropertyChanged(nameof(BufferReagentFirst));
                 NotifyPropertyChanged(nameof(CanScan));
+            }
+        }
         private Reagent? _bufferReagentLast;
         public Reagent? BufferReagentLast
+        {
             get => _bufferReagentLast;
             set
+            {
                 if (_bufferReagent == value) return;
                 _bufferReagent = value;
                 _recipe.Clear();
                 if (_bufferReagent == null)
+                {
                     _recipe.AddReagent(Reagent1.Name);
                     _recipe.AddReagent(Reagent2.Name);
                 if (_bufferReagentLast == value) return;
                 _bufferReagentLast = value;
                 UpdateRecipe();
                 NotifyPropertyChanged(nameof(BufferReagentLast));
                 NotifyPropertyChanged(nameof(CanScan));
+            }
+                }
                 else
         private bool _useFirstBuffer;
         public bool UseFirstBuffer
+                {
                     _recipe.AddReagent(_bufferReagent.Name);
                     _recipe.AddReagent(Reagent1.Name);
                     _recipe.AddReagent(Reagent2.Name);
+                }
                 NotifyPropertyChanged(nameof(BufferReagent));
             get => _useFirstBuffer;
             set
+            {
                 _useFirstBuffer = value;
                 UpdateRecipe();
                 NotifyPropertyChanged(nameof(UseFirstBuffer));
                 NotifyPropertyChanged(nameof(CanScan));
                 UpdateHypotheticalColor();
                 NotifyPropertyChanged(nameof(ShowFirstBuffer));
                 NotifyPropertyChanged(nameof(ShowLastBuffer));
+            }
+        }
@@ ... / @@ -91,4 +113,6 @@ namespace DesertPaintCodex.Models @@
                 NotifyPropertyChanged(nameof(NoLab));
                 NotifyPropertyChanged(nameof(CanPickBuffer));
                 NotifyPropertyChanged(nameof(ShowFirstBuffer));
                 NotifyPropertyChanged(nameof(ShowLastBuffer));
+            }
+        }
@@ ... / @@ -97,5 +121,5 @@ namespace DesertPaintCodex.Models @@
             (State == TestState.ClippedResult) || IsAllCatalysts;
-        public bool CanScan => (State is TestState.Untested or TestState.LabNotFound) || ((State == TestState.ClippedResult) && (BufferReagent != null));
+        public bool CanScan => (State is TestState.Untested or TestState.LabNotFound) || ((State == TestState.ClippedResult) && BufferIsSelected);
         public bool IsScanning => State == TestState.Scanning;
@@ ... / @@ -113,4 +137,8 @@ namespace DesertPaintCodex.Models @@
         public bool CanPickBuffer => (State == TestState.ClippedResult) || IsAllCatalysts;
         public bool ShowFirstBuffer => Requires3Way && UseFirstBuffer;
         public bool ShowLastBuffer => Requires3Way && !UseFirstBuffer;
         private PaintColor? _hypotheticalColor;
@@ ... / @@ -129,4 +157,5 @@ namespace DesertPaintCodex.Models @@
             Reagent1 = reagent1;
             Reagent2 = reagent2;
             UseFirstBuffer = true;
             IsAllCatalysts = reagent1.IsCatalyst && reagent2.IsCatalyst;
             Clipped = clipType;
@@ ... / @@ -155,4 +184,5 @@ namespace DesertPaintCodex.Models @@
                 if (_observedColor != null)
+                {
                     // Handle the normal case.
                     Clipped = _observedColor.Red switch
+                        {
@@ ... / @@ -244,9 +274,21 @@ namespace DesertPaintCodex.Models @@
             if (ObservedColor == null) return null;
             if (BufferReagent != null)
             if (_useFirstBuffer)
+            {
                 if (BufferReagentFirst != null)
+            {
                 return ReactionScannerService.Calculate3WayReaction(ProfileManager.CurrentProfile, HypotheticalColor,
                     ObservedColor, BufferReagent, Reagent1, Reagent2);
                         ObservedColor, BufferReagentFirst, Reagent1, Reagent2, true);
+                }
+            }
             else
+            {
                 if (BufferReagentLast != null)
+                {
                     return ReactionScannerService.Calculate3WayReaction(ProfileManager.CurrentProfile, HypotheticalColor,
                         ObservedColor, Reagent1, Reagent2, BufferReagentLast, false);
+                }
+            }
             return ReactionScannerService.CalculateReaction(HypotheticalColor, ObservedColor);
+        }
@@ ... / @@ -256,5 +298,43 @@ namespace DesertPaintCodex.Models @@
+        {
             HypotheticalColor = null;
             HypotheticalColor = (IsAllCatalysts && (BufferReagent == null)) ? null : _recipe.BaseColor;
             HypotheticalColor = (IsAllCatalysts && !BufferIsSelected) ? null : _recipe.BaseColor;
+        }
         private bool BufferIsSelected => UseFirstBuffer ? (BufferReagentFirst != null) : (BufferReagentLast != null);
         private void UpdateRecipe()
+        {
             _recipe.Clear();
             if (_useFirstBuffer)
+            {
                 if (_bufferReagentFirst == null)
+                {
                     _recipe.AddReagent(Reagent1.Name);
                     _recipe.AddReagent(Reagent2.Name);
+                }
                 else
+                {
                     _recipe.AddReagent(_bufferReagentFirst.Name);
                     _recipe.AddReagent(Reagent1.Name);
                     _recipe.AddReagent(Reagent2.Name);
+                }
+            }
             else
+            {
                 if (_bufferReagentLast == null)
+                {
                     _recipe.AddReagent(Reagent1.Name);
                     _recipe.AddReagent(Reagent2.Name);
+                }
                 else
+                {
                     _recipe.AddReagent(Reagent1.Name);
                     _recipe.AddReagent(Reagent2.Name);
                     _recipe.AddReagent(_bufferReagentLast.Name);
+                }
+            }
             UpdateHypotheticalColor();
+        }

Services/ReactionScannerService.cs

➞

Show inline comments

@@ ... / @@ -474,9 +474,20 @@ namespace DesertPaintCodex.Services @@
         public static Reaction Calculate3WayReaction(PlayerProfile profile, PaintColor expectedColor, PaintColor reactedColor, Reagent reagent0, Reagent reagent1, Reagent reagent2)
+        public static Reaction Calculate3WayReaction(PlayerProfile profile, PaintColor expectedColor, PaintColor reactedColor, Reagent reagent0, Reagent reagent1, Reagent reagent2, bool firstBuffer)
+        {
             // A 3-reagent reaction.
             Reaction? reaction1 = profile.FindReaction(reagent0, reagent1);
             Reaction? reaction2 = profile.FindReaction(reagent0, reagent2);
             Reaction? reaction1;
             Reaction? reaction2;
             if (firstBuffer)
+            {
                 reaction1 = profile.FindReaction(reagent0, reagent1);
                 reaction2 = profile.FindReaction(reagent0, reagent2);
+            }
             else
+            {
                  reaction1 = profile.FindReaction(reagent0, reagent2);
                  reaction2 = profile.FindReaction(reagent1, reagent2);
+            }
             Debug.Assert(reaction1 != null);

ViewModels/ReactionTestViewModel.cs

➞

Show inline comments

@@ ... / @@ -25,6 +25,6 @@ namespace DesertPaintCodex.ViewModels @@
         private readonly List<Reagent> _allPigmentList = new();
         private readonly List<Reagent> _allReagentList = new();
         public ObservableCollection<Reagent> BufferList { get; } = new();
         public ObservableCollection<Reagent> FirstBufferList { get; } = new();
         public ObservableCollection<Reagent> LastBufferList { get; } = new();
         public ReactionTestViewModel()
@@ ... / @@ -72,14 +72,22 @@ namespace DesertPaintCodex.ViewModels @@
             if (profile == null) return;
             ReactionSet reactions = profile.Reactions;
             BufferList.Clear();
             List<Reagent> bufferList = ReactionTest.IsAllCatalysts ? _allPigmentList : _allReagentList;
-            foreach (Reagent pigment in bufferList)
+            foreach (Reagent buffer in bufferList)
+            {
                 if (pigment == ReactionTest.Reagent1) continue;
                 if (pigment == ReactionTest.Reagent2) continue;
                 if (reactions.Find(pigment, ReactionTest.Reagent1) == null) continue;
                 if (reactions.Find(pigment, ReactionTest.Reagent2) == null) continue;
                 if (buffer == ReactionTest.Reagent1) continue;
                 if (buffer == ReactionTest.Reagent2) continue;
                 BufferList.Add(pigment);
                 if ((reactions.Find(buffer, ReactionTest.Reagent1) != null)
                     && (reactions.Find(buffer, ReactionTest.Reagent2) != null))
+                {
                     FirstBufferList.Add(buffer);
+                }
                 if ((reactions.Find(ReactionTest.Reagent1, buffer) != null)
                     && (reactions.Find(ReactionTest.Reagent2, buffer) != null))
+                {
                     LastBufferList.Add(buffer);
+                }
+            }
@@ ... / @@ -122,4 +130,14 @@ namespace DesertPaintCodex.ViewModels @@
+        }
         public void UseFirstBuffer()
+        {
             ReactionTest.UseFirstBuffer = true;
+        }
         public void UseLastBuffer()
+        {
             ReactionTest.UseFirstBuffer = false;
+        }
         private void Test()
+        {

Views/ReactionTestView.axaml

➞

Show inline comments

@@ ... / @@ -21,4 +21,8 @@ @@
         </Style>
         <Style Selector="StackPanel.ReagentLabel">
             <Setter Property="Width" Value="80"/>
         </Style>
         <Style Selector="TextBlock.ReagentLabel">
             <Setter Property="VerticalAlignment" Value="Center"/>
@@ ... / @@ -38,10 +42,15 @@ @@
             <Border Classes="ThinFrame">
                 <StackPanel Orientation="Vertical" Spacing="10">
                     <StackPanel Classes="ReagentRow" IsVisible="{Binding ReactionTest.Requires3Way}">
                         <TextBlock Classes="ReagentLabel">Buffer:</TextBlock>
                         <TextBlock Classes="ReagentName" Text="{Binding ReactionTest.BufferReagent.Name, FallbackValue=[Unknown]}" IsVisible="{Binding !ReactionTest.CanPickBuffer}"/>
                         <ComboBox Items="{Binding BufferList}"
                     <StackPanel Classes="ReagentRow" IsVisible="{Binding ReactionTest.ShowFirstBuffer}">
                         <StackPanel Orientation="Horizontal" Classes="ReagentLabel" Spacing="10">
                             <Button Height="24" Width="24" Margin="8 0 0 0" Command="{Binding UseLastBuffer}">
                                 <TextBlock VerticalAlignment="Center">▼</TextBlock>
                             </Button>
                             <TextBlock Classes="ReagentName">Buffer:</TextBlock>
                         </StackPanel>
                         <TextBlock Classes="ReagentName" Text="{Binding ReactionTest.BufferReagentFirst.Name, FallbackValue=[Unknown]}" IsVisible="{Binding !ReactionTest.CanPickBuffer}"/>
                         <ComboBox Items="{Binding FirstBufferList}"
                                   IsVisible="{Binding ReactionTest.CanPickBuffer}"
-                                  SelectedItem="{Binding ReactionTest.BufferReagent}"
+                                  SelectedItem="{Binding ReactionTest.BufferReagentFirst}"
                                   PlaceholderText="Choose" Width="120" Height="30">
                             <ComboBox.ItemTemplate>
@@ ... / @@ -52,5 +61,5 @@ @@
                         </ComboBox>
                         <Border Classes="ReagentSwatch"
-                            Background="{Binding ReactionTest.BufferReagent.Color, Converter={StaticResource paintToBrush}, FallbackValue=#00000000}" />
+                            Background="{Binding ReactionTest.BufferReagentFirst.Color, Converter={StaticResource paintToBrush}, FallbackValue=#00000000}" />
                     </StackPanel>
                     <StackPanel Classes="ReagentRow">
@@ ... / @@ -66,4 +75,25 @@ @@
                             Background="{Binding ReactionTest.Reagent2.Color, Converter={StaticResource paintToBrush}, FallbackValue=#00000000}" />
                     </StackPanel>
                     <StackPanel Classes="ReagentRow" IsVisible="{Binding ReactionTest.ShowLastBuffer}">
                         <StackPanel Orientation="Horizontal" Classes="ReagentLabel" Spacing="10">
                             <Button Height="24" Width="24" Margin="8 0 0 0" Command="{Binding UseFirstBuffer}">
                                 <TextBlock VerticalAlignment="Center">▲</TextBlock>
                             </Button>
                             <TextBlock Classes="ReagentName">Buffer:</TextBlock>
                         </StackPanel>
                         <TextBlock Classes="ReagentName" Text="{Binding ReactionTest.BufferReagentLast.Name, FallbackValue=[Unknown]}" IsVisible="{Binding !ReactionTest.CanPickBuffer}"/>
                         <ComboBox Items="{Binding LastBufferList}"
                                   IsVisible="{Binding ReactionTest.CanPickBuffer}"
                                   SelectedItem="{Binding ReactionTest.BufferReagentLast}"
                                   PlaceholderText="Choose" Width="120" Height="30">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>
                                     <TextBlock Text="{Binding Name}" />
                                 </DataTemplate>
                             </ComboBox.ItemTemplate>
                         </ComboBox>
                         <Border Classes="ReagentSwatch"
                                 Background="{Binding ReactionTest.BufferReagentLast.Color, Converter={StaticResource paintToBrush}, FallbackValue=#00000000}" />
                     </StackPanel>
                 </StackPanel>
             </Border>

0 comments (0 inline, 0 general)