diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index d3fa780..0016e08 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,7 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index d3fa780..0016e08 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,7 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ContentViewConverter.cs b/Correlator/Converter/ContentViewConverter.cs new file mode 100644 index 0000000..2fc63d4 --- /dev/null +++ b/Correlator/Converter/ContentViewConverter.cs @@ -0,0 +1,21 @@ +using System; +using System.Diagnostics; +using System.Globalization; +using System.Windows.Data; + +namespace Correlator.Converter +{ + public class ContentViewConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + Debug.Assert(value != null, nameof(value) + " != null"); + return (int)value == 0 ? "Collapsed" : "Visible"; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return null; + } + } +} \ No newline at end of file diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index d3fa780..0016e08 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,7 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ContentViewConverter.cs b/Correlator/Converter/ContentViewConverter.cs new file mode 100644 index 0000000..2fc63d4 --- /dev/null +++ b/Correlator/Converter/ContentViewConverter.cs @@ -0,0 +1,21 @@ +using System; +using System.Diagnostics; +using System.Globalization; +using System.Windows.Data; + +namespace Correlator.Converter +{ + public class ContentViewConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + Debug.Assert(value != null, nameof(value) + " != null"); + return (int)value == 0 ? "Collapsed" : "Visible"; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return null; + } + } +} \ No newline at end of file diff --git a/Correlator/Converter/EmptyViewConverter.cs b/Correlator/Converter/EmptyViewConverter.cs new file mode 100644 index 0000000..c931b64 --- /dev/null +++ b/Correlator/Converter/EmptyViewConverter.cs @@ -0,0 +1,21 @@ +using System; +using System.Diagnostics; +using System.Globalization; +using System.Windows.Data; + +namespace Correlator.Converter +{ + public class EmptyViewConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + Debug.Assert(value != null, nameof(value) + " != null"); + return (int)value == 0 ? "Visible" : "Collapsed"; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return null; + } + } +} \ No newline at end of file diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index d3fa780..0016e08 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,7 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ContentViewConverter.cs b/Correlator/Converter/ContentViewConverter.cs new file mode 100644 index 0000000..2fc63d4 --- /dev/null +++ b/Correlator/Converter/ContentViewConverter.cs @@ -0,0 +1,21 @@ +using System; +using System.Diagnostics; +using System.Globalization; +using System.Windows.Data; + +namespace Correlator.Converter +{ + public class ContentViewConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + Debug.Assert(value != null, nameof(value) + " != null"); + return (int)value == 0 ? "Collapsed" : "Visible"; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return null; + } + } +} \ No newline at end of file diff --git a/Correlator/Converter/EmptyViewConverter.cs b/Correlator/Converter/EmptyViewConverter.cs new file mode 100644 index 0000000..c931b64 --- /dev/null +++ b/Correlator/Converter/EmptyViewConverter.cs @@ -0,0 +1,21 @@ +using System; +using System.Diagnostics; +using System.Globalization; +using System.Windows.Data; + +namespace Correlator.Converter +{ + public class EmptyViewConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + Debug.Assert(value != null, nameof(value) + " != null"); + return (int)value == 0 ? "Visible" : "Collapsed"; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return null; + } + } +} \ No newline at end of file diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index bd73932..95c1918 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -208,19 +208,21 @@ Designer + + - + - + - + - + @@ -250,20 +252,21 @@ LoadingDialog.xaml - - PictureFileDialog.xaml + + ScreenImageFileDialog.xaml SoundSampleRateDialog.xaml - - + + - - - + + + + NoiseWaveView.xaml @@ -310,16 +313,15 @@ - + - + - @@ -330,22 +332,22 @@ - + Designer MSBuild:Compile - + Designer MSBuild:Compile - - - + + + Designer MSBuild:Compile @@ -475,6 +477,9 @@ false + + + diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index d3fa780..0016e08 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,7 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ContentViewConverter.cs b/Correlator/Converter/ContentViewConverter.cs new file mode 100644 index 0000000..2fc63d4 --- /dev/null +++ b/Correlator/Converter/ContentViewConverter.cs @@ -0,0 +1,21 @@ +using System; +using System.Diagnostics; +using System.Globalization; +using System.Windows.Data; + +namespace Correlator.Converter +{ + public class ContentViewConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + Debug.Assert(value != null, nameof(value) + " != null"); + return (int)value == 0 ? "Collapsed" : "Visible"; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return null; + } + } +} \ No newline at end of file diff --git a/Correlator/Converter/EmptyViewConverter.cs b/Correlator/Converter/EmptyViewConverter.cs new file mode 100644 index 0000000..c931b64 --- /dev/null +++ b/Correlator/Converter/EmptyViewConverter.cs @@ -0,0 +1,21 @@ +using System; +using System.Diagnostics; +using System.Globalization; +using System.Windows.Data; + +namespace Correlator.Converter +{ + public class EmptyViewConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + Debug.Assert(value != null, nameof(value) + " != null"); + return (int)value == 0 ? "Visible" : "Collapsed"; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return null; + } + } +} \ No newline at end of file diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index bd73932..95c1918 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -208,19 +208,21 @@ Designer + + - + - + - + - + @@ -250,20 +252,21 @@ LoadingDialog.xaml - - PictureFileDialog.xaml + + ScreenImageFileDialog.xaml SoundSampleRateDialog.xaml - - + + - - - + + + + NoiseWaveView.xaml @@ -310,16 +313,15 @@ - + - + - @@ -330,22 +332,22 @@ - + Designer MSBuild:Compile - + Designer MSBuild:Compile - - - + + + Designer MSBuild:Compile @@ -475,6 +477,9 @@ false + + + diff --git a/Correlator/Dialog/PictureFileDialog.xaml b/Correlator/Dialog/PictureFileDialog.xaml deleted file mode 100644 index c60abf1..0000000 --- a/Correlator/Dialog/PictureFileDialog.xaml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +