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

fixed inheritance and XML generation from spectra processing settngs

parent fa36fbfb

INAF.Apps.Uwp.SLabDataManager/Models/Chart/ChartSpectrumOfTypeAlignedModel.cs

+4 −3
Original line number Diff line number Diff line 
using INAF.Libraries.NetStandard.SLabCommonModels.Models.Spectrum.ProcessedSpectraInfo;

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

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

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

using System;

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



namespace INAF.Apps.Uwp.SLabDataManager.Models.Chart

{

    public sealed class ChartSpectrumOfTypeAlignedModel : ChartSpectrumModel, IChartSpectrumOfTypeProcessedModel

    public sealed class ChartSpectrumOfTypeAlignedModel : ChartSpectrumModel, ISpectrumOfTypeAlignedModel, IChartSpectrumOfTypeProcessedModel

    {

        public ChartSpectrumOfTypeAlignedModel()

        {
@@ -36,7 +37,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Models.Chart 


        public ParentFilesModel ParentFiles { get; set; }



        public IChartSpectrumOfTypeProcessedModel prepareForSaving()

        IChartSpectrumOfTypeProcessedModel IChartSpectrumOfTypeProcessedModel.prepareForSaving()

        {

            setPointsFromElements();

            return this;

INAF.Apps.Uwp.SLabDataManager/Models/Chart/ChartSpectrumOfTypeContinuumRemovedModel.cs

+4 −3
Original line number Diff line number Diff line 
using INAF.Libraries.NetStandard.SLabCommonModels.Models.Spectrum.ProcessedSpectraInfo;

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

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

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

using System;

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



namespace INAF.Apps.Uwp.SLabDataManager.Models.Chart

{

    public sealed class ChartSpectrumOfTypeContinuumRemovedModel : ChartSpectrumModel, IChartSpectrumOfTypeProcessedModel

    public sealed class ChartSpectrumOfTypeContinuumRemovedModel : ChartSpectrumModel, ISpectrumOfTypeContinuumRemovedModel, IChartSpectrumOfTypeProcessedModel

    {

        public ChartSpectrumOfTypeContinuumRemovedModel()

        {
@@ -36,7 +37,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Models.Chart 


        public ParentFilesModel ParentFiles { get; set; }



        public IChartSpectrumOfTypeProcessedModel prepareForSaving()

        IChartSpectrumOfTypeProcessedModel IChartSpectrumOfTypeProcessedModel.prepareForSaving()

        {

            setPointsFromElements();

            return this;

INAF.Apps.Uwp.SLabDataManager/Models/Chart/ChartSpectrumOfTypeSmoothedModel.cs

+4 −3
Original line number Diff line number Diff line 
using INAF.Libraries.NetStandard.SLabCommonModels.Models.Spectrum.ProcessedSpectraInfo;

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

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

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

using System;

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



namespace INAF.Apps.Uwp.SLabDataManager.Models.Chart

{

    public sealed class ChartSpectrumOfTypeSmoothedModel : ChartSpectrumModel, IChartSpectrumOfTypeProcessedModel

    public sealed class ChartSpectrumOfTypeSmoothedModel : ChartSpectrumModel, ISpectrumOfTypeSmoothedModel, IChartSpectrumOfTypeProcessedModel

    {

        public ChartSpectrumOfTypeSmoothedModel()

        {
@@ -36,7 +37,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Models.Chart 


        public ParentFilesModel ParentFiles { get; set; }



        public IChartSpectrumOfTypeProcessedModel prepareForSaving()

        IChartSpectrumOfTypeProcessedModel IChartSpectrumOfTypeProcessedModel.prepareForSaving()

        {

            setPointsFromElements();

            return this;

INAF.Apps.Uwp.SLabDataManager/Models/Chart/IChartSpectrumModel.cs

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
using INAF.Libraries.NetStandard.SLabCommonModels.Models.Spectrum;

using System.Collections.Generic;

using System.Collections.ObjectModel;

using System.Linq;

using Windows.UI.Xaml.Media;

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

INAF.Apps.Uwp.SLabDataManager/ViewModels/ChartViewModelAlignment.cs

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ using INAF.Apps.Uwp.SLabDataManager.Extensions; 
using INAF.Apps.Uwp.SLabDataManager.Helpers;

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

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

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

using INAF.Libraries.NetStandard.SLabCommonModels.Models.WebApp.Responses;

using System.Threading.Tasks;

using static INAF.Apps.Uwp.SLabDataManager.Constants.Enums;
@@ -90,6 +91,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
        {

            ((T)WorkingItems.SpectraContainer.tryGetSpectrumOfType(spectrumType)).prepareForSaving();

        }



        private async Task saveSpectrumOfTypeAlignedCloudAndLocalAsync(StorageItemType fileExt)

        {

            prepareProcessedSpectrumForSaving<ChartSpectrumOfTypeAlignedModel>(SpectrumType.Aligned);