diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ChildFolderImageConverter.cs b/Correlator/Converter/ChildFolderImageConverter.cs deleted file mode 100644 index d120692..0000000 --- a/Correlator/Converter/ChildFolderImageConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media.Imaging; - -namespace Correlator.Converter -{ - public class ChildFolderImageConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - Debug.Assert(value != null, nameof(value) + " != null"); - if (value.Equals("Image")) - { - return new BitmapImage(new Uri(@"..\..\Image\image_folder.png", UriKind.Relative)); - } - - return new BitmapImage(new Uri(@"..\..\Image\audio_folder.png", UriKind.Relative)); - } - - 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 f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ChildFolderImageConverter.cs b/Correlator/Converter/ChildFolderImageConverter.cs deleted file mode 100644 index d120692..0000000 --- a/Correlator/Converter/ChildFolderImageConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media.Imaging; - -namespace Correlator.Converter -{ - public class ChildFolderImageConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - Debug.Assert(value != null, nameof(value) + " != null"); - if (value.Equals("Image")) - { - return new BitmapImage(new Uri(@"..\..\Image\image_folder.png", UriKind.Relative)); - } - - return new BitmapImage(new Uri(@"..\..\Image\audio_folder.png", UriKind.Relative)); - } - - 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 0543852..d642b63 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -189,23 +189,22 @@ Designer - - - + + - + - - + + - + - + @@ -223,9 +222,6 @@ CheckResponseDialog.xaml - - ImageChildFolderDialog.xaml - DetectNoiseDialog.xaml @@ -235,30 +231,29 @@ EditSoundSpeedDialog.xaml + + ImageFileExplorerDialog.xaml + ImportHydrophoneDataDialog.xaml LoadingDialog.xaml - - ScreenImageFileDialog.xaml - SoundSampleRateDialog.xaml - - - + + + - - - - - - + + + + + NoiseWaveView.xaml @@ -305,13 +300,13 @@ - + - + @@ -324,24 +319,23 @@ - - + + Designer MSBuild:Compile - - + + Designer MSBuild:Compile - - - + + Designer MSBuild:Compile @@ -472,11 +466,7 @@ - - - - - + diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ChildFolderImageConverter.cs b/Correlator/Converter/ChildFolderImageConverter.cs deleted file mode 100644 index d120692..0000000 --- a/Correlator/Converter/ChildFolderImageConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media.Imaging; - -namespace Correlator.Converter -{ - public class ChildFolderImageConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - Debug.Assert(value != null, nameof(value) + " != null"); - if (value.Equals("Image")) - { - return new BitmapImage(new Uri(@"..\..\Image\image_folder.png", UriKind.Relative)); - } - - return new BitmapImage(new Uri(@"..\..\Image\audio_folder.png", UriKind.Relative)); - } - - 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 0543852..d642b63 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -189,23 +189,22 @@ Designer - - - + + - + - - + + - + - + @@ -223,9 +222,6 @@ CheckResponseDialog.xaml - - ImageChildFolderDialog.xaml - DetectNoiseDialog.xaml @@ -235,30 +231,29 @@ EditSoundSpeedDialog.xaml + + ImageFileExplorerDialog.xaml + ImportHydrophoneDataDialog.xaml LoadingDialog.xaml - - ScreenImageFileDialog.xaml - SoundSampleRateDialog.xaml - - - + + + - - - - - - + + + + + NoiseWaveView.xaml @@ -305,13 +300,13 @@ - + - + @@ -324,24 +319,23 @@ - - + + Designer MSBuild:Compile - - + + Designer MSBuild:Compile - - - + + Designer MSBuild:Compile @@ -472,11 +466,7 @@ - - - - - + diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml b/Correlator/Dialog/ImageChildFolderDialog.xaml deleted file mode 100644 index 13f71c1..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ChildFolderImageConverter.cs b/Correlator/Converter/ChildFolderImageConverter.cs deleted file mode 100644 index d120692..0000000 --- a/Correlator/Converter/ChildFolderImageConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media.Imaging; - -namespace Correlator.Converter -{ - public class ChildFolderImageConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - Debug.Assert(value != null, nameof(value) + " != null"); - if (value.Equals("Image")) - { - return new BitmapImage(new Uri(@"..\..\Image\image_folder.png", UriKind.Relative)); - } - - return new BitmapImage(new Uri(@"..\..\Image\audio_folder.png", UriKind.Relative)); - } - - 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 0543852..d642b63 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -189,23 +189,22 @@ Designer - - - + + - + - - + + - + - + @@ -223,9 +222,6 @@ CheckResponseDialog.xaml - - ImageChildFolderDialog.xaml - DetectNoiseDialog.xaml @@ -235,30 +231,29 @@ EditSoundSpeedDialog.xaml + + ImageFileExplorerDialog.xaml + ImportHydrophoneDataDialog.xaml LoadingDialog.xaml - - ScreenImageFileDialog.xaml - SoundSampleRateDialog.xaml - - - + + + - - - - - - + + + + + NoiseWaveView.xaml @@ -305,13 +300,13 @@ - + - + @@ -324,24 +319,23 @@ - - + + Designer MSBuild:Compile - - + + Designer MSBuild:Compile - - - + + Designer MSBuild:Compile @@ -472,11 +466,7 @@ - - - - - + diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml b/Correlator/Dialog/ImageChildFolderDialog.xaml deleted file mode 100644 index 13f71c1..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs b/Correlator/Dialog/ImageChildFolderDialog.xaml.cs deleted file mode 100644 index a6a4f6f..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ImageChildFolderDialog : UserControl - { - public ImageChildFolderDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ChildFolderImageConverter.cs b/Correlator/Converter/ChildFolderImageConverter.cs deleted file mode 100644 index d120692..0000000 --- a/Correlator/Converter/ChildFolderImageConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media.Imaging; - -namespace Correlator.Converter -{ - public class ChildFolderImageConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - Debug.Assert(value != null, nameof(value) + " != null"); - if (value.Equals("Image")) - { - return new BitmapImage(new Uri(@"..\..\Image\image_folder.png", UriKind.Relative)); - } - - return new BitmapImage(new Uri(@"..\..\Image\audio_folder.png", UriKind.Relative)); - } - - 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 0543852..d642b63 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -189,23 +189,22 @@ Designer - - - + + - + - - + + - + - + @@ -223,9 +222,6 @@ CheckResponseDialog.xaml - - ImageChildFolderDialog.xaml - DetectNoiseDialog.xaml @@ -235,30 +231,29 @@ EditSoundSpeedDialog.xaml + + ImageFileExplorerDialog.xaml + ImportHydrophoneDataDialog.xaml LoadingDialog.xaml - - ScreenImageFileDialog.xaml - SoundSampleRateDialog.xaml - - - + + + - - - - - - + + + + + NoiseWaveView.xaml @@ -305,13 +300,13 @@ - + - + @@ -324,24 +319,23 @@ - - + + Designer MSBuild:Compile - - + + Designer MSBuild:Compile - - - + + Designer MSBuild:Compile @@ -472,11 +466,7 @@ - - - - - + diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml b/Correlator/Dialog/ImageChildFolderDialog.xaml deleted file mode 100644 index 13f71c1..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs b/Correlator/Dialog/ImageChildFolderDialog.xaml.cs deleted file mode 100644 index a6a4f6f..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ImageChildFolderDialog : UserControl - { - public ImageChildFolderDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml b/Correlator/Dialog/ImageFileExplorerDialog.xaml new file mode 100644 index 0000000..dca424e --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ChildFolderImageConverter.cs b/Correlator/Converter/ChildFolderImageConverter.cs deleted file mode 100644 index d120692..0000000 --- a/Correlator/Converter/ChildFolderImageConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media.Imaging; - -namespace Correlator.Converter -{ - public class ChildFolderImageConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - Debug.Assert(value != null, nameof(value) + " != null"); - if (value.Equals("Image")) - { - return new BitmapImage(new Uri(@"..\..\Image\image_folder.png", UriKind.Relative)); - } - - return new BitmapImage(new Uri(@"..\..\Image\audio_folder.png", UriKind.Relative)); - } - - 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 0543852..d642b63 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -189,23 +189,22 @@ Designer - - - + + - + - - + + - + - + @@ -223,9 +222,6 @@ CheckResponseDialog.xaml - - ImageChildFolderDialog.xaml - DetectNoiseDialog.xaml @@ -235,30 +231,29 @@ EditSoundSpeedDialog.xaml + + ImageFileExplorerDialog.xaml + ImportHydrophoneDataDialog.xaml LoadingDialog.xaml - - ScreenImageFileDialog.xaml - SoundSampleRateDialog.xaml - - - + + + - - - - - - + + + + + NoiseWaveView.xaml @@ -305,13 +300,13 @@ - + - + @@ -324,24 +319,23 @@ - - + + Designer MSBuild:Compile - - + + Designer MSBuild:Compile - - - + + Designer MSBuild:Compile @@ -472,11 +466,7 @@ - - - - - + diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml b/Correlator/Dialog/ImageChildFolderDialog.xaml deleted file mode 100644 index 13f71c1..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs b/Correlator/Dialog/ImageChildFolderDialog.xaml.cs deleted file mode 100644 index a6a4f6f..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ImageChildFolderDialog : UserControl - { - public ImageChildFolderDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml b/Correlator/Dialog/ImageFileExplorerDialog.xaml new file mode 100644 index 0000000..dca424e --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs new file mode 100644 index 0000000..dc51b0b --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace Correlator.Dialog +{ + public partial class ImageFileExplorerDialog : UserControl + { + public ImageFileExplorerDialog() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ChildFolderImageConverter.cs b/Correlator/Converter/ChildFolderImageConverter.cs deleted file mode 100644 index d120692..0000000 --- a/Correlator/Converter/ChildFolderImageConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media.Imaging; - -namespace Correlator.Converter -{ - public class ChildFolderImageConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - Debug.Assert(value != null, nameof(value) + " != null"); - if (value.Equals("Image")) - { - return new BitmapImage(new Uri(@"..\..\Image\image_folder.png", UriKind.Relative)); - } - - return new BitmapImage(new Uri(@"..\..\Image\audio_folder.png", UriKind.Relative)); - } - - 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 0543852..d642b63 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -189,23 +189,22 @@ Designer - - - + + - + - - + + - + - + @@ -223,9 +222,6 @@ CheckResponseDialog.xaml - - ImageChildFolderDialog.xaml - DetectNoiseDialog.xaml @@ -235,30 +231,29 @@ EditSoundSpeedDialog.xaml + + ImageFileExplorerDialog.xaml + ImportHydrophoneDataDialog.xaml LoadingDialog.xaml - - ScreenImageFileDialog.xaml - SoundSampleRateDialog.xaml - - - + + + - - - - - - + + + + + NoiseWaveView.xaml @@ -305,13 +300,13 @@ - + - + @@ -324,24 +319,23 @@ - - + + Designer MSBuild:Compile - - + + Designer MSBuild:Compile - - - + + Designer MSBuild:Compile @@ -472,11 +466,7 @@ - - - - - + diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml b/Correlator/Dialog/ImageChildFolderDialog.xaml deleted file mode 100644 index 13f71c1..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs b/Correlator/Dialog/ImageChildFolderDialog.xaml.cs deleted file mode 100644 index a6a4f6f..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ImageChildFolderDialog : UserControl - { - public ImageChildFolderDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml b/Correlator/Dialog/ImageFileExplorerDialog.xaml new file mode 100644 index 0000000..dca424e --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs new file mode 100644 index 0000000..dc51b0b --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace Correlator.Dialog +{ + public partial class ImageFileExplorerDialog : UserControl + { + public ImageFileExplorerDialog() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml b/Correlator/Dialog/ScreenImageFileDialog.xaml deleted file mode 100644 index 3ecbd7e..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ChildFolderImageConverter.cs b/Correlator/Converter/ChildFolderImageConverter.cs deleted file mode 100644 index d120692..0000000 --- a/Correlator/Converter/ChildFolderImageConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media.Imaging; - -namespace Correlator.Converter -{ - public class ChildFolderImageConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - Debug.Assert(value != null, nameof(value) + " != null"); - if (value.Equals("Image")) - { - return new BitmapImage(new Uri(@"..\..\Image\image_folder.png", UriKind.Relative)); - } - - return new BitmapImage(new Uri(@"..\..\Image\audio_folder.png", UriKind.Relative)); - } - - 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 0543852..d642b63 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -189,23 +189,22 @@ Designer - - - + + - + - - + + - + - + @@ -223,9 +222,6 @@ CheckResponseDialog.xaml - - ImageChildFolderDialog.xaml - DetectNoiseDialog.xaml @@ -235,30 +231,29 @@ EditSoundSpeedDialog.xaml + + ImageFileExplorerDialog.xaml + ImportHydrophoneDataDialog.xaml LoadingDialog.xaml - - ScreenImageFileDialog.xaml - SoundSampleRateDialog.xaml - - - + + + - - - - - - + + + + + NoiseWaveView.xaml @@ -305,13 +300,13 @@ - + - + @@ -324,24 +319,23 @@ - - + + Designer MSBuild:Compile - - + + Designer MSBuild:Compile - - - + + Designer MSBuild:Compile @@ -472,11 +466,7 @@ - - - - - + diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml b/Correlator/Dialog/ImageChildFolderDialog.xaml deleted file mode 100644 index 13f71c1..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs b/Correlator/Dialog/ImageChildFolderDialog.xaml.cs deleted file mode 100644 index a6a4f6f..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ImageChildFolderDialog : UserControl - { - public ImageChildFolderDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml b/Correlator/Dialog/ImageFileExplorerDialog.xaml new file mode 100644 index 0000000..dca424e --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs new file mode 100644 index 0000000..dc51b0b --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace Correlator.Dialog +{ + public partial class ImageFileExplorerDialog : UserControl + { + public ImageFileExplorerDialog() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml b/Correlator/Dialog/ScreenImageFileDialog.xaml deleted file mode 100644 index 3ecbd7e..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs b/Correlator/Dialog/ScreenImageFileDialog.xaml.cs deleted file mode 100644 index fcde978..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ScreenImageFileDialog : UserControl - { - public ScreenImageFileDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ChildFolderImageConverter.cs b/Correlator/Converter/ChildFolderImageConverter.cs deleted file mode 100644 index d120692..0000000 --- a/Correlator/Converter/ChildFolderImageConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media.Imaging; - -namespace Correlator.Converter -{ - public class ChildFolderImageConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - Debug.Assert(value != null, nameof(value) + " != null"); - if (value.Equals("Image")) - { - return new BitmapImage(new Uri(@"..\..\Image\image_folder.png", UriKind.Relative)); - } - - return new BitmapImage(new Uri(@"..\..\Image\audio_folder.png", UriKind.Relative)); - } - - 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 0543852..d642b63 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -189,23 +189,22 @@ Designer - - - + + - + - - + + - + - + @@ -223,9 +222,6 @@ CheckResponseDialog.xaml - - ImageChildFolderDialog.xaml - DetectNoiseDialog.xaml @@ -235,30 +231,29 @@ EditSoundSpeedDialog.xaml + + ImageFileExplorerDialog.xaml + ImportHydrophoneDataDialog.xaml LoadingDialog.xaml - - ScreenImageFileDialog.xaml - SoundSampleRateDialog.xaml - - - + + + - - - - - - + + + + + NoiseWaveView.xaml @@ -305,13 +300,13 @@ - + - + @@ -324,24 +319,23 @@ - - + + Designer MSBuild:Compile - - + + Designer MSBuild:Compile - - - + + Designer MSBuild:Compile @@ -472,11 +466,7 @@ - - - - - + diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml b/Correlator/Dialog/ImageChildFolderDialog.xaml deleted file mode 100644 index 13f71c1..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs b/Correlator/Dialog/ImageChildFolderDialog.xaml.cs deleted file mode 100644 index a6a4f6f..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ImageChildFolderDialog : UserControl - { - public ImageChildFolderDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml b/Correlator/Dialog/ImageFileExplorerDialog.xaml new file mode 100644 index 0000000..dca424e --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs new file mode 100644 index 0000000..dc51b0b --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace Correlator.Dialog +{ + public partial class ImageFileExplorerDialog : UserControl + { + public ImageFileExplorerDialog() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml b/Correlator/Dialog/ScreenImageFileDialog.xaml deleted file mode 100644 index 3ecbd7e..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs b/Correlator/Dialog/ScreenImageFileDialog.xaml.cs deleted file mode 100644 index fcde978..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ScreenImageFileDialog : UserControl - { - public ScreenImageFileDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Fonts/iconfont.ttf b/Correlator/Fonts/iconfont.ttf index 9dce096..cf325e6 100644 --- a/Correlator/Fonts/iconfont.ttf +++ b/Correlator/Fonts/iconfont.ttf Binary files differ diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ChildFolderImageConverter.cs b/Correlator/Converter/ChildFolderImageConverter.cs deleted file mode 100644 index d120692..0000000 --- a/Correlator/Converter/ChildFolderImageConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media.Imaging; - -namespace Correlator.Converter -{ - public class ChildFolderImageConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - Debug.Assert(value != null, nameof(value) + " != null"); - if (value.Equals("Image")) - { - return new BitmapImage(new Uri(@"..\..\Image\image_folder.png", UriKind.Relative)); - } - - return new BitmapImage(new Uri(@"..\..\Image\audio_folder.png", UriKind.Relative)); - } - - 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 0543852..d642b63 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -189,23 +189,22 @@ Designer - - - + + - + - - + + - + - + @@ -223,9 +222,6 @@ CheckResponseDialog.xaml - - ImageChildFolderDialog.xaml - DetectNoiseDialog.xaml @@ -235,30 +231,29 @@ EditSoundSpeedDialog.xaml + + ImageFileExplorerDialog.xaml + ImportHydrophoneDataDialog.xaml LoadingDialog.xaml - - ScreenImageFileDialog.xaml - SoundSampleRateDialog.xaml - - - + + + - - - - - - + + + + + NoiseWaveView.xaml @@ -305,13 +300,13 @@ - + - + @@ -324,24 +319,23 @@ - - + + Designer MSBuild:Compile - - + + Designer MSBuild:Compile - - - + + Designer MSBuild:Compile @@ -472,11 +466,7 @@ - - - - - + diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml b/Correlator/Dialog/ImageChildFolderDialog.xaml deleted file mode 100644 index 13f71c1..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs b/Correlator/Dialog/ImageChildFolderDialog.xaml.cs deleted file mode 100644 index a6a4f6f..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ImageChildFolderDialog : UserControl - { - public ImageChildFolderDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml b/Correlator/Dialog/ImageFileExplorerDialog.xaml new file mode 100644 index 0000000..dca424e --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs new file mode 100644 index 0000000..dc51b0b --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace Correlator.Dialog +{ + public partial class ImageFileExplorerDialog : UserControl + { + public ImageFileExplorerDialog() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml b/Correlator/Dialog/ScreenImageFileDialog.xaml deleted file mode 100644 index 3ecbd7e..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs b/Correlator/Dialog/ScreenImageFileDialog.xaml.cs deleted file mode 100644 index fcde978..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ScreenImageFileDialog : UserControl - { - public ScreenImageFileDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Fonts/iconfont.ttf b/Correlator/Fonts/iconfont.ttf index 9dce096..cf325e6 100644 --- a/Correlator/Fonts/iconfont.ttf +++ b/Correlator/Fonts/iconfont.ttf Binary files differ diff --git a/Correlator/Image/audio_folder.png b/Correlator/Image/audio_folder.png deleted file mode 100644 index e238213..0000000 --- a/Correlator/Image/audio_folder.png +++ /dev/null Binary files differ diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ChildFolderImageConverter.cs b/Correlator/Converter/ChildFolderImageConverter.cs deleted file mode 100644 index d120692..0000000 --- a/Correlator/Converter/ChildFolderImageConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media.Imaging; - -namespace Correlator.Converter -{ - public class ChildFolderImageConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - Debug.Assert(value != null, nameof(value) + " != null"); - if (value.Equals("Image")) - { - return new BitmapImage(new Uri(@"..\..\Image\image_folder.png", UriKind.Relative)); - } - - return new BitmapImage(new Uri(@"..\..\Image\audio_folder.png", UriKind.Relative)); - } - - 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 0543852..d642b63 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -189,23 +189,22 @@ Designer - - - + + - + - - + + - + - + @@ -223,9 +222,6 @@ CheckResponseDialog.xaml - - ImageChildFolderDialog.xaml - DetectNoiseDialog.xaml @@ -235,30 +231,29 @@ EditSoundSpeedDialog.xaml + + ImageFileExplorerDialog.xaml + ImportHydrophoneDataDialog.xaml LoadingDialog.xaml - - ScreenImageFileDialog.xaml - SoundSampleRateDialog.xaml - - - + + + - - - - - - + + + + + NoiseWaveView.xaml @@ -305,13 +300,13 @@ - + - + @@ -324,24 +319,23 @@ - - + + Designer MSBuild:Compile - - + + Designer MSBuild:Compile - - - + + Designer MSBuild:Compile @@ -472,11 +466,7 @@ - - - - - + diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml b/Correlator/Dialog/ImageChildFolderDialog.xaml deleted file mode 100644 index 13f71c1..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs b/Correlator/Dialog/ImageChildFolderDialog.xaml.cs deleted file mode 100644 index a6a4f6f..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ImageChildFolderDialog : UserControl - { - public ImageChildFolderDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml b/Correlator/Dialog/ImageFileExplorerDialog.xaml new file mode 100644 index 0000000..dca424e --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs new file mode 100644 index 0000000..dc51b0b --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace Correlator.Dialog +{ + public partial class ImageFileExplorerDialog : UserControl + { + public ImageFileExplorerDialog() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml b/Correlator/Dialog/ScreenImageFileDialog.xaml deleted file mode 100644 index 3ecbd7e..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs b/Correlator/Dialog/ScreenImageFileDialog.xaml.cs deleted file mode 100644 index fcde978..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ScreenImageFileDialog : UserControl - { - public ScreenImageFileDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Fonts/iconfont.ttf b/Correlator/Fonts/iconfont.ttf index 9dce096..cf325e6 100644 --- a/Correlator/Fonts/iconfont.ttf +++ b/Correlator/Fonts/iconfont.ttf Binary files differ diff --git a/Correlator/Image/audio_folder.png b/Correlator/Image/audio_folder.png deleted file mode 100644 index e238213..0000000 --- a/Correlator/Image/audio_folder.png +++ /dev/null Binary files differ diff --git a/Correlator/Image/image_folder.png b/Correlator/Image/image_folder.png deleted file mode 100644 index 7f22657..0000000 --- a/Correlator/Image/image_folder.png +++ /dev/null Binary files differ diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ChildFolderImageConverter.cs b/Correlator/Converter/ChildFolderImageConverter.cs deleted file mode 100644 index d120692..0000000 --- a/Correlator/Converter/ChildFolderImageConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media.Imaging; - -namespace Correlator.Converter -{ - public class ChildFolderImageConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - Debug.Assert(value != null, nameof(value) + " != null"); - if (value.Equals("Image")) - { - return new BitmapImage(new Uri(@"..\..\Image\image_folder.png", UriKind.Relative)); - } - - return new BitmapImage(new Uri(@"..\..\Image\audio_folder.png", UriKind.Relative)); - } - - 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 0543852..d642b63 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -189,23 +189,22 @@ Designer - - - + + - + - - + + - + - + @@ -223,9 +222,6 @@ CheckResponseDialog.xaml - - ImageChildFolderDialog.xaml - DetectNoiseDialog.xaml @@ -235,30 +231,29 @@ EditSoundSpeedDialog.xaml + + ImageFileExplorerDialog.xaml + ImportHydrophoneDataDialog.xaml LoadingDialog.xaml - - ScreenImageFileDialog.xaml - SoundSampleRateDialog.xaml - - - + + + - - - - - - + + + + + NoiseWaveView.xaml @@ -305,13 +300,13 @@ - + - + @@ -324,24 +319,23 @@ - - + + Designer MSBuild:Compile - - + + Designer MSBuild:Compile - - - + + Designer MSBuild:Compile @@ -472,11 +466,7 @@ - - - - - + diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml b/Correlator/Dialog/ImageChildFolderDialog.xaml deleted file mode 100644 index 13f71c1..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs b/Correlator/Dialog/ImageChildFolderDialog.xaml.cs deleted file mode 100644 index a6a4f6f..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ImageChildFolderDialog : UserControl - { - public ImageChildFolderDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml b/Correlator/Dialog/ImageFileExplorerDialog.xaml new file mode 100644 index 0000000..dca424e --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs new file mode 100644 index 0000000..dc51b0b --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace Correlator.Dialog +{ + public partial class ImageFileExplorerDialog : UserControl + { + public ImageFileExplorerDialog() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml b/Correlator/Dialog/ScreenImageFileDialog.xaml deleted file mode 100644 index 3ecbd7e..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs b/Correlator/Dialog/ScreenImageFileDialog.xaml.cs deleted file mode 100644 index fcde978..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ScreenImageFileDialog : UserControl - { - public ScreenImageFileDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Fonts/iconfont.ttf b/Correlator/Fonts/iconfont.ttf index 9dce096..cf325e6 100644 --- a/Correlator/Fonts/iconfont.ttf +++ b/Correlator/Fonts/iconfont.ttf Binary files differ diff --git a/Correlator/Image/audio_folder.png b/Correlator/Image/audio_folder.png deleted file mode 100644 index e238213..0000000 --- a/Correlator/Image/audio_folder.png +++ /dev/null Binary files differ diff --git a/Correlator/Image/image_folder.png b/Correlator/Image/image_folder.png deleted file mode 100644 index 7f22657..0000000 --- a/Correlator/Image/image_folder.png +++ /dev/null Binary files differ diff --git a/Correlator/ViewModels/ImageChildFolderViewModel.cs b/Correlator/ViewModels/ImageChildFolderViewModel.cs deleted file mode 100644 index 4a823eb..0000000 --- a/Correlator/ViewModels/ImageChildFolderViewModel.cs +++ /dev/null @@ -1,185 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using System.Windows; -using Correlator.Model; -using Correlator.Util; -using HandyControl.Data; -using Prism.Commands; -using Prism.Mvvm; -using Prism.Services.Dialogs; - -namespace Correlator.ViewModels -{ - public class ImageChildFolderViewModel : BindableBase, IDialogAware - { - #region 属性绑定 - - public string Title => "快照文件夹列表"; - - public event Action RequestClose - { - add { } - remove { } - } - - private ObservableCollection _childFolders; - - public ObservableCollection ChildFolders - { - get => _childFolders; - set - { - _childFolders = value; - RaisePropertyChanged(); - } - } - - private ChildFolderModel _selectedFolder; - - public ChildFolderModel SelectedFolder - { - get => _selectedFolder; - set - { - _selectedFolder = value; - RaisePropertyChanged(); - } - } - - private int _maxPage; - - public int MaxPage - { - get => _maxPage; - set - { - _maxPage = value; - RaisePropertyChanged(); - } - } - - private bool _taskHasCompleted; - - public bool TaskHasCompleted - { - get => _taskHasCompleted; - set - { - _taskHasCompleted = value; - RaisePropertyChanged(); - } - } - - #endregion - - #region DelegateCommand - - public DelegateCommand ItemSelectedCommand { get; set; } - public DelegateCommand MouseDoubleClickCommand { get; set; } - public DelegateCommand> PageUpdatedCmd { get; set; } - - #endregion - - private readonly IDialogService _dialogService; - private List _totalFolders; - - /// - /// 截屏文件夹九宫格每页条目数 - /// - private const int PerGridItemCount = 55; - - public ImageChildFolderViewModel(IDialogService dialogService) - { - _dialogService = dialogService; - - ItemSelectedCommand = new DelegateCommand(ItemSelected); - MouseDoubleClickCommand = new DelegateCommand(ShowChildFolderPicture); - PageUpdatedCmd = new DelegateCommand>(PageUpdated); - } - - private void ItemSelected(ChildFolderModel selectedItem) - { - SelectedFolder = selectedItem; - } - - private void ShowChildFolderPicture(ChildFolderModel childFolder) - { - if (childFolder == null) - { - MessageBox.Show("文件夹路径错误，无法查看", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); - return; - } - - _dialogService.ShowDialog("ScreenImageFileDialog", new DialogParameters - { - { "ChildFolderFullPath", childFolder.FullPath } - }, delegate { }); - } - - private void PageUpdated(FunctionEventArgs args) - { - var childFolders = _totalFolders - .Skip((args.Info - 1) * PerGridItemCount) - .Take(PerGridItemCount) - .ToList(); - ChildFolders = childFolders.ToObservableCollection(); - } - - public bool CanCloseDialog() - { - return true; - } - - public void OnDialogClosed() - { - } - - public async void OnDialogOpened(IDialogParameters parameters) - { - _totalFolders = await GetTotalChildFoldersAsync(); - MaxPage = (_totalFolders.Count + PerGridItemCount - 1) / PerGridItemCount; - ChildFolders = _totalFolders.Take(PerGridItemCount).ToList().ToObservableCollection(); - } - - /// - /// 异步遍历文件夹，防止卡主线程 - /// - /// - private async Task> GetTotalChildFoldersAsync() - { - var childFolders = new List(); - - await Task.Run(() => TraverseFolder(DirectoryManager.GetPictureDir(), childFolders)); - TaskHasCompleted = true; - return childFolders.OrderBy(folder => folder.CreationTime).Reverse().ToList(); - } - - /// - /// 遍历文件夹并生成相应的数据类型集合 - /// - /// - /// - private static void TraverseFolder(string folderPath, List childFolders) - { - var directories = new DirectoryInfo(folderPath).GetDirectories(); - foreach (var dic in directories) - { - var childFolderFullPath = dic.FullName; - var childFolder = new ChildFolderModel - { - FolderType = "Image", - FolderName = dic.Name, - FullPath = childFolderFullPath, - CreationTime = dic.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), - ChildFileCount = new DirectoryInfo(childFolderFullPath).GetFiles().Length.ToString() - }; - - childFolders.Add(childFolder); - } - } - } -} \ No newline at end of file diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ChildFolderImageConverter.cs b/Correlator/Converter/ChildFolderImageConverter.cs deleted file mode 100644 index d120692..0000000 --- a/Correlator/Converter/ChildFolderImageConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media.Imaging; - -namespace Correlator.Converter -{ - public class ChildFolderImageConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - Debug.Assert(value != null, nameof(value) + " != null"); - if (value.Equals("Image")) - { - return new BitmapImage(new Uri(@"..\..\Image\image_folder.png", UriKind.Relative)); - } - - return new BitmapImage(new Uri(@"..\..\Image\audio_folder.png", UriKind.Relative)); - } - - 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 0543852..d642b63 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -189,23 +189,22 @@ Designer - - - + + - + - - + + - + - + @@ -223,9 +222,6 @@ CheckResponseDialog.xaml - - ImageChildFolderDialog.xaml - DetectNoiseDialog.xaml @@ -235,30 +231,29 @@ EditSoundSpeedDialog.xaml + + ImageFileExplorerDialog.xaml + ImportHydrophoneDataDialog.xaml LoadingDialog.xaml - - ScreenImageFileDialog.xaml - SoundSampleRateDialog.xaml - - - + + + - - - - - - + + + + + NoiseWaveView.xaml @@ -305,13 +300,13 @@ - + - + @@ -324,24 +319,23 @@ - - + + Designer MSBuild:Compile - - + + Designer MSBuild:Compile - - - + + Designer MSBuild:Compile @@ -472,11 +466,7 @@ - - - - - + diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml b/Correlator/Dialog/ImageChildFolderDialog.xaml deleted file mode 100644 index 13f71c1..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs b/Correlator/Dialog/ImageChildFolderDialog.xaml.cs deleted file mode 100644 index a6a4f6f..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ImageChildFolderDialog : UserControl - { - public ImageChildFolderDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml b/Correlator/Dialog/ImageFileExplorerDialog.xaml new file mode 100644 index 0000000..dca424e --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs new file mode 100644 index 0000000..dc51b0b --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace Correlator.Dialog +{ + public partial class ImageFileExplorerDialog : UserControl + { + public ImageFileExplorerDialog() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml b/Correlator/Dialog/ScreenImageFileDialog.xaml deleted file mode 100644 index 3ecbd7e..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs b/Correlator/Dialog/ScreenImageFileDialog.xaml.cs deleted file mode 100644 index fcde978..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ScreenImageFileDialog : UserControl - { - public ScreenImageFileDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Fonts/iconfont.ttf b/Correlator/Fonts/iconfont.ttf index 9dce096..cf325e6 100644 --- a/Correlator/Fonts/iconfont.ttf +++ b/Correlator/Fonts/iconfont.ttf Binary files differ diff --git a/Correlator/Image/audio_folder.png b/Correlator/Image/audio_folder.png deleted file mode 100644 index e238213..0000000 --- a/Correlator/Image/audio_folder.png +++ /dev/null Binary files differ diff --git a/Correlator/Image/image_folder.png b/Correlator/Image/image_folder.png deleted file mode 100644 index 7f22657..0000000 --- a/Correlator/Image/image_folder.png +++ /dev/null Binary files differ diff --git a/Correlator/ViewModels/ImageChildFolderViewModel.cs b/Correlator/ViewModels/ImageChildFolderViewModel.cs deleted file mode 100644 index 4a823eb..0000000 --- a/Correlator/ViewModels/ImageChildFolderViewModel.cs +++ /dev/null @@ -1,185 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using System.Windows; -using Correlator.Model; -using Correlator.Util; -using HandyControl.Data; -using Prism.Commands; -using Prism.Mvvm; -using Prism.Services.Dialogs; - -namespace Correlator.ViewModels -{ - public class ImageChildFolderViewModel : BindableBase, IDialogAware - { - #region 属性绑定 - - public string Title => "快照文件夹列表"; - - public event Action RequestClose - { - add { } - remove { } - } - - private ObservableCollection _childFolders; - - public ObservableCollection ChildFolders - { - get => _childFolders; - set - { - _childFolders = value; - RaisePropertyChanged(); - } - } - - private ChildFolderModel _selectedFolder; - - public ChildFolderModel SelectedFolder - { - get => _selectedFolder; - set - { - _selectedFolder = value; - RaisePropertyChanged(); - } - } - - private int _maxPage; - - public int MaxPage - { - get => _maxPage; - set - { - _maxPage = value; - RaisePropertyChanged(); - } - } - - private bool _taskHasCompleted; - - public bool TaskHasCompleted - { - get => _taskHasCompleted; - set - { - _taskHasCompleted = value; - RaisePropertyChanged(); - } - } - - #endregion - - #region DelegateCommand - - public DelegateCommand ItemSelectedCommand { get; set; } - public DelegateCommand MouseDoubleClickCommand { get; set; } - public DelegateCommand> PageUpdatedCmd { get; set; } - - #endregion - - private readonly IDialogService _dialogService; - private List _totalFolders; - - /// - /// 截屏文件夹九宫格每页条目数 - /// - private const int PerGridItemCount = 55; - - public ImageChildFolderViewModel(IDialogService dialogService) - { - _dialogService = dialogService; - - ItemSelectedCommand = new DelegateCommand(ItemSelected); - MouseDoubleClickCommand = new DelegateCommand(ShowChildFolderPicture); - PageUpdatedCmd = new DelegateCommand>(PageUpdated); - } - - private void ItemSelected(ChildFolderModel selectedItem) - { - SelectedFolder = selectedItem; - } - - private void ShowChildFolderPicture(ChildFolderModel childFolder) - { - if (childFolder == null) - { - MessageBox.Show("文件夹路径错误，无法查看", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); - return; - } - - _dialogService.ShowDialog("ScreenImageFileDialog", new DialogParameters - { - { "ChildFolderFullPath", childFolder.FullPath } - }, delegate { }); - } - - private void PageUpdated(FunctionEventArgs args) - { - var childFolders = _totalFolders - .Skip((args.Info - 1) * PerGridItemCount) - .Take(PerGridItemCount) - .ToList(); - ChildFolders = childFolders.ToObservableCollection(); - } - - public bool CanCloseDialog() - { - return true; - } - - public void OnDialogClosed() - { - } - - public async void OnDialogOpened(IDialogParameters parameters) - { - _totalFolders = await GetTotalChildFoldersAsync(); - MaxPage = (_totalFolders.Count + PerGridItemCount - 1) / PerGridItemCount; - ChildFolders = _totalFolders.Take(PerGridItemCount).ToList().ToObservableCollection(); - } - - /// - /// 异步遍历文件夹，防止卡主线程 - /// - /// - private async Task> GetTotalChildFoldersAsync() - { - var childFolders = new List(); - - await Task.Run(() => TraverseFolder(DirectoryManager.GetPictureDir(), childFolders)); - TaskHasCompleted = true; - return childFolders.OrderBy(folder => folder.CreationTime).Reverse().ToList(); - } - - /// - /// 遍历文件夹并生成相应的数据类型集合 - /// - /// - /// - private static void TraverseFolder(string folderPath, List childFolders) - { - var directories = new DirectoryInfo(folderPath).GetDirectories(); - foreach (var dic in directories) - { - var childFolderFullPath = dic.FullName; - var childFolder = new ChildFolderModel - { - FolderType = "Image", - FolderName = dic.Name, - FullPath = childFolderFullPath, - CreationTime = dic.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), - ChildFileCount = new DirectoryInfo(childFolderFullPath).GetFiles().Length.ToString() - }; - - childFolders.Add(childFolder); - } - } - } -} \ No newline at end of file diff --git a/Correlator/ViewModels/ImageFileExplorerDialogViewModel.cs b/Correlator/ViewModels/ImageFileExplorerDialogViewModel.cs new file mode 100644 index 0000000..52bf064 --- /dev/null +++ b/Correlator/ViewModels/ImageFileExplorerDialogViewModel.cs @@ -0,0 +1,251 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; +using Correlator.Model; +using Correlator.Util; +using HandyControl.Data; +using Prism.Commands; +using Prism.Mvvm; +using Prism.Services.Dialogs; + +namespace Correlator.ViewModels +{ + public class ImageFileExplorerDialogViewModel : BindableBase, IDialogAware + { + #region 属性绑定 + + public string Title => "快照文件资源管理器"; + + public event Action RequestClose + { + add { } + remove { } + } + + private ObservableCollection _childFolders; + + public ObservableCollection ChildFolders + { + get => _childFolders; + set + { + _childFolders = value; + RaisePropertyChanged(); + } + } + + private ChildFolderModel _selectedFolder; + + public ChildFolderModel SelectedFolder + { + get => _selectedFolder; + set + { + _selectedFolder = value; + RaisePropertyChanged(); + } + } + + private int _maxPage; + + public int MaxPage + { + get => _maxPage; + set + { + _maxPage = value; + RaisePropertyChanged(); + } + } + + private bool _taskHasCompleted; + + public bool TaskHasCompleted + { + get => _taskHasCompleted; + set + { + _taskHasCompleted = value; + RaisePropertyChanged(); + } + } + + private ObservableCollection _pictureFiles; + + public ObservableCollection PictureFiles + { + get => _pictureFiles; + set + { + _pictureFiles = value; + RaisePropertyChanged(); + } + } + + #endregion + + #region DelegateCommand + + public DelegateCommand ItemSelectedCommand { get; set; } + public DelegateCommand MouseDoubleClickCommand { get; set; } + public DelegateCommand> PageUpdatedCmd { get; set; } + + #endregion + + private List _totalFiles; + + private readonly IDialogService _dialogService; + + /// + /// 截屏九宫格每页条目数 + /// + private const int PerGridItemCount = 9; + + public ImageFileExplorerDialogViewModel(IDialogService dialogService) + { + _dialogService = dialogService; + + ItemSelectedCommand = new DelegateCommand(ItemSelected); + MouseDoubleClickCommand = new DelegateCommand(MouseDoubleClick); + PageUpdatedCmd = new DelegateCommand>(PageUpdated); + } + + private void ItemSelected(ChildFolderModel selectedItem) + { + SelectedFolder = selectedItem; + + TaskHasCompleted = false; + PictureFiles?.Clear(); + UpdateChildFolderView(selectedItem.FullPath); + } + + private void MouseDoubleClick(ImageFile imageFile) + { + if (imageFile == null) + { + MessageBox.Show("图片文件路径错误，无法查看", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); + return; + } + + _dialogService.ShowDialog("BigPictureView", new DialogParameters + { + { "ImageFullPath", imageFile.FullPath } + }, delegate { }); + } + + private void PageUpdated(FunctionEventArgs args) + { + var imageFiles = _totalFiles + .Skip((args.Info - 1) * PerGridItemCount) + .Take(PerGridItemCount) + .ToList(); + PictureFiles = imageFiles.ToObservableCollection(); + } + + public bool CanCloseDialog() + { + return true; + } + + public void OnDialogClosed() + { + } + + public async void OnDialogOpened(IDialogParameters parameters) + { + var totalFolders = await GetTotalChildFoldersAsync(); + ChildFolders = totalFolders.ToObservableCollection(); + //默认加载第一个文件夹数据 + if (ChildFolders.Any()) + { + UpdateChildFolderView(ChildFolders.First().FullPath); + } + } + + /// + /// 获取子文件夹下文件列表 + /// + /// + private async void UpdateChildFolderView(string childFolderPath) + { + _totalFiles = await GetTotalPictureFilesAsync(childFolderPath); + MaxPage = (_totalFiles.Count + PerGridItemCount - 1) / PerGridItemCount; + PictureFiles = _totalFiles.Take(PerGridItemCount).ToList().ToObservableCollection(); + } + + /// + /// 异步遍历文件夹，防止卡主线程 + /// + /// + private async Task> GetTotalChildFoldersAsync() + { + var childFolders = new List(); + await Task.Run(() => TraverseFolder(DirectoryManager.GetPictureDir(), childFolders)); + return childFolders.OrderBy(folder => folder.CreationTime).Reverse().ToList(); + } + + /// + /// 遍历文件夹并生成相应的数据类型集合 + /// + /// + /// + private static void TraverseFolder(string folderPath, List childFolders) + { + var directories = new DirectoryInfo(folderPath).GetDirectories(); + foreach (var dic in directories) + { + var childFolderFullPath = dic.FullName; + var childFolder = new ChildFolderModel + { + FolderType = "Image", + FolderName = dic.Name, + FullPath = childFolderFullPath, + CreationTime = dic.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), + ChildFileCount = new DirectoryInfo(childFolderFullPath).GetFiles().Length.ToString() + }; + + childFolders.Add(childFolder); + } + } + + /// + /// 异步遍历文件夹，防止卡主线程 + /// + /// + private async Task> GetTotalPictureFilesAsync(string childFolderPath) + { + var imageFiles = new List(); + await Task.Run(() => TraverseFolder(childFolderPath, imageFiles)); + TaskHasCompleted = true; + return imageFiles.OrderBy(file => file.CreationTime).Reverse().ToList(); + } + + /// + /// 遍历文件夹并生成相应的数据类型集合 + /// + /// + /// + private void TraverseFolder(string folderPath, List imageFiles) + { + var files = new DirectoryInfo(folderPath).GetFiles(); + foreach (var file in files) + { + var filePath = folderPath + "\\" + file.Name; + var imageFile = new ImageFile + { + FileName = file.Name, + FullPath = filePath, + ScreenBitmapImage = filePath.GetBitmapImage(), + FileSize = file.Length.FormatFileSize(), + CreationTime = file.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss") + }; + + imageFiles.Add(imageFile); + } + } + } +} \ No newline at end of file diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ChildFolderImageConverter.cs b/Correlator/Converter/ChildFolderImageConverter.cs deleted file mode 100644 index d120692..0000000 --- a/Correlator/Converter/ChildFolderImageConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media.Imaging; - -namespace Correlator.Converter -{ - public class ChildFolderImageConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - Debug.Assert(value != null, nameof(value) + " != null"); - if (value.Equals("Image")) - { - return new BitmapImage(new Uri(@"..\..\Image\image_folder.png", UriKind.Relative)); - } - - return new BitmapImage(new Uri(@"..\..\Image\audio_folder.png", UriKind.Relative)); - } - - 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 0543852..d642b63 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -189,23 +189,22 @@ Designer - - - + + - + - - + + - + - + @@ -223,9 +222,6 @@ CheckResponseDialog.xaml - - ImageChildFolderDialog.xaml - DetectNoiseDialog.xaml @@ -235,30 +231,29 @@ EditSoundSpeedDialog.xaml + + ImageFileExplorerDialog.xaml + ImportHydrophoneDataDialog.xaml LoadingDialog.xaml - - ScreenImageFileDialog.xaml - SoundSampleRateDialog.xaml - - - + + + - - - - - - + + + + + NoiseWaveView.xaml @@ -305,13 +300,13 @@ - + - + @@ -324,24 +319,23 @@ - - + + Designer MSBuild:Compile - - + + Designer MSBuild:Compile - - - + + Designer MSBuild:Compile @@ -472,11 +466,7 @@ - - - - - + diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml b/Correlator/Dialog/ImageChildFolderDialog.xaml deleted file mode 100644 index 13f71c1..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs b/Correlator/Dialog/ImageChildFolderDialog.xaml.cs deleted file mode 100644 index a6a4f6f..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ImageChildFolderDialog : UserControl - { - public ImageChildFolderDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml b/Correlator/Dialog/ImageFileExplorerDialog.xaml new file mode 100644 index 0000000..dca424e --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs new file mode 100644 index 0000000..dc51b0b --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace Correlator.Dialog +{ + public partial class ImageFileExplorerDialog : UserControl + { + public ImageFileExplorerDialog() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml b/Correlator/Dialog/ScreenImageFileDialog.xaml deleted file mode 100644 index 3ecbd7e..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs b/Correlator/Dialog/ScreenImageFileDialog.xaml.cs deleted file mode 100644 index fcde978..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ScreenImageFileDialog : UserControl - { - public ScreenImageFileDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Fonts/iconfont.ttf b/Correlator/Fonts/iconfont.ttf index 9dce096..cf325e6 100644 --- a/Correlator/Fonts/iconfont.ttf +++ b/Correlator/Fonts/iconfont.ttf Binary files differ diff --git a/Correlator/Image/audio_folder.png b/Correlator/Image/audio_folder.png deleted file mode 100644 index e238213..0000000 --- a/Correlator/Image/audio_folder.png +++ /dev/null Binary files differ diff --git a/Correlator/Image/image_folder.png b/Correlator/Image/image_folder.png deleted file mode 100644 index 7f22657..0000000 --- a/Correlator/Image/image_folder.png +++ /dev/null Binary files differ diff --git a/Correlator/ViewModels/ImageChildFolderViewModel.cs b/Correlator/ViewModels/ImageChildFolderViewModel.cs deleted file mode 100644 index 4a823eb..0000000 --- a/Correlator/ViewModels/ImageChildFolderViewModel.cs +++ /dev/null @@ -1,185 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using System.Windows; -using Correlator.Model; -using Correlator.Util; -using HandyControl.Data; -using Prism.Commands; -using Prism.Mvvm; -using Prism.Services.Dialogs; - -namespace Correlator.ViewModels -{ - public class ImageChildFolderViewModel : BindableBase, IDialogAware - { - #region 属性绑定 - - public string Title => "快照文件夹列表"; - - public event Action RequestClose - { - add { } - remove { } - } - - private ObservableCollection _childFolders; - - public ObservableCollection ChildFolders - { - get => _childFolders; - set - { - _childFolders = value; - RaisePropertyChanged(); - } - } - - private ChildFolderModel _selectedFolder; - - public ChildFolderModel SelectedFolder - { - get => _selectedFolder; - set - { - _selectedFolder = value; - RaisePropertyChanged(); - } - } - - private int _maxPage; - - public int MaxPage - { - get => _maxPage; - set - { - _maxPage = value; - RaisePropertyChanged(); - } - } - - private bool _taskHasCompleted; - - public bool TaskHasCompleted - { - get => _taskHasCompleted; - set - { - _taskHasCompleted = value; - RaisePropertyChanged(); - } - } - - #endregion - - #region DelegateCommand - - public DelegateCommand ItemSelectedCommand { get; set; } - public DelegateCommand MouseDoubleClickCommand { get; set; } - public DelegateCommand> PageUpdatedCmd { get; set; } - - #endregion - - private readonly IDialogService _dialogService; - private List _totalFolders; - - /// - /// 截屏文件夹九宫格每页条目数 - /// - private const int PerGridItemCount = 55; - - public ImageChildFolderViewModel(IDialogService dialogService) - { - _dialogService = dialogService; - - ItemSelectedCommand = new DelegateCommand(ItemSelected); - MouseDoubleClickCommand = new DelegateCommand(ShowChildFolderPicture); - PageUpdatedCmd = new DelegateCommand>(PageUpdated); - } - - private void ItemSelected(ChildFolderModel selectedItem) - { - SelectedFolder = selectedItem; - } - - private void ShowChildFolderPicture(ChildFolderModel childFolder) - { - if (childFolder == null) - { - MessageBox.Show("文件夹路径错误，无法查看", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); - return; - } - - _dialogService.ShowDialog("ScreenImageFileDialog", new DialogParameters - { - { "ChildFolderFullPath", childFolder.FullPath } - }, delegate { }); - } - - private void PageUpdated(FunctionEventArgs args) - { - var childFolders = _totalFolders - .Skip((args.Info - 1) * PerGridItemCount) - .Take(PerGridItemCount) - .ToList(); - ChildFolders = childFolders.ToObservableCollection(); - } - - public bool CanCloseDialog() - { - return true; - } - - public void OnDialogClosed() - { - } - - public async void OnDialogOpened(IDialogParameters parameters) - { - _totalFolders = await GetTotalChildFoldersAsync(); - MaxPage = (_totalFolders.Count + PerGridItemCount - 1) / PerGridItemCount; - ChildFolders = _totalFolders.Take(PerGridItemCount).ToList().ToObservableCollection(); - } - - /// - /// 异步遍历文件夹，防止卡主线程 - /// - /// - private async Task> GetTotalChildFoldersAsync() - { - var childFolders = new List(); - - await Task.Run(() => TraverseFolder(DirectoryManager.GetPictureDir(), childFolders)); - TaskHasCompleted = true; - return childFolders.OrderBy(folder => folder.CreationTime).Reverse().ToList(); - } - - /// - /// 遍历文件夹并生成相应的数据类型集合 - /// - /// - /// - private static void TraverseFolder(string folderPath, List childFolders) - { - var directories = new DirectoryInfo(folderPath).GetDirectories(); - foreach (var dic in directories) - { - var childFolderFullPath = dic.FullName; - var childFolder = new ChildFolderModel - { - FolderType = "Image", - FolderName = dic.Name, - FullPath = childFolderFullPath, - CreationTime = dic.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), - ChildFileCount = new DirectoryInfo(childFolderFullPath).GetFiles().Length.ToString() - }; - - childFolders.Add(childFolder); - } - } - } -} \ No newline at end of file diff --git a/Correlator/ViewModels/ImageFileExplorerDialogViewModel.cs b/Correlator/ViewModels/ImageFileExplorerDialogViewModel.cs new file mode 100644 index 0000000..52bf064 --- /dev/null +++ b/Correlator/ViewModels/ImageFileExplorerDialogViewModel.cs @@ -0,0 +1,251 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; +using Correlator.Model; +using Correlator.Util; +using HandyControl.Data; +using Prism.Commands; +using Prism.Mvvm; +using Prism.Services.Dialogs; + +namespace Correlator.ViewModels +{ + public class ImageFileExplorerDialogViewModel : BindableBase, IDialogAware + { + #region 属性绑定 + + public string Title => "快照文件资源管理器"; + + public event Action RequestClose + { + add { } + remove { } + } + + private ObservableCollection _childFolders; + + public ObservableCollection ChildFolders + { + get => _childFolders; + set + { + _childFolders = value; + RaisePropertyChanged(); + } + } + + private ChildFolderModel _selectedFolder; + + public ChildFolderModel SelectedFolder + { + get => _selectedFolder; + set + { + _selectedFolder = value; + RaisePropertyChanged(); + } + } + + private int _maxPage; + + public int MaxPage + { + get => _maxPage; + set + { + _maxPage = value; + RaisePropertyChanged(); + } + } + + private bool _taskHasCompleted; + + public bool TaskHasCompleted + { + get => _taskHasCompleted; + set + { + _taskHasCompleted = value; + RaisePropertyChanged(); + } + } + + private ObservableCollection _pictureFiles; + + public ObservableCollection PictureFiles + { + get => _pictureFiles; + set + { + _pictureFiles = value; + RaisePropertyChanged(); + } + } + + #endregion + + #region DelegateCommand + + public DelegateCommand ItemSelectedCommand { get; set; } + public DelegateCommand MouseDoubleClickCommand { get; set; } + public DelegateCommand> PageUpdatedCmd { get; set; } + + #endregion + + private List _totalFiles; + + private readonly IDialogService _dialogService; + + /// + /// 截屏九宫格每页条目数 + /// + private const int PerGridItemCount = 9; + + public ImageFileExplorerDialogViewModel(IDialogService dialogService) + { + _dialogService = dialogService; + + ItemSelectedCommand = new DelegateCommand(ItemSelected); + MouseDoubleClickCommand = new DelegateCommand(MouseDoubleClick); + PageUpdatedCmd = new DelegateCommand>(PageUpdated); + } + + private void ItemSelected(ChildFolderModel selectedItem) + { + SelectedFolder = selectedItem; + + TaskHasCompleted = false; + PictureFiles?.Clear(); + UpdateChildFolderView(selectedItem.FullPath); + } + + private void MouseDoubleClick(ImageFile imageFile) + { + if (imageFile == null) + { + MessageBox.Show("图片文件路径错误，无法查看", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); + return; + } + + _dialogService.ShowDialog("BigPictureView", new DialogParameters + { + { "ImageFullPath", imageFile.FullPath } + }, delegate { }); + } + + private void PageUpdated(FunctionEventArgs args) + { + var imageFiles = _totalFiles + .Skip((args.Info - 1) * PerGridItemCount) + .Take(PerGridItemCount) + .ToList(); + PictureFiles = imageFiles.ToObservableCollection(); + } + + public bool CanCloseDialog() + { + return true; + } + + public void OnDialogClosed() + { + } + + public async void OnDialogOpened(IDialogParameters parameters) + { + var totalFolders = await GetTotalChildFoldersAsync(); + ChildFolders = totalFolders.ToObservableCollection(); + //默认加载第一个文件夹数据 + if (ChildFolders.Any()) + { + UpdateChildFolderView(ChildFolders.First().FullPath); + } + } + + /// + /// 获取子文件夹下文件列表 + /// + /// + private async void UpdateChildFolderView(string childFolderPath) + { + _totalFiles = await GetTotalPictureFilesAsync(childFolderPath); + MaxPage = (_totalFiles.Count + PerGridItemCount - 1) / PerGridItemCount; + PictureFiles = _totalFiles.Take(PerGridItemCount).ToList().ToObservableCollection(); + } + + /// + /// 异步遍历文件夹，防止卡主线程 + /// + /// + private async Task> GetTotalChildFoldersAsync() + { + var childFolders = new List(); + await Task.Run(() => TraverseFolder(DirectoryManager.GetPictureDir(), childFolders)); + return childFolders.OrderBy(folder => folder.CreationTime).Reverse().ToList(); + } + + /// + /// 遍历文件夹并生成相应的数据类型集合 + /// + /// + /// + private static void TraverseFolder(string folderPath, List childFolders) + { + var directories = new DirectoryInfo(folderPath).GetDirectories(); + foreach (var dic in directories) + { + var childFolderFullPath = dic.FullName; + var childFolder = new ChildFolderModel + { + FolderType = "Image", + FolderName = dic.Name, + FullPath = childFolderFullPath, + CreationTime = dic.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), + ChildFileCount = new DirectoryInfo(childFolderFullPath).GetFiles().Length.ToString() + }; + + childFolders.Add(childFolder); + } + } + + /// + /// 异步遍历文件夹，防止卡主线程 + /// + /// + private async Task> GetTotalPictureFilesAsync(string childFolderPath) + { + var imageFiles = new List(); + await Task.Run(() => TraverseFolder(childFolderPath, imageFiles)); + TaskHasCompleted = true; + return imageFiles.OrderBy(file => file.CreationTime).Reverse().ToList(); + } + + /// + /// 遍历文件夹并生成相应的数据类型集合 + /// + /// + /// + private void TraverseFolder(string folderPath, List imageFiles) + { + var files = new DirectoryInfo(folderPath).GetFiles(); + foreach (var file in files) + { + var filePath = folderPath + "\\" + file.Name; + var imageFile = new ImageFile + { + FileName = file.Name, + FullPath = filePath, + ScreenBitmapImage = filePath.GetBitmapImage(), + FileSize = file.Length.FormatFileSize(), + CreationTime = file.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss") + }; + + imageFiles.Add(imageFile); + } + } + } +} \ No newline at end of file diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 6e24ef1..22ab66f 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -637,7 +637,7 @@ private void OpenImageFile(Popup popup) { - _dialogService.Show("ImageChildFolderDialog", null, delegate { }); + _dialogService.Show("ImageFileExplorerDialog", null, delegate { }); popup.IsOpen = false; } diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ChildFolderImageConverter.cs b/Correlator/Converter/ChildFolderImageConverter.cs deleted file mode 100644 index d120692..0000000 --- a/Correlator/Converter/ChildFolderImageConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media.Imaging; - -namespace Correlator.Converter -{ - public class ChildFolderImageConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - Debug.Assert(value != null, nameof(value) + " != null"); - if (value.Equals("Image")) - { - return new BitmapImage(new Uri(@"..\..\Image\image_folder.png", UriKind.Relative)); - } - - return new BitmapImage(new Uri(@"..\..\Image\audio_folder.png", UriKind.Relative)); - } - - 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 0543852..d642b63 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -189,23 +189,22 @@ Designer - - - + + - + - - + + - + - + @@ -223,9 +222,6 @@ CheckResponseDialog.xaml - - ImageChildFolderDialog.xaml - DetectNoiseDialog.xaml @@ -235,30 +231,29 @@ EditSoundSpeedDialog.xaml + + ImageFileExplorerDialog.xaml + ImportHydrophoneDataDialog.xaml LoadingDialog.xaml - - ScreenImageFileDialog.xaml - SoundSampleRateDialog.xaml - - - + + + - - - - - - + + + + + NoiseWaveView.xaml @@ -305,13 +300,13 @@ - + - + @@ -324,24 +319,23 @@ - - + + Designer MSBuild:Compile - - + + Designer MSBuild:Compile - - - + + Designer MSBuild:Compile @@ -472,11 +466,7 @@ - - - - - + diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml b/Correlator/Dialog/ImageChildFolderDialog.xaml deleted file mode 100644 index 13f71c1..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs b/Correlator/Dialog/ImageChildFolderDialog.xaml.cs deleted file mode 100644 index a6a4f6f..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ImageChildFolderDialog : UserControl - { - public ImageChildFolderDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml b/Correlator/Dialog/ImageFileExplorerDialog.xaml new file mode 100644 index 0000000..dca424e --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs new file mode 100644 index 0000000..dc51b0b --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace Correlator.Dialog +{ + public partial class ImageFileExplorerDialog : UserControl + { + public ImageFileExplorerDialog() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml b/Correlator/Dialog/ScreenImageFileDialog.xaml deleted file mode 100644 index 3ecbd7e..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs b/Correlator/Dialog/ScreenImageFileDialog.xaml.cs deleted file mode 100644 index fcde978..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ScreenImageFileDialog : UserControl - { - public ScreenImageFileDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Fonts/iconfont.ttf b/Correlator/Fonts/iconfont.ttf index 9dce096..cf325e6 100644 --- a/Correlator/Fonts/iconfont.ttf +++ b/Correlator/Fonts/iconfont.ttf Binary files differ diff --git a/Correlator/Image/audio_folder.png b/Correlator/Image/audio_folder.png deleted file mode 100644 index e238213..0000000 --- a/Correlator/Image/audio_folder.png +++ /dev/null Binary files differ diff --git a/Correlator/Image/image_folder.png b/Correlator/Image/image_folder.png deleted file mode 100644 index 7f22657..0000000 --- a/Correlator/Image/image_folder.png +++ /dev/null Binary files differ diff --git a/Correlator/ViewModels/ImageChildFolderViewModel.cs b/Correlator/ViewModels/ImageChildFolderViewModel.cs deleted file mode 100644 index 4a823eb..0000000 --- a/Correlator/ViewModels/ImageChildFolderViewModel.cs +++ /dev/null @@ -1,185 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using System.Windows; -using Correlator.Model; -using Correlator.Util; -using HandyControl.Data; -using Prism.Commands; -using Prism.Mvvm; -using Prism.Services.Dialogs; - -namespace Correlator.ViewModels -{ - public class ImageChildFolderViewModel : BindableBase, IDialogAware - { - #region 属性绑定 - - public string Title => "快照文件夹列表"; - - public event Action RequestClose - { - add { } - remove { } - } - - private ObservableCollection _childFolders; - - public ObservableCollection ChildFolders - { - get => _childFolders; - set - { - _childFolders = value; - RaisePropertyChanged(); - } - } - - private ChildFolderModel _selectedFolder; - - public ChildFolderModel SelectedFolder - { - get => _selectedFolder; - set - { - _selectedFolder = value; - RaisePropertyChanged(); - } - } - - private int _maxPage; - - public int MaxPage - { - get => _maxPage; - set - { - _maxPage = value; - RaisePropertyChanged(); - } - } - - private bool _taskHasCompleted; - - public bool TaskHasCompleted - { - get => _taskHasCompleted; - set - { - _taskHasCompleted = value; - RaisePropertyChanged(); - } - } - - #endregion - - #region DelegateCommand - - public DelegateCommand ItemSelectedCommand { get; set; } - public DelegateCommand MouseDoubleClickCommand { get; set; } - public DelegateCommand> PageUpdatedCmd { get; set; } - - #endregion - - private readonly IDialogService _dialogService; - private List _totalFolders; - - /// - /// 截屏文件夹九宫格每页条目数 - /// - private const int PerGridItemCount = 55; - - public ImageChildFolderViewModel(IDialogService dialogService) - { - _dialogService = dialogService; - - ItemSelectedCommand = new DelegateCommand(ItemSelected); - MouseDoubleClickCommand = new DelegateCommand(ShowChildFolderPicture); - PageUpdatedCmd = new DelegateCommand>(PageUpdated); - } - - private void ItemSelected(ChildFolderModel selectedItem) - { - SelectedFolder = selectedItem; - } - - private void ShowChildFolderPicture(ChildFolderModel childFolder) - { - if (childFolder == null) - { - MessageBox.Show("文件夹路径错误，无法查看", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); - return; - } - - _dialogService.ShowDialog("ScreenImageFileDialog", new DialogParameters - { - { "ChildFolderFullPath", childFolder.FullPath } - }, delegate { }); - } - - private void PageUpdated(FunctionEventArgs args) - { - var childFolders = _totalFolders - .Skip((args.Info - 1) * PerGridItemCount) - .Take(PerGridItemCount) - .ToList(); - ChildFolders = childFolders.ToObservableCollection(); - } - - public bool CanCloseDialog() - { - return true; - } - - public void OnDialogClosed() - { - } - - public async void OnDialogOpened(IDialogParameters parameters) - { - _totalFolders = await GetTotalChildFoldersAsync(); - MaxPage = (_totalFolders.Count + PerGridItemCount - 1) / PerGridItemCount; - ChildFolders = _totalFolders.Take(PerGridItemCount).ToList().ToObservableCollection(); - } - - /// - /// 异步遍历文件夹，防止卡主线程 - /// - /// - private async Task> GetTotalChildFoldersAsync() - { - var childFolders = new List(); - - await Task.Run(() => TraverseFolder(DirectoryManager.GetPictureDir(), childFolders)); - TaskHasCompleted = true; - return childFolders.OrderBy(folder => folder.CreationTime).Reverse().ToList(); - } - - /// - /// 遍历文件夹并生成相应的数据类型集合 - /// - /// - /// - private static void TraverseFolder(string folderPath, List childFolders) - { - var directories = new DirectoryInfo(folderPath).GetDirectories(); - foreach (var dic in directories) - { - var childFolderFullPath = dic.FullName; - var childFolder = new ChildFolderModel - { - FolderType = "Image", - FolderName = dic.Name, - FullPath = childFolderFullPath, - CreationTime = dic.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), - ChildFileCount = new DirectoryInfo(childFolderFullPath).GetFiles().Length.ToString() - }; - - childFolders.Add(childFolder); - } - } - } -} \ No newline at end of file diff --git a/Correlator/ViewModels/ImageFileExplorerDialogViewModel.cs b/Correlator/ViewModels/ImageFileExplorerDialogViewModel.cs new file mode 100644 index 0000000..52bf064 --- /dev/null +++ b/Correlator/ViewModels/ImageFileExplorerDialogViewModel.cs @@ -0,0 +1,251 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; +using Correlator.Model; +using Correlator.Util; +using HandyControl.Data; +using Prism.Commands; +using Prism.Mvvm; +using Prism.Services.Dialogs; + +namespace Correlator.ViewModels +{ + public class ImageFileExplorerDialogViewModel : BindableBase, IDialogAware + { + #region 属性绑定 + + public string Title => "快照文件资源管理器"; + + public event Action RequestClose + { + add { } + remove { } + } + + private ObservableCollection _childFolders; + + public ObservableCollection ChildFolders + { + get => _childFolders; + set + { + _childFolders = value; + RaisePropertyChanged(); + } + } + + private ChildFolderModel _selectedFolder; + + public ChildFolderModel SelectedFolder + { + get => _selectedFolder; + set + { + _selectedFolder = value; + RaisePropertyChanged(); + } + } + + private int _maxPage; + + public int MaxPage + { + get => _maxPage; + set + { + _maxPage = value; + RaisePropertyChanged(); + } + } + + private bool _taskHasCompleted; + + public bool TaskHasCompleted + { + get => _taskHasCompleted; + set + { + _taskHasCompleted = value; + RaisePropertyChanged(); + } + } + + private ObservableCollection _pictureFiles; + + public ObservableCollection PictureFiles + { + get => _pictureFiles; + set + { + _pictureFiles = value; + RaisePropertyChanged(); + } + } + + #endregion + + #region DelegateCommand + + public DelegateCommand ItemSelectedCommand { get; set; } + public DelegateCommand MouseDoubleClickCommand { get; set; } + public DelegateCommand> PageUpdatedCmd { get; set; } + + #endregion + + private List _totalFiles; + + private readonly IDialogService _dialogService; + + /// + /// 截屏九宫格每页条目数 + /// + private const int PerGridItemCount = 9; + + public ImageFileExplorerDialogViewModel(IDialogService dialogService) + { + _dialogService = dialogService; + + ItemSelectedCommand = new DelegateCommand(ItemSelected); + MouseDoubleClickCommand = new DelegateCommand(MouseDoubleClick); + PageUpdatedCmd = new DelegateCommand>(PageUpdated); + } + + private void ItemSelected(ChildFolderModel selectedItem) + { + SelectedFolder = selectedItem; + + TaskHasCompleted = false; + PictureFiles?.Clear(); + UpdateChildFolderView(selectedItem.FullPath); + } + + private void MouseDoubleClick(ImageFile imageFile) + { + if (imageFile == null) + { + MessageBox.Show("图片文件路径错误，无法查看", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); + return; + } + + _dialogService.ShowDialog("BigPictureView", new DialogParameters + { + { "ImageFullPath", imageFile.FullPath } + }, delegate { }); + } + + private void PageUpdated(FunctionEventArgs args) + { + var imageFiles = _totalFiles + .Skip((args.Info - 1) * PerGridItemCount) + .Take(PerGridItemCount) + .ToList(); + PictureFiles = imageFiles.ToObservableCollection(); + } + + public bool CanCloseDialog() + { + return true; + } + + public void OnDialogClosed() + { + } + + public async void OnDialogOpened(IDialogParameters parameters) + { + var totalFolders = await GetTotalChildFoldersAsync(); + ChildFolders = totalFolders.ToObservableCollection(); + //默认加载第一个文件夹数据 + if (ChildFolders.Any()) + { + UpdateChildFolderView(ChildFolders.First().FullPath); + } + } + + /// + /// 获取子文件夹下文件列表 + /// + /// + private async void UpdateChildFolderView(string childFolderPath) + { + _totalFiles = await GetTotalPictureFilesAsync(childFolderPath); + MaxPage = (_totalFiles.Count + PerGridItemCount - 1) / PerGridItemCount; + PictureFiles = _totalFiles.Take(PerGridItemCount).ToList().ToObservableCollection(); + } + + /// + /// 异步遍历文件夹，防止卡主线程 + /// + /// + private async Task> GetTotalChildFoldersAsync() + { + var childFolders = new List(); + await Task.Run(() => TraverseFolder(DirectoryManager.GetPictureDir(), childFolders)); + return childFolders.OrderBy(folder => folder.CreationTime).Reverse().ToList(); + } + + /// + /// 遍历文件夹并生成相应的数据类型集合 + /// + /// + /// + private static void TraverseFolder(string folderPath, List childFolders) + { + var directories = new DirectoryInfo(folderPath).GetDirectories(); + foreach (var dic in directories) + { + var childFolderFullPath = dic.FullName; + var childFolder = new ChildFolderModel + { + FolderType = "Image", + FolderName = dic.Name, + FullPath = childFolderFullPath, + CreationTime = dic.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), + ChildFileCount = new DirectoryInfo(childFolderFullPath).GetFiles().Length.ToString() + }; + + childFolders.Add(childFolder); + } + } + + /// + /// 异步遍历文件夹，防止卡主线程 + /// + /// + private async Task> GetTotalPictureFilesAsync(string childFolderPath) + { + var imageFiles = new List(); + await Task.Run(() => TraverseFolder(childFolderPath, imageFiles)); + TaskHasCompleted = true; + return imageFiles.OrderBy(file => file.CreationTime).Reverse().ToList(); + } + + /// + /// 遍历文件夹并生成相应的数据类型集合 + /// + /// + /// + private void TraverseFolder(string folderPath, List imageFiles) + { + var files = new DirectoryInfo(folderPath).GetFiles(); + foreach (var file in files) + { + var filePath = folderPath + "\\" + file.Name; + var imageFile = new ImageFile + { + FileName = file.Name, + FullPath = filePath, + ScreenBitmapImage = filePath.GetBitmapImage(), + FileSize = file.Length.FormatFileSize(), + CreationTime = file.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss") + }; + + imageFiles.Add(imageFile); + } + } + } +} \ No newline at end of file diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 6e24ef1..22ab66f 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -637,7 +637,7 @@ private void OpenImageFile(Popup popup) { - _dialogService.Show("ImageChildFolderDialog", null, delegate { }); + _dialogService.Show("ImageFileExplorerDialog", null, delegate { }); popup.IsOpen = false; } diff --git a/Correlator/ViewModels/ScreenImageFileDialogViewModel.cs b/Correlator/ViewModels/ScreenImageFileDialogViewModel.cs deleted file mode 100644 index 39fece3..0000000 --- a/Correlator/ViewModels/ScreenImageFileDialogViewModel.cs +++ /dev/null @@ -1,162 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.IO; -using System.Linq; -using System.Windows; -using Correlator.Model; -using Correlator.Util; -using HandyControl.Data; -using Prism.Commands; -using Prism.Mvvm; -using Prism.Services.Dialogs; -using MessageBox = HandyControl.Controls.MessageBox; - -namespace Correlator.ViewModels -{ - public class ScreenImageFileDialogViewModel : BindableBase, IDialogAware - { - #region 属性绑定 - - public string Title => "快照文件列表"; - - public event Action RequestClose - { - add { } - remove { } - } - - private ObservableCollection _pictureFiles; - - public ObservableCollection PictureFiles - { - get => _pictureFiles; - set - { - _pictureFiles = value; - RaisePropertyChanged(); - } - } - - private ImageFile _selectedImageFile; - - public ImageFile SelectedImageFile - { - get => _selectedImageFile; - set - { - _selectedImageFile = value; - RaisePropertyChanged(); - } - } - - private int _maxPage; - - public int MaxPage - { - get => _maxPage; - set - { - _maxPage = value; - RaisePropertyChanged(); - } - } - - #endregion - - #region DelegateCommand - - public DelegateCommand ItemSelectedCommand { get; set; } - public DelegateCommand MouseDoubleClickCommand { get; set; } - public DelegateCommand> PageUpdatedCmd { get; set; } - - #endregion - - private readonly IDialogService _dialogService; - private List _totalFiles; - - /// - /// 截屏九宫格每页条目数 - /// - private const int PerGridItemCount = 12; - - public ScreenImageFileDialogViewModel(IDialogService dialogService) - { - _dialogService = dialogService; - - ItemSelectedCommand = new DelegateCommand(ItemSelected); - MouseDoubleClickCommand = new DelegateCommand(ShowPicture); - PageUpdatedCmd = new DelegateCommand>(PageUpdated); - } - - private void ItemSelected(ImageFile selectedItem) - { - SelectedImageFile = selectedItem; - } - - private void ShowPicture(ImageFile imageFile) - { - if (imageFile == null) - { - MessageBox.Show("图片文件路径错误，无法查看", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); - return; - } - - _dialogService.ShowDialog("BigPictureView", new DialogParameters - { - { "ImageFullPath", imageFile.FullPath } - }, delegate { }); - } - - private void PageUpdated(FunctionEventArgs args) - { - var imageFiles = _totalFiles - .Skip((args.Info - 1) * PerGridItemCount) - .Take(PerGridItemCount) - .ToList(); - PictureFiles = imageFiles.ToObservableCollection(); - } - - public bool CanCloseDialog() - { - return true; - } - - public void OnDialogClosed() - { - } - - public void OnDialogOpened(IDialogParameters parameters) - { - _totalFiles = GetTotalPictureFiles(parameters.GetValue("ChildFolderFullPath")); - MaxPage = (_totalFiles.Count + PerGridItemCount - 1) / PerGridItemCount; - PictureFiles = _totalFiles.Take(PerGridItemCount).ToList().ToObservableCollection(); - } - - /// - /// 遍历文件夹并生成相应的数据类型集合 - /// - /// - private List GetTotalPictureFiles(string folderPath) - { - var imageFiles = new List(); - var files = new DirectoryInfo(folderPath).GetFiles(); - foreach (var file in files) - { - var filePath = folderPath + "\\" + file.Name; - var imageFile = new ImageFile - { - FileName = file.Name, - FullPath = filePath, - ScreenBitmapImage = filePath.GetBitmapImage(), - FileSize = file.Length.FormatFileSize(), - CreationTime = file.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss") - }; - - imageFiles.Add(imageFile); - } - - return imageFiles.OrderBy(file => file.CreationTime).Reverse().ToList(); - } - } -} \ No newline at end of file diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index f998df3..fafa5fa 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -101,8 +101,7 @@ containerRegistry.RegisterSingleton(); //Dialog or Window - containerRegistry.RegisterDialog(); - containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/Correlator/Converter/ChildFolderImageConverter.cs b/Correlator/Converter/ChildFolderImageConverter.cs deleted file mode 100644 index d120692..0000000 --- a/Correlator/Converter/ChildFolderImageConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Diagnostics; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media.Imaging; - -namespace Correlator.Converter -{ - public class ChildFolderImageConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - Debug.Assert(value != null, nameof(value) + " != null"); - if (value.Equals("Image")) - { - return new BitmapImage(new Uri(@"..\..\Image\image_folder.png", UriKind.Relative)); - } - - return new BitmapImage(new Uri(@"..\..\Image\audio_folder.png", UriKind.Relative)); - } - - 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 0543852..d642b63 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -189,23 +189,22 @@ Designer - - - + + - + - - + + - + - + @@ -223,9 +222,6 @@ CheckResponseDialog.xaml - - ImageChildFolderDialog.xaml - DetectNoiseDialog.xaml @@ -235,30 +231,29 @@ EditSoundSpeedDialog.xaml + + ImageFileExplorerDialog.xaml + ImportHydrophoneDataDialog.xaml LoadingDialog.xaml - - ScreenImageFileDialog.xaml - SoundSampleRateDialog.xaml - - - + + + - - - - - - + + + + + NoiseWaveView.xaml @@ -305,13 +300,13 @@ - + - + @@ -324,24 +319,23 @@ - - + + Designer MSBuild:Compile - - + + Designer MSBuild:Compile - - - + + Designer MSBuild:Compile @@ -472,11 +466,7 @@ - - - - - + diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml b/Correlator/Dialog/ImageChildFolderDialog.xaml deleted file mode 100644 index 13f71c1..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs b/Correlator/Dialog/ImageChildFolderDialog.xaml.cs deleted file mode 100644 index a6a4f6f..0000000 --- a/Correlator/Dialog/ImageChildFolderDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ImageChildFolderDialog : UserControl - { - public ImageChildFolderDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml b/Correlator/Dialog/ImageFileExplorerDialog.xaml new file mode 100644 index 0000000..dca424e --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs new file mode 100644 index 0000000..dc51b0b --- /dev/null +++ b/Correlator/Dialog/ImageFileExplorerDialog.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace Correlator.Dialog +{ + public partial class ImageFileExplorerDialog : UserControl + { + public ImageFileExplorerDialog() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml b/Correlator/Dialog/ScreenImageFileDialog.xaml deleted file mode 100644 index 3ecbd7e..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs b/Correlator/Dialog/ScreenImageFileDialog.xaml.cs deleted file mode 100644 index fcde978..0000000 --- a/Correlator/Dialog/ScreenImageFileDialog.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Controls; - -namespace Correlator.Dialog -{ - public partial class ScreenImageFileDialog : UserControl - { - public ScreenImageFileDialog() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Fonts/iconfont.ttf b/Correlator/Fonts/iconfont.ttf index 9dce096..cf325e6 100644 --- a/Correlator/Fonts/iconfont.ttf +++ b/Correlator/Fonts/iconfont.ttf Binary files differ diff --git a/Correlator/Image/audio_folder.png b/Correlator/Image/audio_folder.png deleted file mode 100644 index e238213..0000000 --- a/Correlator/Image/audio_folder.png +++ /dev/null Binary files differ diff --git a/Correlator/Image/image_folder.png b/Correlator/Image/image_folder.png deleted file mode 100644 index 7f22657..0000000 --- a/Correlator/Image/image_folder.png +++ /dev/null Binary files differ diff --git a/Correlator/ViewModels/ImageChildFolderViewModel.cs b/Correlator/ViewModels/ImageChildFolderViewModel.cs deleted file mode 100644 index 4a823eb..0000000 --- a/Correlator/ViewModels/ImageChildFolderViewModel.cs +++ /dev/null @@ -1,185 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using System.Windows; -using Correlator.Model; -using Correlator.Util; -using HandyControl.Data; -using Prism.Commands; -using Prism.Mvvm; -using Prism.Services.Dialogs; - -namespace Correlator.ViewModels -{ - public class ImageChildFolderViewModel : BindableBase, IDialogAware - { - #region 属性绑定 - - public string Title => "快照文件夹列表"; - - public event Action RequestClose - { - add { } - remove { } - } - - private ObservableCollection _childFolders; - - public ObservableCollection ChildFolders - { - get => _childFolders; - set - { - _childFolders = value; - RaisePropertyChanged(); - } - } - - private ChildFolderModel _selectedFolder; - - public ChildFolderModel SelectedFolder - { - get => _selectedFolder; - set - { - _selectedFolder = value; - RaisePropertyChanged(); - } - } - - private int _maxPage; - - public int MaxPage - { - get => _maxPage; - set - { - _maxPage = value; - RaisePropertyChanged(); - } - } - - private bool _taskHasCompleted; - - public bool TaskHasCompleted - { - get => _taskHasCompleted; - set - { - _taskHasCompleted = value; - RaisePropertyChanged(); - } - } - - #endregion - - #region DelegateCommand - - public DelegateCommand ItemSelectedCommand { get; set; } - public DelegateCommand MouseDoubleClickCommand { get; set; } - public DelegateCommand> PageUpdatedCmd { get; set; } - - #endregion - - private readonly IDialogService _dialogService; - private List _totalFolders; - - /// - /// 截屏文件夹九宫格每页条目数 - /// - private const int PerGridItemCount = 55; - - public ImageChildFolderViewModel(IDialogService dialogService) - { - _dialogService = dialogService; - - ItemSelectedCommand = new DelegateCommand(ItemSelected); - MouseDoubleClickCommand = new DelegateCommand(ShowChildFolderPicture); - PageUpdatedCmd = new DelegateCommand>(PageUpdated); - } - - private void ItemSelected(ChildFolderModel selectedItem) - { - SelectedFolder = selectedItem; - } - - private void ShowChildFolderPicture(ChildFolderModel childFolder) - { - if (childFolder == null) - { - MessageBox.Show("文件夹路径错误，无法查看", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); - return; - } - - _dialogService.ShowDialog("ScreenImageFileDialog", new DialogParameters - { - { "ChildFolderFullPath", childFolder.FullPath } - }, delegate { }); - } - - private void PageUpdated(FunctionEventArgs args) - { - var childFolders = _totalFolders - .Skip((args.Info - 1) * PerGridItemCount) - .Take(PerGridItemCount) - .ToList(); - ChildFolders = childFolders.ToObservableCollection(); - } - - public bool CanCloseDialog() - { - return true; - } - - public void OnDialogClosed() - { - } - - public async void OnDialogOpened(IDialogParameters parameters) - { - _totalFolders = await GetTotalChildFoldersAsync(); - MaxPage = (_totalFolders.Count + PerGridItemCount - 1) / PerGridItemCount; - ChildFolders = _totalFolders.Take(PerGridItemCount).ToList().ToObservableCollection(); - } - - /// - /// 异步遍历文件夹，防止卡主线程 - /// - /// - private async Task> GetTotalChildFoldersAsync() - { - var childFolders = new List(); - - await Task.Run(() => TraverseFolder(DirectoryManager.GetPictureDir(), childFolders)); - TaskHasCompleted = true; - return childFolders.OrderBy(folder => folder.CreationTime).Reverse().ToList(); - } - - /// - /// 遍历文件夹并生成相应的数据类型集合 - /// - /// - /// - private static void TraverseFolder(string folderPath, List childFolders) - { - var directories = new DirectoryInfo(folderPath).GetDirectories(); - foreach (var dic in directories) - { - var childFolderFullPath = dic.FullName; - var childFolder = new ChildFolderModel - { - FolderType = "Image", - FolderName = dic.Name, - FullPath = childFolderFullPath, - CreationTime = dic.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), - ChildFileCount = new DirectoryInfo(childFolderFullPath).GetFiles().Length.ToString() - }; - - childFolders.Add(childFolder); - } - } - } -} \ No newline at end of file diff --git a/Correlator/ViewModels/ImageFileExplorerDialogViewModel.cs b/Correlator/ViewModels/ImageFileExplorerDialogViewModel.cs new file mode 100644 index 0000000..52bf064 --- /dev/null +++ b/Correlator/ViewModels/ImageFileExplorerDialogViewModel.cs @@ -0,0 +1,251 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; +using Correlator.Model; +using Correlator.Util; +using HandyControl.Data; +using Prism.Commands; +using Prism.Mvvm; +using Prism.Services.Dialogs; + +namespace Correlator.ViewModels +{ + public class ImageFileExplorerDialogViewModel : BindableBase, IDialogAware + { + #region 属性绑定 + + public string Title => "快照文件资源管理器"; + + public event Action RequestClose + { + add { } + remove { } + } + + private ObservableCollection _childFolders; + + public ObservableCollection ChildFolders + { + get => _childFolders; + set + { + _childFolders = value; + RaisePropertyChanged(); + } + } + + private ChildFolderModel _selectedFolder; + + public ChildFolderModel SelectedFolder + { + get => _selectedFolder; + set + { + _selectedFolder = value; + RaisePropertyChanged(); + } + } + + private int _maxPage; + + public int MaxPage + { + get => _maxPage; + set + { + _maxPage = value; + RaisePropertyChanged(); + } + } + + private bool _taskHasCompleted; + + public bool TaskHasCompleted + { + get => _taskHasCompleted; + set + { + _taskHasCompleted = value; + RaisePropertyChanged(); + } + } + + private ObservableCollection _pictureFiles; + + public ObservableCollection PictureFiles + { + get => _pictureFiles; + set + { + _pictureFiles = value; + RaisePropertyChanged(); + } + } + + #endregion + + #region DelegateCommand + + public DelegateCommand ItemSelectedCommand { get; set; } + public DelegateCommand MouseDoubleClickCommand { get; set; } + public DelegateCommand> PageUpdatedCmd { get; set; } + + #endregion + + private List _totalFiles; + + private readonly IDialogService _dialogService; + + /// + /// 截屏九宫格每页条目数 + /// + private const int PerGridItemCount = 9; + + public ImageFileExplorerDialogViewModel(IDialogService dialogService) + { + _dialogService = dialogService; + + ItemSelectedCommand = new DelegateCommand(ItemSelected); + MouseDoubleClickCommand = new DelegateCommand(MouseDoubleClick); + PageUpdatedCmd = new DelegateCommand>(PageUpdated); + } + + private void ItemSelected(ChildFolderModel selectedItem) + { + SelectedFolder = selectedItem; + + TaskHasCompleted = false; + PictureFiles?.Clear(); + UpdateChildFolderView(selectedItem.FullPath); + } + + private void MouseDoubleClick(ImageFile imageFile) + { + if (imageFile == null) + { + MessageBox.Show("图片文件路径错误，无法查看", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); + return; + } + + _dialogService.ShowDialog("BigPictureView", new DialogParameters + { + { "ImageFullPath", imageFile.FullPath } + }, delegate { }); + } + + private void PageUpdated(FunctionEventArgs args) + { + var imageFiles = _totalFiles + .Skip((args.Info - 1) * PerGridItemCount) + .Take(PerGridItemCount) + .ToList(); + PictureFiles = imageFiles.ToObservableCollection(); + } + + public bool CanCloseDialog() + { + return true; + } + + public void OnDialogClosed() + { + } + + public async void OnDialogOpened(IDialogParameters parameters) + { + var totalFolders = await GetTotalChildFoldersAsync(); + ChildFolders = totalFolders.ToObservableCollection(); + //默认加载第一个文件夹数据 + if (ChildFolders.Any()) + { + UpdateChildFolderView(ChildFolders.First().FullPath); + } + } + + /// + /// 获取子文件夹下文件列表 + /// + /// + private async void UpdateChildFolderView(string childFolderPath) + { + _totalFiles = await GetTotalPictureFilesAsync(childFolderPath); + MaxPage = (_totalFiles.Count + PerGridItemCount - 1) / PerGridItemCount; + PictureFiles = _totalFiles.Take(PerGridItemCount).ToList().ToObservableCollection(); + } + + /// + /// 异步遍历文件夹，防止卡主线程 + /// + /// + private async Task> GetTotalChildFoldersAsync() + { + var childFolders = new List(); + await Task.Run(() => TraverseFolder(DirectoryManager.GetPictureDir(), childFolders)); + return childFolders.OrderBy(folder => folder.CreationTime).Reverse().ToList(); + } + + /// + /// 遍历文件夹并生成相应的数据类型集合 + /// + /// + /// + private static void TraverseFolder(string folderPath, List childFolders) + { + var directories = new DirectoryInfo(folderPath).GetDirectories(); + foreach (var dic in directories) + { + var childFolderFullPath = dic.FullName; + var childFolder = new ChildFolderModel + { + FolderType = "Image", + FolderName = dic.Name, + FullPath = childFolderFullPath, + CreationTime = dic.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), + ChildFileCount = new DirectoryInfo(childFolderFullPath).GetFiles().Length.ToString() + }; + + childFolders.Add(childFolder); + } + } + + /// + /// 异步遍历文件夹，防止卡主线程 + /// + /// + private async Task> GetTotalPictureFilesAsync(string childFolderPath) + { + var imageFiles = new List(); + await Task.Run(() => TraverseFolder(childFolderPath, imageFiles)); + TaskHasCompleted = true; + return imageFiles.OrderBy(file => file.CreationTime).Reverse().ToList(); + } + + /// + /// 遍历文件夹并生成相应的数据类型集合 + /// + /// + /// + private void TraverseFolder(string folderPath, List imageFiles) + { + var files = new DirectoryInfo(folderPath).GetFiles(); + foreach (var file in files) + { + var filePath = folderPath + "\\" + file.Name; + var imageFile = new ImageFile + { + FileName = file.Name, + FullPath = filePath, + ScreenBitmapImage = filePath.GetBitmapImage(), + FileSize = file.Length.FormatFileSize(), + CreationTime = file.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss") + }; + + imageFiles.Add(imageFile); + } + } + } +} \ No newline at end of file diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 6e24ef1..22ab66f 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -637,7 +637,7 @@ private void OpenImageFile(Popup popup) { - _dialogService.Show("ImageChildFolderDialog", null, delegate { }); + _dialogService.Show("ImageFileExplorerDialog", null, delegate { }); popup.IsOpen = false; } diff --git a/Correlator/ViewModels/ScreenImageFileDialogViewModel.cs b/Correlator/ViewModels/ScreenImageFileDialogViewModel.cs deleted file mode 100644 index 39fece3..0000000 --- a/Correlator/ViewModels/ScreenImageFileDialogViewModel.cs +++ /dev/null @@ -1,162 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.IO; -using System.Linq; -using System.Windows; -using Correlator.Model; -using Correlator.Util; -using HandyControl.Data; -using Prism.Commands; -using Prism.Mvvm; -using Prism.Services.Dialogs; -using MessageBox = HandyControl.Controls.MessageBox; - -namespace Correlator.ViewModels -{ - public class ScreenImageFileDialogViewModel : BindableBase, IDialogAware - { - #region 属性绑定 - - public string Title => "快照文件列表"; - - public event Action RequestClose - { - add { } - remove { } - } - - private ObservableCollection _pictureFiles; - - public ObservableCollection PictureFiles - { - get => _pictureFiles; - set - { - _pictureFiles = value; - RaisePropertyChanged(); - } - } - - private ImageFile _selectedImageFile; - - public ImageFile SelectedImageFile - { - get => _selectedImageFile; - set - { - _selectedImageFile = value; - RaisePropertyChanged(); - } - } - - private int _maxPage; - - public int MaxPage - { - get => _maxPage; - set - { - _maxPage = value; - RaisePropertyChanged(); - } - } - - #endregion - - #region DelegateCommand - - public DelegateCommand ItemSelectedCommand { get; set; } - public DelegateCommand MouseDoubleClickCommand { get; set; } - public DelegateCommand> PageUpdatedCmd { get; set; } - - #endregion - - private readonly IDialogService _dialogService; - private List _totalFiles; - - /// - /// 截屏九宫格每页条目数 - /// - private const int PerGridItemCount = 12; - - public ScreenImageFileDialogViewModel(IDialogService dialogService) - { - _dialogService = dialogService; - - ItemSelectedCommand = new DelegateCommand(ItemSelected); - MouseDoubleClickCommand = new DelegateCommand(ShowPicture); - PageUpdatedCmd = new DelegateCommand>(PageUpdated); - } - - private void ItemSelected(ImageFile selectedItem) - { - SelectedImageFile = selectedItem; - } - - private void ShowPicture(ImageFile imageFile) - { - if (imageFile == null) - { - MessageBox.Show("图片文件路径错误，无法查看", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); - return; - } - - _dialogService.ShowDialog("BigPictureView", new DialogParameters - { - { "ImageFullPath", imageFile.FullPath } - }, delegate { }); - } - - private void PageUpdated(FunctionEventArgs args) - { - var imageFiles = _totalFiles - .Skip((args.Info - 1) * PerGridItemCount) - .Take(PerGridItemCount) - .ToList(); - PictureFiles = imageFiles.ToObservableCollection(); - } - - public bool CanCloseDialog() - { - return true; - } - - public void OnDialogClosed() - { - } - - public void OnDialogOpened(IDialogParameters parameters) - { - _totalFiles = GetTotalPictureFiles(parameters.GetValue("ChildFolderFullPath")); - MaxPage = (_totalFiles.Count + PerGridItemCount - 1) / PerGridItemCount; - PictureFiles = _totalFiles.Take(PerGridItemCount).ToList().ToObservableCollection(); - } - - /// - /// 遍历文件夹并生成相应的数据类型集合 - /// - /// - private List GetTotalPictureFiles(string folderPath) - { - var imageFiles = new List(); - var files = new DirectoryInfo(folderPath).GetFiles(); - foreach (var file in files) - { - var filePath = folderPath + "\\" + file.Name; - var imageFile = new ImageFile - { - FileName = file.Name, - FullPath = filePath, - ScreenBitmapImage = filePath.GetBitmapImage(), - FileSize = file.Length.FormatFileSize(), - CreationTime = file.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss") - }; - - imageFiles.Add(imageFile); - } - - return imageFiles.OrderBy(file => file.CreationTime).Reverse().ToList(); - } - } -} \ No newline at end of file diff --git a/Correlator/Views/MainWindow.xaml.cs b/Correlator/Views/MainWindow.xaml.cs index d68fc3e..f0a1fa2 100644 --- a/Correlator/Views/MainWindow.xaml.cs +++ b/Correlator/Views/MainWindow.xaml.cs @@ -160,6 +160,9 @@ HelpCenterButton.Click += delegate { HelpCenterButtonPop.IsOpen = true; }; #endregion + + //TODO Test + // DirectoryManager.GetPictureDir().TidyUpFIleByDate(); } } } \ No newline at end of file