Commit 0493b6f3 authored by Francesco Carraro's avatar Francesco Carraro
Browse files

a lot of refactoring; fixed make empty spectraSummariesContainer when reading from Xml file

parent f20deece

INAF.Apps.Uwp.SLabDataManager/App.xaml.cs

+5 −4
Original line number Diff line number Diff line 
using CommunityToolkit.Mvvm.DependencyInjection;

using INAF.Apps.Uwp.Charts;

using INAF.Apps.Uwp.SLabDataManager.Charts;

using INAF.Apps.Uwp.SLabDataManager.Charts.Containers;

using INAF.Apps.Uwp.SLabDataManager.Charts.Smoothing;

using INAF.Apps.Uwp.SLabDataManager.Helpers;

using INAF.Apps.Uwp.SLabDataManager.Helpers.FileReaders;
@@ -11,11 +8,14 @@ using INAF.Apps.Uwp.SLabDataManager.Helpers.UI.Chart; 
using INAF.Apps.Uwp.SLabDataManager.Helpers.UI.Chart.ProcessingHelpers;

using INAF.Apps.Uwp.SLabDataManager.Models;

using INAF.Apps.Uwp.SLabDataManager.Models.Chart;

using INAF.Apps.Uwp.SLabDataManager.Models.Fit;

using INAF.Apps.Uwp.SLabDataManager.Models.Chart.Fit;

using INAF.Apps.Uwp.SLabDataManager.Models.Charts;

using INAF.Apps.Uwp.SLabDataManager.Models.Containers;

using INAF.Apps.Uwp.SLabDataManager.Services;

using INAF.Apps.Uwp.SLabDataManager.ViewModels;

using INAF.Apps.Uwp.SLabDataManager.ViewModels.ContentDialogsViewModel;

using INAF.Apps.Uwp.SLabDataManager.ViewModels.UserControlViewModels;

using INAF.Apps.Uwp.SLabDataManager.ViewModels.UserControlViewModels.ProcessedFilesSummaries;

using INAF.Libraries.NetStandard.Math.Fit.Linear;

using INAF.Libraries.NetStandard.Math.Fit.Spline;

using INAF.Libraries.NetStandard.Math.Smoothing;
@@ -150,6 +150,7 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                /* scoped */

                .AddScoped<ActionQuestionViewModel>()

                .AddScoped<LegendItemsHelper>()

                .AddScoped<ProcessedFilesSummaryViewModel>()

                .AddScoped<StorageItemsHelper>()

                /* transient */

                .AddTransient<AnimationsHelper>()

INAF.Apps.Uwp.SLabDataManager/Converters/Converters.cs

+2 −2
Original line number Diff line number Diff line 
using CommunityToolkit.Mvvm.DependencyInjection;

using INAF.Apps.Uwp.Charts;

using INAF.Apps.Uwp.SLabDataManager.Charts.Containers;

using INAF.Apps.Uwp.SLabDataManager.Helpers;

using INAF.Apps.Uwp.SLabDataManager.Helpers.UI;

using INAF.Apps.Uwp.SLabDataManager.Models;

using INAF.Apps.Uwp.SLabDataManager.Models.Charts;

using INAF.Apps.Uwp.SLabDataManager.Models.Containers;

using INAF.Apps.Uwp.SLabDataManager.ViewModels;

using INAF.Libraries.NetStandard.SLabCommonModels.Extensions;

using System;

INAF.Apps.Uwp.SLabDataManager/Converters/FitMethodsConverters.cs

+1 −1
Original line number Diff line number Diff line 
using INAF.Apps.Uwp.SLabDataManager.Models.Fit.Parameters;

using INAF.Apps.Uwp.SLabDataManager.Models.Chart.Fit.Parameters;

using System;

using Windows.UI.Xaml;

using Windows.UI.Xaml.Data;

INAF.Apps.Uwp.SLabDataManager/Converters/SpectraConverters.cs

+1 −2
Original line number Diff line number Diff line 
using CommunityToolkit.Mvvm.DependencyInjection;

using INAF.Apps.Uwp.SLabDataManager.Charts.Containers;

using INAF.Apps.Uwp.SLabDataManager.Models;

using INAF.Apps.Uwp.SLabDataManager.Models.Chart;

using INAF.Apps.Uwp.SLabDataManager.Models.Containers;

using INAF.Apps.Uwp.SLabDataManager.ViewModels.UserControlViewModels;

using INAF.Libraries.NetStandard.SLabCommonModels.Extensions;

using System;

INAF.Apps.Uwp.SLabDataManager/Converters/SpectrumSummaryConverters.cs

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
using CommunityToolkit.Mvvm.DependencyInjection;

using CommunityToolkit.Mvvm.Input;

using INAF.Apps.Uwp.SLabDataManager.Charts.Containers;

using INAF.Apps.Uwp.SLabDataManager.Models;

using INAF.Apps.Uwp.SLabDataManager.ViewModels;

using INAF.Libraries.NetStandard.SLabCommonModels.Extensions;

using System;

using Windows.UI.Xaml.Data;

using static INAF.Libraries.NetStandard.SLabCommonModels.Enums.Enums;



namespace INAF.Apps.Uwp.SLabDataManager.Converters

{

    public sealed class SpectrumSummarySaveFileConverter : IValueConverter

    {

        public object Convert(object value, Type targetType, object parameter, string language)

        {

            try

            {

                string _spectrumType = (string)parameter;

                SpectrumType spectrumType = _spectrumType.ToSpectrumType();



                SpectraContainer spectraContainer = Ioc.Default.GetService<WorkingItemsModel>().SpectraContainer;



                MainViewModel mainViewModel = Ioc.Default.GetService<MainViewModel>();

                var spectrum = spectraContainer.tryGetSpectrumOfType(spectrumType);



                return new RelayCommand(() =>

                {

                    mainViewModel.trySaveSpectrumOfTypeRawOrRefOnCloudAsync(spectrum);

                });

            }

            catch (Exception)

            {

                return string.Empty;

            }

        }



        public object ConvertBack(object value, Type targetType, object parameter, string language)

        {

            throw new NotImplementedException();

        }

    }

}