Merge pull request #30 from harp-tech/bugfix/misc_fixes

App 1.2.1 - bug fixes

Author: MicBoucinha

App/Directory.Build.props

@@ -2,6 +2,6 @@
   <PropertyGroup>
     <Nullable>enable</Nullable>
     <AvaloniaVersion>11.2.6</AvaloniaVersion>
-    <AppVersion>1.2.0</AppVersion>
+    <AppVersion>1.2.1</AppVersion>
   </PropertyGroup>
 </Project>

App/Harp.Olfactometer.App.sln

@@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		Harp.Olfactometer.nsi = Harp.Olfactometer.nsi
 		README.md = README.md
+		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
 Global

App/Harp.Olfactometer.Design/Views/About.axaml

@@ -29,7 +29,7 @@
     <md:MarkdownScrollViewer xml:space="preserve" HorizontalAlignment="Center">
       The Olfactometer GUI application allows to configure the Olfactometer device, developed by the Hardware and Software Platform at the Champalimaud Foundation.
 
-      The Olfactometer device is a Harp device and has all the inherent functionality of Harp devices.
+      The Olfactometer is a Harp device and has all the inherent Harp Devices functionalities.
 
       The GUI was developed using [.NET](https://dotnet.microsoft.com/), [AvaloniaUI](https://avaloniaui.net/) with ReactiveUI and makes direct use of the [Bonsai.Harp](https://github.com/bonsai-rx/harp) library.
 

App/Harp.Olfactometer.Design/Views/MyDeviceView.axaml

@@ -197,10 +197,26 @@
                   <TextBlock Grid.Row="4" Grid.Column="2"
                              Text="{Binding Channel3ActualFlow, StringFormat={}{0:0.0}}"
                              VerticalAlignment="Center" HorizontalAlignment="Center" />
-                  <ComboBox Grid.Row="4" Grid.Column="3" SelectedIndex="{Binding Path=Channel3Range}"
-                            HorizontalAlignment="Center" VerticalAlignment="Center">
-                    <ComboBoxItem>0-100 ml/min</ComboBoxItem>
-                    <ComboBoxItem>0-1000 ml/min</ComboBoxItem>
+                  <ComboBox Grid.Row="4" Grid.Column="3" SelectedItem="{Binding Channel3Range, Mode=TwoWay}"
+                                        IsEnabled="True"
+                                        Margin="0,5,0,0"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center">
+                    <ComboBox.Resources>
+                      <conv:EnumDisplayConverter x:Key="EnumDisplayConverter">
+                        <conv:EnumDisplayConverter.Mappings>
+                          <system:String x:Key="FlowRate100">0-100 ml/min</system:String>
+                          <system:String x:Key="FlowRate1000">0-1000 ml/min</system:String>
+                        </conv:EnumDisplayConverter.Mappings>
+                      </conv:EnumDisplayConverter>
+                    </ComboBox.Resources>
+                    <ComboBox.ItemTemplate>
+                      <DataTemplate>
+                        <TextBlock Text="{Binding Converter={StaticResource EnumDisplayConverter}}" />
+                      </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                    <x:Static Member="local:Channel3RangeConfig.FlowRate100" />
+                    <x:Static Member="local:Channel3RangeConfig.FlowRate1000" />
                   </ComboBox>
                   <!-- Channel 4 -->
                   <TextBlock Grid.Row="5" Grid.Column="0" Margin="15" Text="Channel 4"