Skip to content
This repository was archived by the owner on Nov 27, 2024. It is now read-only.

Commit 6d266f3

Browse files
saddam213saddam213
committed
Tidy up UI
1 parent 4f25f97 commit 6d266f3

File tree

10 files changed

+63
-64
lines changed

10 files changed

+63
-64
lines changed

‎OnnxStack.UI/MainWindow.xaml‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
<StackPanel Orientation="Horizontal" Margin="5">
2929
<StackPanel Orientation="Horizontal">
3030
<userControls:FontAwesome Icon="&#xf15c;" IconStyle="Light"/>
31-
<userControls:FontAwesome Icon="&#xf054;" IconStyle="Regular" Size="8" Margin="3"/>
32-
<userControls:FontAwesome Icon="&#xf1c5;" IconStyle="Light"/>
3331
</StackPanel>
3432
<TextBlock Text="Text To Image" Margin="5,0,0,0"/>
3533
</StackPanel>
@@ -42,9 +40,7 @@
4240
<TabItem.Header>
4341
<StackPanel Orientation="Horizontal" Margin="5">
4442
<StackPanel Orientation="Horizontal">
45-
<userControls:FontAwesome Icon="&#xf1c5;" IconStyle="Light"/>
46-
<userControls:FontAwesome Icon="&#xf054;" IconStyle="Regular" Size="8" Margin="3"/>
47-
<userControls:FontAwesome Icon="&#xf1c5;" IconStyle="Light"/>
43+
<userControls:FontAwesome Icon="&#xf03e;" IconStyle="Light"/>
4844
</StackPanel>
4945
<TextBlock Text="Image To Image" Margin="5,0,0,0"/>
5046
</StackPanel>
@@ -57,9 +53,7 @@
5753
<TabItem.Header>
5854
<StackPanel Orientation="Horizontal" Margin="5">
5955
<StackPanel Orientation="Horizontal">
60-
<userControls:FontAwesome Icon="&#xf15b;" IconStyle="Light"/>
61-
<userControls:FontAwesome Icon="&#xf054;" IconStyle="Regular" Size="8" Margin="3"/>
62-
<userControls:FontAwesome Icon="&#xf1c5;" IconStyle="Light"/>
56+
<userControls:FontAwesome Icon="&#xf1fc;" IconStyle="Light"/>
6357
</StackPanel>
6458
<TextBlock Text="Image Inpaint" Margin="5,0,0,0"/>
6559
</StackPanel>
@@ -72,9 +66,7 @@
7266
<TabItem.Header>
7367
<StackPanel Orientation="Horizontal" Margin="5">
7468
<StackPanel Orientation="Horizontal">
75-
<userControls:FontAwesome Icon="&#xf1c8;" IconStyle="Light"/>
76-
<userControls:FontAwesome Icon="&#xf054;" IconStyle="Regular" Size="8" Margin="3"/>
77-
<userControls:FontAwesome Icon="&#xf1c8;" IconStyle="Light"/>
69+
<userControls:FontAwesome Icon="&#xf008;" IconStyle="Light"/>
7870
</StackPanel>
7971
<TextBlock Text="Video To Video" Margin="5,0,0,0"/>
8072
</StackPanel>
@@ -87,9 +79,7 @@
8779
<TabItem.Header>
8880
<StackPanel Orientation="Horizontal" Margin="5">
8981
<StackPanel Orientation="Horizontal">
90-
<userControls:FontAwesome Icon="&#xf1c8;" IconStyle="Light"/>
91-
<userControls:FontAwesome Icon="&#xf054;" IconStyle="Regular" Size="8" Margin="3"/>
92-
<userControls:FontAwesome Icon="&#xf1c8;" IconStyle="Light"/>
82+
<userControls:FontAwesome Icon="&#xf6ff;" IconStyle="Light"/>
9383
</StackPanel>
9484
<TextBlock Text="ControlNet" Margin="5,0,0,0"/>
9585
</StackPanel>

‎OnnxStack.UI/Models/SchedulerOptionsModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class SchedulerOptionsModel : INotifyPropertyChanged
3232
private float _maximumBeta = 0.999f;
3333
private int _originalInferenceSteps = 100;
3434
private SchedulerType _schedulerType;
35-
private float _conditioningScale = 7f;
35+
private float _conditioningScale = 0.7f;
3636
private bool _hasChanged;
3737

3838
/// <summary>

‎OnnxStack.UI/Services/ModelFactory.cs‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public IEnumerable<UpscaleModelTemplate> GetUpscaleModelTemplates()
3232
public IEnumerable<StableDiffusionModelTemplate> GetStableDiffusionModelTemplates()
3333
{
3434
yield return new StableDiffusionModelTemplate("SD", DiffuserPipelineType.StableDiffusion, ModelType.Base, 512, DiffuserType.TextToImage, DiffuserType.ImageToImage, DiffuserType.ImageInpaintLegacy);
35-
yield return new StableDiffusionModelTemplate("SD-Inpaint", DiffuserPipelineType.StableDiffusion, ModelType.Base, 512, DiffuserType.ImageInpaint);
35+
yield return new StableDiffusionModelTemplate("SD-Inpaint", DiffuserPipelineType.StableDiffusion, ModelType.Base, 512, DiffuserType.ImageInpaint);
36+
yield return new StableDiffusionModelTemplate("SD-ControlNet", DiffuserPipelineType.StableDiffusion, ModelType.Base, 512, DiffuserType.ControlNet, DiffuserType.ControlNetImage);
3637

3738
yield return new StableDiffusionModelTemplate("SDXL", DiffuserPipelineType.StableDiffusionXL, ModelType.Base, 1024, DiffuserType.TextToImage, DiffuserType.ImageToImage, DiffuserType.ImageInpaintLegacy);
3839
yield return new StableDiffusionModelTemplate("SDXL-Inpaint", DiffuserPipelineType.StableDiffusionXL, ModelType.Base, 1024, DiffuserType.ImageInpaint);
@@ -71,14 +72,20 @@ public StableDiffusionModelSet CreateStableDiffusionModelSet(string name, string
7172
ModelConfigurations = new List<OnnxModelConfig>()
7273
};
7374

74-
75+
// Some repositories have the ControlNet in the unet folder, some on the controlnet folder
76+
var isControlNet = modelTemplate.DiffuserTypes.Any(x => x == DiffuserType.ControlNet || x == DiffuserType.ControlNetImage);
7577
var unetPath = Path.Combine(folder, "unet", "model.onnx");
78+
var controlNetUnetPath = Path.Combine(folder, "controlnet", "model.onnx");
79+
if (isControlNet && File.Exists(controlNetUnetPath))
80+
unetPath = controlNetUnetPath;
81+
7682
var tokenizerPath = Path.Combine(folder, "tokenizer", "model.onnx");
7783
var textEncoderPath = Path.Combine(folder, "text_encoder", "model.onnx");
7884
var vaeDecoder = Path.Combine(folder, "vae_decoder", "model.onnx");
7985
var vaeEncoder = Path.Combine(folder, "vae_encoder", "model.onnx");
8086
var tokenizer2Path = Path.Combine(folder, "tokenizer_2", "model.onnx");
8187
var textEncoder2Path = Path.Combine(folder, "text_encoder_2", "model.onnx");
88+
var controlnet = Path.Combine(folder, "controlnet", "model.onnx");
8289
if (!File.Exists(tokenizerPath))
8390
tokenizerPath = _defaultTokenizerPath;
8491
if (!File.Exists(tokenizer2Path))

‎OnnxStack.UI/UserControls/ControlNetPickerControl.xaml.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using Microsoft.Extensions.Logging;
22
using OnnxStack.Core;
3-
using OnnxStack.ImageUpscaler.Services;
43
using OnnxStack.StableDiffusion.Common;
54
using OnnxStack.UI.Commands;
65
using OnnxStack.UI.Models;

‎OnnxStack.UI/UserControls/SchedulerControl.xaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
xmlns:behaviors="clr-namespace:OnnxStack.UI.Behaviors"
99
xmlns:userControls="clr-namespace:OnnxStack.UI.UserControls"
1010
mc:Ignorable="d"
11+
MinHeight="280"
1112
d:DesignWidth="500" Name="UI">
1213
<UserControl.Resources>
1314
<Style TargetType="{x:Type Label}">
@@ -128,12 +129,12 @@
128129
</StackPanel>
129130

130131

131-
<StackPanel Margin="5,0,0,0">
132+
<StackPanel Margin="0,0,5,0">
132133
<DockPanel>
133134
<Label>Conditioning Scale</Label>
134135
<TextBlock Text="{Binding ElementName=SliderInitialConditioningScale, Path=Value, StringFormat={}{0:F2}}" VerticalAlignment="Bottom" HorizontalAlignment="Right" FontSize="10" Margin="0,0,6,0" FontWeight="Medium" />
135136
</DockPanel>
136-
<Slider Name="SliderInitialConditioningScale" Value="{Binding SchedulerOptions.ConditioningScale}" Minimum="0" Maximum="1" TickFrequency="0.01" IsSnapToTickEnabled="true" SmallChange="0.01" LargeChange="0.01">
137+
<Slider Name="SliderInitialConditioningScale" Value="{Binding SchedulerOptions.ConditioningScale}" Minimum="0" Maximum="2" TickFrequency="0.01" IsSnapToTickEnabled="true" SmallChange="0.01" LargeChange="0.01">
137138
<i:Interaction.Behaviors>
138139
<behaviors:SliderMouseWheelBehavior />
139140
</i:Interaction.Behaviors>

‎OnnxStack.UI/Views/ControlNetView.xaml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,21 @@
3131
IsEnabled="{Binding IsGenerating, Converter={StaticResource InverseBoolConverter}}"
3232
SelectedModel="{Binding SelectedControlNetModel, Mode=TwoWay}"/>
3333
</StackPanel>
34-
35-
<UniformGrid Rows="2" IsEnabled="{Binding SelectedModel.IsLoaded, FallbackValue=False, TargetNullValue=False}">
36-
<userControls:PromptControl
37-
SelectedModel="{Binding SelectedModel}"
38-
PromptOptions="{Binding PromptOptions}"
39-
IsEnabled="{Binding IsControlsEnabled}"/>
40-
<userControls:SchedulerControl DockPanel.Dock="Bottom" Margin="0, 10, 0 ,0"
41-
SelectedModel="{Binding SelectedModel}"
42-
DiffuserType="ControlNet"
43-
SchedulerOptions="{Binding SchedulerOptions, Mode=TwoWay}"
44-
IsEnabled="{Binding IsControlsEnabled}"
45-
IsGenerating="{Binding IsGenerating}"/>
46-
</UniformGrid>
34+
<Grid IsEnabled="{Binding SelectedModel.IsLoaded, FallbackValue=False, TargetNullValue=False}">
35+
<DockPanel IsEnabled="{Binding SelectedControlNetModel.IsLoaded, FallbackValue=False, TargetNullValue=False}">
36+
<userControls:SchedulerControl DockPanel.Dock="Bottom" Margin="0, 10, 0 ,0"
37+
SelectedModel="{Binding SelectedModel}"
38+
DiffuserType="ControlNet"
39+
SchedulerOptions="{Binding SchedulerOptions, Mode=TwoWay}"
40+
IsEnabled="{Binding IsControlsEnabled}"
41+
IsGenerating="{Binding IsGenerating}"/>
42+
<userControls:PromptControl
43+
SelectedModel="{Binding SelectedModel}"
44+
PromptOptions="{Binding PromptOptions}"
45+
IsEnabled="{Binding IsControlsEnabled}"/>
46+
</DockPanel>
47+
</Grid>
48+
4749
</DockPanel>
4850
</DockPanel>
4951

‎OnnxStack.UI/Views/ImageInpaintView.xaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@
2525
SupportedDiffusers="{Binding SupportedDiffusers}"
2626
IsEnabled="{Binding IsGenerating, Converter={StaticResource InverseBoolConverter}}"
2727
SelectedModel="{Binding SelectedModel, Mode=TwoWay}"/>
28-
<UniformGrid Rows="2" IsEnabled="{Binding SelectedModel.IsLoaded, FallbackValue=False, TargetNullValue=False}">
28+
<DockPanel IsEnabled="{Binding SelectedModel.IsLoaded, FallbackValue=False, TargetNullValue=False}">
29+
<userControls:SchedulerControl DockPanel.Dock="Bottom" Margin="0, 10, 0 ,0"
30+
SelectedModel="{Binding SelectedModel}"
31+
DiffuserType="ImageInpaint"
32+
SchedulerOptions="{Binding SchedulerOptions, Mode=TwoWay}"
33+
IsEnabled="{Binding IsControlsEnabled}"
34+
IsGenerating="{Binding IsGenerating}"/>
2935
<userControls:PromptControl
3036
SelectedModel="{Binding SelectedModel}"
3137
PromptOptions="{Binding PromptOptions}"
3238
IsEnabled="{Binding IsControlsEnabled}"/>
33-
<userControls:SchedulerControl DockPanel.Dock="Bottom" Margin="0, 10, 0 ,0"
34-
SelectedModel="{Binding SelectedModel}"
35-
DiffuserType="ImageInpaint"
36-
SchedulerOptions="{Binding SchedulerOptions, Mode=TwoWay}"
37-
IsEnabled="{Binding IsControlsEnabled}"
38-
IsGenerating="{Binding IsGenerating}"/>
39-
</UniformGrid>
39+
</DockPanel>
4040
</DockPanel>
4141
</DockPanel>
4242

‎OnnxStack.UI/Views/ImageToImageView.xaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@
2525
SupportedDiffusers="{Binding SupportedDiffusers}"
2626
IsEnabled="{Binding IsGenerating, Converter={StaticResource InverseBoolConverter}}"
2727
SelectedModel="{Binding SelectedModel, Mode=TwoWay}"/>
28-
<UniformGrid Rows="2" IsEnabled="{Binding SelectedModel.IsLoaded, FallbackValue=False, TargetNullValue=False}">
28+
<DockPanel IsEnabled="{Binding SelectedModel.IsLoaded, FallbackValue=False, TargetNullValue=False}">
29+
<userControls:SchedulerControl DockPanel.Dock="Bottom" Margin="0, 10, 0 ,0"
30+
SelectedModel="{Binding SelectedModel}"
31+
DiffuserType="ImageToImage"
32+
SchedulerOptions="{Binding SchedulerOptions, Mode=TwoWay}"
33+
IsEnabled="{Binding IsControlsEnabled}"
34+
IsGenerating="{Binding IsGenerating}"/>
2935
<userControls:PromptControl
3036
SelectedModel="{Binding SelectedModel}"
3137
PromptOptions="{Binding PromptOptions}"
3238
IsEnabled="{Binding IsControlsEnabled}"/>
33-
<userControls:SchedulerControl DockPanel.Dock="Bottom" Margin="0, 10, 0 ,0"
34-
SelectedModel="{Binding SelectedModel}"
35-
DiffuserType="ImageToImage"
36-
SchedulerOptions="{Binding SchedulerOptions, Mode=TwoWay}"
37-
IsEnabled="{Binding IsControlsEnabled}"
38-
IsGenerating="{Binding IsGenerating}"/>
39-
</UniformGrid>
39+
</DockPanel>
4040
</DockPanel>
4141
</DockPanel>
4242

‎OnnxStack.UI/Views/TextToImageView.xaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@
2525
SupportedDiffusers="{Binding SupportedDiffusers}"
2626
IsEnabled="{Binding IsGenerating, Converter={StaticResource InverseBoolConverter}}"
2727
SelectedModel="{Binding SelectedModel, Mode=TwoWay}" />
28-
<UniformGrid Rows="2" IsEnabled="{Binding SelectedModel.IsLoaded, FallbackValue=False, TargetNullValue=False}">
28+
<DockPanel IsEnabled="{Binding SelectedModel.IsLoaded, FallbackValue=False, TargetNullValue=False}">
29+
<userControls:SchedulerControl DockPanel.Dock="Bottom" Margin="0, 10, 0 ,0"
30+
SelectedModel="{Binding SelectedModel}"
31+
DiffuserType="TextToImage"
32+
SchedulerOptions="{Binding SchedulerOptions, Mode=TwoWay}"
33+
IsEnabled="{Binding IsControlsEnabled}"
34+
IsGenerating="{Binding IsGenerating}"/>
2935
<userControls:PromptControl
3036
SelectedModel="{Binding SelectedModel}"
3137
PromptOptions="{Binding PromptOptions}"
3238
IsEnabled="{Binding IsControlsEnabled}"/>
33-
<userControls:SchedulerControl DockPanel.Dock="Bottom" Margin="0, 10, 0 ,0"
34-
SelectedModel="{Binding SelectedModel}"
35-
DiffuserType="TextToImage"
36-
SchedulerOptions="{Binding SchedulerOptions, Mode=TwoWay}"
37-
IsEnabled="{Binding IsControlsEnabled}"
38-
IsGenerating="{Binding IsGenerating}"/>
39-
</UniformGrid>
39+
</DockPanel>
4040
</DockPanel>
4141
</DockPanel>
4242

‎OnnxStack.UI/Views/VideoToVideoView.xaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525
SupportedDiffusers="{Binding SupportedDiffusers}"
2626
IsEnabled="{Binding IsGenerating, Converter={StaticResource InverseBoolConverter}}"
2727
SelectedModel="{Binding SelectedModel, Mode=TwoWay}"/>
28-
<UniformGrid Rows="2" IsEnabled="{Binding SelectedModel.IsLoaded, FallbackValue=False, TargetNullValue=False}">
29-
<userControls:PromptControl
30-
IsVideoControlsEnabled="True"
31-
SelectedModel="{Binding SelectedModel}"
32-
PromptOptions="{Binding PromptOptions}"
33-
IsEnabled="{Binding IsControlsEnabled}"/>
28+
<DockPanel IsEnabled="{Binding SelectedModel.IsLoaded, FallbackValue=False, TargetNullValue=False}">
3429
<userControls:SchedulerControl DockPanel.Dock="Bottom" Margin="0, 10, 0 ,0"
3530
SelectedModel="{Binding SelectedModel}"
3631
DiffuserType="ImageToImage"
3732
SchedulerOptions="{Binding SchedulerOptions, Mode=TwoWay}"
3833
IsEnabled="{Binding IsControlsEnabled}"
3934
IsGenerating="{Binding IsGenerating}"/>
40-
</UniformGrid>
35+
<userControls:PromptControl
36+
IsVideoControlsEnabled="True"
37+
SelectedModel="{Binding SelectedModel}"
38+
PromptOptions="{Binding PromptOptions}"
39+
IsEnabled="{Binding IsControlsEnabled}"/>
40+
</DockPanel>
4141
</DockPanel>
4242
</DockPanel>
4343

0 commit comments

Comments
 (0)