Commit db190065 authored by Francesco Carraro's avatar Francesco Carraro
Browse files

fixed retrieval and savinf of settings for smoothing for both 'by segments'/'whole spectrum' type;

parent f4b7f4b6

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

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

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

using INAF.Apps.Uwp.SLabDataManager.Helpers;

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

using INAF.Apps.Uwp.SLabDataManager.Helpers.RemoteOperations;
@@ -7,7 +6,8 @@ using INAF.Apps.Uwp.SLabDataManager.Helpers.UI; 
using INAF.Apps.Uwp.SLabDataManager.Helpers.UI.Chart;

using INAF.Apps.Uwp.SLabDataManager.Models;

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

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

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

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

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

using INAF.Apps.Uwp.SLabDataManager.Services;

using INAF.Apps.Uwp.SLabDataManager.ViewModels;
@@ -28,12 +28,14 @@ using Microsoft.AppCenter; 
using Microsoft.AppCenter.Analytics;

using Microsoft.AppCenter.Crashes;

using Microsoft.Extensions.DependencyInjection;

using Microsoft.Toolkit.Uwp.UI.Controls;

using System;

using System.Collections.Generic;

using Windows.ApplicationModel.Activation;

using Windows.UI;

using Windows.UI.WindowManagement;

using Windows.UI.Xaml;

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



namespace INAF.Apps.Uwp.SLabDataManager

{
@@ -133,7 +135,6 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                .AddSingleton<SegmentFitModelsFactory>()

                .AddSingleton<SelectedRefBand>()

                .AddSingleton<SettingsHelper>()

                .AddSingleton<SmoothingSegmentsContainer>()

                .AddSingleton<SpectraContainer>()

                .AddSingleton<SpectrumChartOptionsModel>()

                .AddSingleton<StorageItemsAccessHelper>()
@@ -151,6 +152,8 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                .AddScoped<ProcessedSpectraContainer>()

                .AddScoped<ResultingSpectrumInfo>()

                .AddScoped<SmoothingHelper>()

                .AddScoped<SmoothingSettingsContainerBySegments>()

                .AddScoped<SmoothingSettingsContainerWholeSpectrum>()

                .AddScoped<StorageItemsHelper>()

                /* transient */

                .AddTransient<AnimationsHelper>()

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

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ using INAF.Apps.Uwp.SLabDataManager.Extensions; 
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.Chart;

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

using INAF.Apps.Uwp.SLabDataManager.ViewModels;

using INAF.Libraries.NetStandard.SLabCommonModels.Extensions;

INAF.Apps.Uwp.SLabDataManager/Extensions/Extensions.cs

+1 −3
Original line number Diff line number Diff line 
using INAF.Apps.Uwp.SLabDataManager.Charts.Smoothing;

using INAF.Libraries.NetStandard.Extensions;

using INAF.Libraries.NetStandard.Extensions;

using INAF.Libraries.NetStandard.Math.Models;

using INAF.Libraries.NetStandard.ScienceModels.Spectra;

using INAF.Libraries.NetStandard.SLabCommonModels.Models.Files;

using INAF.Libraries.NetStandard.SLabCommonModels.Models.Spectrum;

using INAF.Libraries.NetStandard.SLabCommonModels.Models.Spectrum.ProcessedSpectraInfo.Smoothing;

using System;

using System.ComponentModel;

using Telerik.UI.Xaml.Controls.Chart;

INAF.Apps.Uwp.SLabDataManager/Helpers/UI/ZoomHelper.cs

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

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

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

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

using INAF.Libraries.NetStandard.Extensions;

using INAF.Libraries.Uwp.Settings;

INAF.Apps.Uwp.SLabDataManager/INAF.Apps.Uwp.SLabDataManager.csproj

+4 −1
Original line number Diff line number Diff line
@@ -190,8 +190,11 @@ 
    <Compile Include="Models\Chart\ChartSpectrumOfTypeAlignedModel.cs" />

    <Compile Include="Models\Chart\Processing\AppProcessingResult.cs" />

    <Compile Include="Models\Chart\SelectedRefBand.cs" />

    <Compile Include="Models\Chart\Smoothing\ISmoothingSettingsContainer.cs" />

    <Compile Include="Models\Chart\Smoothing\SmoothingSettingsContainerBase.cs" />

    <Compile Include="Models\Chart\Smoothing\SmoothingSettingsContainerWholeSpectrum.cs" />

    <Compile Include="Models\Containers\SpectraContainer.cs" />

    <Compile Include="Models\Chart\Smoothing\SmoothingSegmentsContainer.cs" />

    <Compile Include="Models\Chart\Smoothing\SmoothingSettingsContainerBySegments.cs" />

    <Compile Include="Models\Chart\SpectrumChartOptionsModel.cs" />

    <Compile Include="Constants\Constants.cs" />

    <Compile Include="Constants\Enums.cs" />