Changeset - 6a6817b17a06
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Jason Maltzen - 3 years ago 2021-09-10 00:05:03
jason@hiddenachievement.com
Simulator view updates: new warning when the recipe is below minimum concentration. Add the missing reactions to the warning about missing reactions. Show the current saved recipe for a color, and allow replacing/saving the current simulated recipe as the recipe for that color.
2 files changed with 157 insertions and 2 deletions:
ViewModels/SimulatorViewModel.cs
122
Views/SimulatorView.axaml
35
2
0 comments (0 inline, 0 general)
ViewModels/SimulatorViewModel.cs
➞
Show inline comments
...
 
@@ -4,2 +4,3 @@ using System.Collections.ObjectModel;
 
using System.Collections.Specialized;
 
using System.Reactive.Linq;
 
using Avalonia;
...
 
@@ -16,2 +17,8 @@ namespace DesertPaintCodex.ViewModels
 
    {
 
        private RecipeLibraryViewModel? _recipeLibraryVM;
 

			




	
	
	
		
 
        private ViewModelBase? _recipeLibraryActivity;


			




	
	
	
		
 
        public ViewModelBase? RecipeLibraryActivity { get => _recipeLibraryActivity; private set => this.RaiseAndSetIfChanged(ref _recipeLibraryActivity, value); }


			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
        private PaintColor? _paintColor;


			




	...
	
		
 
@@ -23,2 +30,6 @@ namespace DesertPaintCodex.ViewModels


			




	
	
	
		
 

			




	
	
	
		
 
        // Stealing the recipe view from the  paint generator


			




	
	
	
		
 
        private GeneratorRecipe? _existingRecipe;


			




	
	
	
		
 
        public GeneratorRecipe? ExistingRecipe { get => _existingRecipe; private set => this.RaiseAndSetIfChanged(ref _existingRecipe, value); }


			




	
	
	
		
 

			




	
	
	
		
 
        private bool _hasMissingReactions;


			




	...
	
		
 
@@ -38,2 +49,16 @@ namespace DesertPaintCodex.ViewModels


			




	
	
	
		
 
        

			




	
	
	
		
 
        private bool _isValidConcentration;


			




	
	
	
		
 
        public bool IsValidConcentration


			




	
	
	
		
 
        {


			




	
	
	
		
 
            get => _isValidConcentration;


			




	
	
	
		
 
            set => this.RaiseAndSetIfChanged(ref _isValidConcentration, value);


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        private string _missingReactionList = string.Empty;


			




	
	
	
		
 
        public string MissingReactionList


			




	
	
	
		
 
        {


			




	
	
	
		
 
            get => _missingReactionList;


			




	
	
	
		
 
            set => this.RaiseAndSetIfChanged(ref _missingReactionList, value);


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        public ObservableCollection<Reagent> Reagents { get; } = new();


			




	...
	
		
 
@@ -44,2 +69,3 @@ namespace DesertPaintCodex.ViewModels


			




	
	
	
		
 
        private readonly PaintRecipe _currentRecipe = new();


			




	
	
	
		
 
        private PaintColor _tempColor = new PaintColor(0, 0,0);


			




	
	
	
		
 

			




	...
	
		
 
@@ -89,2 +115,85 @@ namespace DesertPaintCodex.ViewModels


			




	
	
	
		
 
        

			




	
	
	
		
 
        private void ShowRecipeLibrary()


			




	
	
	
		
 
        {


			




	
	
	
		
 
            _recipeLibraryVM = new RecipeLibraryViewModel();


			




	
	
	
		
 
            Observable.Merge(_recipeLibraryVM.Ok, _recipeLibraryVM.Cancel).Subscribe(_ => LoadRecipe());


			




	
	
	
		
 

			




	
	
	
		
 
            RecipeLibraryActivity = _recipeLibraryVM;


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
        // Show the list of recipes and allow the user to pick one to load


			




	
	
	
		
 
        public void LoadRecipe()


			




	
	
	
		
 
        {


			




	
	
	
		
 
            // TODO: show the list of recipes


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        public void SelectRecipeToLoad(PaintRecipe recipe)


			




	
	
	
		
 
        {


			




	
	
	
		
 
            // 1: Clear the current recipe


			




	
	
	
		
 
            _currentRecipe.Clear();


			




	
	
	
		
 
            RecipeItems.Clear();


			




	
	
	
		
 

			




	
	
	
		
 
            // 2: Set the recipe items from the loaded recipe


			




	
	
	
		
 
            foreach (PaintRecipe.ReagentQuantity reagentQuantity in recipe.Reagents)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                Reagent reagent = ReagentService.GetReagent(reagentQuantity.Name);


			




	
	
	
		
 
                if (reagent != null)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    RecipeItems.Add(new RecipeItem(reagent, reagentQuantity.Quantity));


			




	
	
	
		
 
                }


			




	
	
	
		
 
            }


			




	
	
	
		
 
            UpdateRecipe();


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        // Replace the recipe for a color with the current recipe


			




	
	
	
		
 
        public void ReplaceRecipe()


			




	
	
	
		
 
        {


			




	
	
	
		
 
            if (IsGoodRecipe && IsValidConcentration)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                if (ProfileManager.CurrentProfile == null) return;


			




	
	
	
		
 

			




	
	
	
		
 
                string colorName = PaletteService.FindNearest(_currentRecipe.ReactedColor);


			




	
	
	
		
 
                _tempColor.Set(colorName, _currentRecipe.ReactedColor);


			




	
	
	
		
 
                

			




	
	
	
		
 
                ProfileManager.CurrentProfile.Recipes[colorName].CopyFrom(_currentRecipe);


			




	
	
	
		
 

			




	
	
	
		
 
                UpdateExistingRecipe();


			




	
	
	
		
 
            }


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        private void UpdateExistingRecipe()


			




	
	
	
		
 
        {


			




	
	
	
		
 
            if (IsGoodRecipe)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                string colorName = PaletteService.FindNearest(_currentRecipe.ReactedColor);


			




	
	
	
		
 
                if ((ProfileManager.CurrentProfile != null) && (ProfileManager.CurrentProfile.Recipes.TryGetValue(colorName, out PaintRecipe? paintRecipe)))


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    System.Diagnostics.Debug.WriteLine($"Setting existing recipe for {colorName}.");


			




	
	
	
		
 

			




	
	
	
		
 
                    GeneratorRecipe? existingRecipe = ExistingRecipe;


			




	
	
	
		
 
                    if (existingRecipe == null)


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        _tempColor.Set(colorName, _currentRecipe.ReactedColor);


			




	
	
	
		
 
                        existingRecipe = new GeneratorRecipe(_tempColor);


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                    else


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        existingRecipe.Color.Set(colorName, _currentRecipe.ReactedColor);


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                    existingRecipe.DraftRecipe(paintRecipe);


			




	
	
	
		
 
                    ExistingRecipe = null;


			




	
	
	
		
 
                    ExistingRecipe = existingRecipe;


			




	
	
	
		
 
                }


			




	
	
	
		
 
                else


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    ExistingRecipe = null;


			




	
	
	
		
 
                }


			




	
	
	
		
 
            }


			




	
	
	
		
 
            else


			




	
	
	
		
 
            {


			




	
	
	
		
 
                ExistingRecipe = null;


			




	
	
	
		
 
            }


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        private void UpdateRecipe()


			




	...
	
		
 
@@ -103,3 +212,16 @@ namespace DesertPaintCodex.ViewModels


			




	
	
	
		
 
            HasMissingReactions = _currentRecipe.HasMissingReactions();


			




	
	
	
		
 
            if (HasMissingReactions)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                List<(string, string)> missingReactions = _currentRecipe.MissingReactionPairs();


			




	
	
	
		
 
                List<string> missingReactionsStrings = new List<string>(missingReactions.Count);


			




	
	
	
		
 
                foreach ((string reagent1, string reagent2) in missingReactions)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    missingReactionsStrings.Add($"{reagent1}+{reagent2}");


			




	
	
	
		
 
                }


			




	
	
	
		
 
                MissingReactionList = string.Join(", ", missingReactionsStrings);


			




	
	
	
		
 
            }


			




	
	
	
		
 
            IsGoodRecipe        = !HasMissingReactions && _currentRecipe.IsValidForConcentration(10);


			




	
	
	
		
 
            IsValidConcentration = _currentRecipe.IsValidForConcentration(10);


			




	
	
	
		
 

			




	
	
	
		
 
            UpdateExistingRecipe();


			




	
	
	
		
 
        }


			




        

    


    
    

    

        

                

                    Views/SimulatorView.axaml
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -6,2 +6,3 @@


			




	
	
	
		
 
             xmlns:views="clr-namespace:DesertPaintCodex.Views"


			




	
	
	
		
 
             xmlns:models="clr-namespace:DesertPaintCodex.Models"


			




	
	
	
		
 
             mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="475"


			




	...
	
		
 
@@ -17,2 +18,12 @@


			




	
	
	
		
 
    

			




	
	
	
		
 
    <UserControl.DataTemplates>


			




	
	
	
		
 
      <DataTemplate DataType="{x:Type models:GeneratorRecipe}">


			




	
	
	
		
 
        <Grid ColumnDefinitions="45,5,130,5,*" RowDefinitions="Auto" Margin="5">


			




	
	
	
		
 
          <Border Grid.Column="0" Classes="ReagentSwatch" Background="{Binding Color, Converter={StaticResource paintToBrush}, FallbackValue=#00000000}" />


			




	
	
	
		
 
          <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Color.Name}"/>


			




	
	
	
		
 
          <TextBlock Grid.Column="4" VerticalAlignment="Center" TextWrapping="Wrap" Text="{Binding Recipe}"/>


			




	
	
	
		
 
        </Grid>


			




	
	
	
		
 
      </DataTemplate>


			




	
	
	
		
 
    </UserControl.DataTemplates>


			




	
	
	
		
 
  

			




	
	
	
		
 
    <UserControl.Styles>


			




	...
	
		
 
@@ -31,5 +42,27 @@


			




	
	
	
		
 
        

			




	
	
	
		
 
        <views:EmbeddedWarningBox DockPanel.Dock="Bottom" Title="🛇 INSUFFICIENT DATA" Message="You are missing reaction data necessary for simulating this recipe." IsVisible="{Binding HasMissingReactions}" />


			




	
	
	
		
 
      <views:EmbeddedWarningBox DockPanel.Dock="Bottom" Title="🛇 INSUFFICIENT CONCENTRATION" Message="The current recipe does not have sufficient concentration of reagents." IsVisible="{Binding !IsValidConcentration}" />


			




	
	
	
		
 
      <views:EmbeddedWarningBox DockPanel.Dock="Bottom" Title="🛇 INSUFFICIENT DATA" Message="You are missing reaction data necessary for simulating this recipe." Message2="{Binding MissingReactionList}" IsVisible="{Binding HasMissingReactions}" />


			




	
	
	
		
 

			




	
	
	
		
 
    <Border Classes="ThinFrame" DockPanel.Dock="Bottom" IsVisible="{Binding ExistingRecipe, Converter={x:Static ObjectConverters.IsNotNull}}" Margin="0,0,0,10">


			




	
	
	
		
 
      <Grid ColumnDefinitions="*,50" RowDefinitions="20,*" HorizontalAlignment="Stretch" DockPanel.Dock="Bottom" >


			




	
	
	
		
 
          <TextBlock Classes="BlockHeader" Grid.Row="0" Grid.Column="0" DockPanel.Dock="Top" Margin="0 0 0 5">CURRENT RECIPE</TextBlock>


			




	
	
	
		
 
          <ContentControl Grid.Row="1" Grid.Column="0" Content="{Binding ExistingRecipe}"/>


			




	
	
	
		
 
      </Grid>


			




	
	
	
		
 
    </Border>


			




	
	
	
		
 
        

			




	
	
	
		
 
        <views:PaintSwatchView DockPanel.Dock="Bottom" ShowName="True" Color="{Binding PaintColor}"  IsVisible="{Binding !HasMissingReactions}"/>


			




	
	
	
		
 
    <Grid ColumnDefinitions="*,120" RowDefinitions="*" HorizontalAlignment="Stretch" DockPanel.Dock="Bottom" Margin="0,0,0,10">


			




	
	
	
		
 
      <views:PaintSwatchView Grid.Row="0" Grid.Column="0" ShowName="True" Color="{Binding PaintColor}"  IsVisible="true"/>


			




	
	
	
		
 
      <Button Grid.Row="0" Grid.Column="1" Margin="10 10 10 10" IsEnabled="{Binding IsGoodRecipe}"  Command="{Binding ReplaceRecipe}">


			




	
	
	
		
 
        <Panel>


			




	
	
	
		
 
        <TextBlock TextAlignment="Center" IsVisible="{Binding ExistingRecipe, Converter={x:Static ObjectConverters.IsNull}}">


			




	
	
	
		
 
Save


			




	
	
	
		
 
Recipe


			




	
	
	
		
 
        </TextBlock>


			




	
	
	
		
 
        <TextBlock TextAlignment="Center" IsVisible="{Binding ExistingRecipe, Converter={x:Static ObjectConverters.IsNotNull}}">


			




	
	
	
		
 
Replace


			




	
	
	
		
 
Recipe


			




	
	
	
		
 
        </TextBlock>


			




	
	
	
		
 
        </Panel>


			




	
	
	
		
 
      </Button>


			




	
	
	
		
 
    </Grid>


			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







    


    

  


    








    
        Server instance: opal4.opalstack.com-290901
    
    
        This site is powered by
            Kallithea 0.6.2,
        which is
        © 2010–2020 by various authors & licensed under GPLv3.
            – Support