ATITD-Tools/Desert-Paint-Codex Changeset

Changeset - 8ee5f618b07c

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 1 0

Tess Snider (Malkyne) - 3 years ago 2021-07-26 08:16:19
this@malkyne.org

Merge

1 file changed with 10 insertions and 9 deletions:

ViewModels/RecipeGeneratorViewModel.cs

0 comments (0 inline, 0 general)

ViewModels/RecipeGeneratorViewModel.cs

➞

Show inline comments

@@ ... / @@ -13,7 +13,7 @@ namespace DesertPaintCodex.ViewModels @@
+{
     public class RecipeGeneratorViewModel : ViewModelBase
+    {
-        private const long   UpdateInterval  = 2000;  // ms
+        private const long   UpdateInterval  = 200;  // ms
         private const long   SaveInterval    = 30000; // ms
         private const string PaintStateFile  = "dp_generator_state";
         private const string RibbonStateFile = "dp_generator_ribbon_state";
@@ ... / @@ -24,8 +24,8 @@ namespace DesertPaintCodex.ViewModels @@
         private float _progress = 0;
         public float Progress { get => _progress; private set => this.RaiseAndSetIfChanged(ref _progress, value); }
         private int _permutationCount = 0;
         public int PermutationCount { get => _permutationCount; private set => this.RaiseAndSetIfChanged(ref _permutationCount, value); }
         private string _permutationCount = "0";
         public string PermutationCount { get => _permutationCount; private set => this.RaiseAndSetIfChanged(ref _permutationCount, value); }
         private DateTime _mostRecentTime;
@@ ... / @@ -243,16 +243,17 @@ namespace DesertPaintCodex.ViewModels @@
+            {
                 _generator.LoadState(stateFile);
                 // Always set these, or the values will be invalid
                 MaxReagents = (int)_generator.MaxReagents;
                 MaxConcentration = (int)_generator.MaxConcentration;
                 FullQuantity = (int)_generator.FullQuantity;
                 FullQuantityDepth = (int)_generator.FullQuantityDepth;
                 if (_generator.CanResume)
+                {
                     IsInProgress = true;
                     IsPaused = true;
                     MaxReagents       = (int) _generator.MaxReagents;
                     MaxConcentration  = (int) _generator.MaxConcentration;
                     FullQuantity      = (int) _generator.FullQuantity;
                     FullQuantityDepth = (int) _generator.FullQuantityDepth;
                     SaveSettings(mode);
+                }
                 else
@@ ... / @@ -326,7 +327,7 @@ namespace DesertPaintCodex.ViewModels @@
             DateTime now = DateTime.Now;
             // Update test count.
             PermutationCount = _newRecipeCount;
+            PermutationCount = $"{_newRecipeCount:n0}";
             // Pull in new recipes.
             if (!_pendingNewRecipes.IsEmpty)

0 comments (0 inline, 0 general)