From d40072fd9e343966da91df328040408440cb52e6 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Wed, 9 Aug 2023 17:25:54 -0400
Subject: [PATCH] Add Dimension enable toggle to SamplerCardViewModel

---
 .../Models/Inference/SamplerCardModel.cs           |  4 +---
 .../Inference/InferenceTextToImageViewModel.cs     | 13 ++++++++++++-
 .../ViewModels/Inference/SamplerCardViewModel.cs   | 14 +++-----------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/StabilityMatrix.Avalonia/Models/Inference/SamplerCardModel.cs b/StabilityMatrix.Avalonia/Models/Inference/SamplerCardModel.cs
index 7008b721..107efbe3 100644
--- a/StabilityMatrix.Avalonia/Models/Inference/SamplerCardModel.cs
+++ b/StabilityMatrix.Avalonia/Models/Inference/SamplerCardModel.cs
@@ -13,12 +13,10 @@ public class SamplerCardModel
     public bool IsCfgScaleEnabled { get; init; } = true;
     public double CfgScale { get; init; }
     
-    public bool IsScaleSizeMode { get; init; }
+    public bool IsDimensionsEnabled { get; init; }
     public int Width { get; init; }
     public int Height { get; init; }
     
-    public double Scale { get; init; }
-    
     public bool IsSamplerSelectionEnabled { get; init; } = true;
     public string? SelectedSampler { get; init; }
 }
diff --git a/StabilityMatrix.Avalonia/ViewModels/Inference/InferenceTextToImageViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/Inference/InferenceTextToImageViewModel.cs
index aaf4a637..553a7ddc 100644
--- a/StabilityMatrix.Avalonia/ViewModels/Inference/InferenceTextToImageViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/Inference/InferenceTextToImageViewModel.cs
@@ -83,7 +83,18 @@ public partial class InferenceTextToImageViewModel
 
         ConfigCardViewModel = vmFactory.Get<StackCardViewModel>().WithCards(new ViewModelBase[]
             {
-                vmFactory.Get<SamplerCardViewModel>()
+                vmFactory.Get<SamplerCardViewModel>(),
+                vmFactory.Get<StackExpanderViewModel>().WithCards(new ViewModelBase[]
+                {
+                    vmFactory.Get<UpscalerCardViewModel>(),
+                    vmFactory.Get<SamplerCardViewModel>(vm =>
+                    {
+                        vm.IsScaleSizeMode = true;
+                        vm.IsCfgScaleEnabled = false;
+                        vm.IsSamplerSelectionEnabled = false;
+                        vm.IsDenoiseStrengthEnabled = true;
+                    }),
+                })
             });
     }
 
diff --git a/StabilityMatrix.Avalonia/ViewModels/Inference/SamplerCardViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/Inference/SamplerCardViewModel.cs
index 54f8fcfb..f1150032 100644
--- a/StabilityMatrix.Avalonia/ViewModels/Inference/SamplerCardViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/Inference/SamplerCardViewModel.cs
@@ -20,16 +20,10 @@ public partial class SamplerCardViewModel : ViewModelBase, ILoadableState<Sample
     [ObservableProperty] private bool isCfgScaleEnabled = true;
     [ObservableProperty] private double cfgScale = 7;
     
-    // Switch between the 2 size modes
-    [ObservableProperty] private bool isScaleSizeMode;
-    
-    // Absolute size mode
+    [ObservableProperty] private bool isDimensionsEnabled;
     [ObservableProperty] private int width = 512;
     [ObservableProperty] private int height = 512;
     
-    // Scale size mode
-    [ObservableProperty] private double scale = 1;
-    
     [ObservableProperty] private bool isSamplerSelectionEnabled = true;
     
     [ObservableProperty, Required]
@@ -50,10 +44,9 @@ public partial class SamplerCardViewModel : ViewModelBase, ILoadableState<Sample
         DenoiseStrength = state.DenoiseStrength;
         IsCfgScaleEnabled = state.IsCfgScaleEnabled;
         CfgScale = state.CfgScale;
-        IsScaleSizeMode = state.IsScaleSizeMode;
+        IsDimensionsEnabled = state.IsDimensionsEnabled;
         Width = state.Width;
         Height = state.Height;
-        Scale = state.Scale;
         IsSamplerSelectionEnabled = state.IsSamplerSelectionEnabled;
         SelectedSampler = state.SelectedSampler is null ? null 
             : new ComfySampler(state.SelectedSampler);
@@ -69,10 +62,9 @@ public partial class SamplerCardViewModel : ViewModelBase, ILoadableState<Sample
             DenoiseStrength = DenoiseStrength,
             IsCfgScaleEnabled = IsCfgScaleEnabled,
             CfgScale = CfgScale,
-            IsScaleSizeMode = IsScaleSizeMode,
+            IsDimensionsEnabled = IsDimensionsEnabled,
             Width = Width,
             Height = Height,
-            Scale = Scale,
             IsSamplerSelectionEnabled = IsSamplerSelectionEnabled,
             SelectedSampler = SelectedSampler?.Name
         };