Skip to content

Commit 19714ab

Browse files
can switch between models but likely need a better control flow that what have currently
1 parent 11dc022 commit 19714ab

File tree

4 files changed

+26
-17
lines changed

4 files changed

+26
-17
lines changed

Samples/StyleTransfer/AppModel.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,17 @@ public IEnumerable<string> CameraNamesList
8080
set { _cameraNamesList = value; OnPropertyChanged(); }
8181
}
8282

83+
private int _selectedCameraIndex;
84+
public int SelectedCameraIndex
85+
{
86+
get { return _selectedCameraIndex; }
87+
set
88+
{
89+
_selectedCameraIndex = value;
90+
OnPropertyChanged();
91+
}
92+
}
93+
8394

8495
public event PropertyChangedEventHandler PropertyChanged;
8596
private void OnPropertyChanged([CallerMemberName] string propertyName = null)

Samples/StyleTransfer/AppViewModel.cs

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,6 @@ public ICommand SaveCommand
6464
public ICommand LiveStreamCommand { get; set; }
6565
public ICommand ChangeMediaInputCommand { get; set; }
6666

67-
private int _selectedCameraIndex;
68-
public int SelectedCameraIndex
69-
{
70-
get { return _selectedCameraIndex; }
71-
set
72-
{
73-
_selectedCameraIndex = value;
74-
//ChangeMediaInput();
75-
OnPropertyChanged();
76-
}
77-
}
78-
7967
public event PropertyChangedEventHandler PropertyChanged;
8068
private void OnPropertyChanged([CallerMemberName] string propertyName = null)
8169
{
@@ -112,13 +100,13 @@ public async Task StartWebcamStream()
112100
}
113101

114102
_appModel.CameraNamesList = _mediaFrameSourceGroupList.Select(group => group.DisplayName);
115-
SelectedCameraIndex = 0;
103+
_appModel.SelectedCameraIndex = 0;
116104
}
117105

118106
private async Task LoadModelAsync()
119107
{
120108

121-
StorageFile modelFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/candy.onnx"));
109+
StorageFile modelFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri($"ms-appx:///Assets/{_appModel.ModelSource}.onnx"));
122110
m_model = await LearningModel.LoadFromStorageFileAsync(modelFile);
123111

124112
// TODO: Pass in useGPU as well. OR decide which side of binary these go on.
@@ -230,10 +218,10 @@ public async Task ChangeMediaInput()
230218
// UICmbCamera_SelectionChanged
231219

232220
//await CleanupCameraAsync();
233-
221+
if (_mediaFrameSourceGroupList == null) { return; }
234222
try
235223
{
236-
_selectedMediaFrameSourceGroup = _mediaFrameSourceGroupList[SelectedCameraIndex];
224+
_selectedMediaFrameSourceGroup = _mediaFrameSourceGroupList[_appModel.SelectedCameraIndex];
237225

238226
// Create MediaCapture and its settings
239227
_mediaCapture = new MediaCapture();

Samples/StyleTransfer/MainPage.xaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@
119119
<VirtualizingStackPanel Orientation="Horizontal" />
120120
</ItemsPanelTemplate>
121121
</ListBox.ItemsPanel>
122+
<i:Interaction.Behaviors>
123+
<core:EventTriggerBehavior EventName="SelectionChanged">
124+
<core:InvokeCommandAction Command="{Binding ChangeMediaInputCommand}" />
125+
</core:EventTriggerBehavior>
126+
</i:Interaction.Behaviors>
122127
</ListBox>
123128

124129
<!-- Input media -->
@@ -290,7 +295,7 @@
290295
Name="UICmbCamera"
291296
Foreground="White"
292297
ItemsSource="{Binding CurrentApp.CameraNamesList}"
293-
SelectedIndex="{Binding SelectedCameraIndex, Mode=TwoWay}">
298+
SelectedIndex="{Binding CurrentApp.SelectedCameraIndex, Mode=TwoWay}">
294299
<i:Interaction.Behaviors>
295300
<core:EventTriggerBehavior EventName="SelectionChanged">
296301
<core:InvokeCommandAction Command="{Binding ChangeMediaInputCommand}" />

Samples/StyleTransfer/StyleTransfer.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,11 @@
237237
<ItemGroup>
238238
<Content Include="Assets\candy.onnx" />
239239
</ItemGroup>
240+
<ItemGroup>
241+
<Content Include="Assets\la_muse.onnx" />
242+
<Content Include="Assets\mosaic.onnx" />
243+
<Content Include="Assets\udnie.onnx" />
244+
</ItemGroup>
240245
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
241246
<VisualStudioVersion>14.0</VisualStudioVersion>
242247
</PropertyGroup>

0 commit comments

Comments
 (0)