Commit 4d4eda4a authored by Francesco Carraro's avatar Francesco Carraro
Browse files

moved FitMethodModel and related models into INAF.Libraries.NetStandard.SLabCommonModels

parent b0985544

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

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 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.Chart.Fit;

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

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

using INAF.Apps.Uwp.SLabDataManager.Services;
@@ -20,6 +19,8 @@ using INAF.Libraries.NetStandard.Math.Alignment; 
using INAF.Libraries.NetStandard.Math.Fit.Linear;

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

using INAF.Libraries.NetStandard.Math.Smoothing;

using INAF.Libraries.NetStandard.SLabCommonModels.Helpers.UI.Chart;

using INAF.Libraries.NetStandard.SLabCommonModels.Models.Chart.Fit;

using INAF.Libraries.Uwp.Logging;

using INAF.Libraries.Uwp.Settings;

using INAF.Libraries.Uwp.Settings.RecentStorageItems;

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

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

using INAF.Libraries.NetStandard.SLabCommonModels.Models.Chart.Fit.Parameters;

using System;

using Windows.UI.Xaml;

using Windows.UI.Xaml.Data;

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

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

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

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

using INAF.Libraries.NetStandard.Extensions;

using INAF.Libraries.NetStandard.Math.Models;

using INAF.Libraries.NetStandard.ScienceModels.Spectra;

using INAF.Libraries.NetStandard.SLabCommonModels.Models.Chart.Fit;

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

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 INAF.Libraries.NetStandard.SLabCommonModels.Models.Spectrum.ProcessedSpectraInfo.ContinuumRemoval;

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

using System;

using System.ComponentModel;

using System.Text;

using Telerik.UI.Xaml.Controls.Chart;

using Windows.Data.Xml.Dom;

using Windows.UI;
@@ -123,29 +119,6 @@ namespace INAF.Apps.Uwp.SLabDataManager.Extensions 
            return string.Join(string.Empty, ".", fileExt.GetDescription());

        }



        public static SegmentFitSettingsModel ToFitSegmentModel(this SegmentFitModel segment)

        {

            return new SegmentFitSettingsModel(segment.Id,

                                               segment.SelectedFitMethod.MethodName,

                                               segment.P1.X,

                                               segment.P2.X,

                                               segment.SelectedFitMethod.ParameterConstraintValue?.Value);

        }



        public static SegmentFitSettingsModel ToSegmentFitSettingsModel(this SegmentFitModel model)

        {

            var p = new SegmentFitSettingsModel()

            {

                Name = model.SelectedFitMethod.Name,

                FitMethodName = model.SelectedFitMethod.MethodName,

                FitParamValue = (model.SelectedFitMethod.ParameterConstraintValue != null ? model.SelectedFitMethod.ParameterConstraintValue.Value : 0),

                XStart = model.P1.X,

                XEnd = model.P2.X

            };



            return p;

        }



        public static SmoothingSegment ToSmoothingSegment(this SegmentSmoothingSettingsModel segmentSettings)

        {

            return new SmoothingSegment(segmentSettings.Id,

INAF.Apps.Uwp.SLabDataManager/Helpers/FileReaders/AssetFiles/XmlAssetFitFunctionsReader.cs

+3 −3
Original line number Diff line number Diff line 
using INAF.Apps.Uwp.SLabDataManager.Helpers.UI.Chart;

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

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

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

using INAF.Libraries.NetStandard.Extensions;

using INAF.Libraries.NetStandard.SLabCommonModels.Helpers.UI.Chart;

using INAF.Libraries.NetStandard.SLabCommonModels.Models.Chart.Fit;

using INAF.Libraries.Uwp.Logging;

using INAF.Libraries.Uwp.Xml;

using System;

INAF.Apps.Uwp.SLabDataManager/Helpers/UI/Chart/ChartAnnotationsHelper.cs

+1 −1
Original line number Diff line number Diff line 
using INAF.Apps.Uwp.SLabDataManager.Extensions;

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

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

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

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

using INAF.Libraries.NetStandard.Math.Models;

using INAF.Libraries.NetStandard.ScienceModels.Spectra;

using INAF.Libraries.NetStandard.SLabCommonModels.Models.Chart.Fit;

using INAF.Libraries.Uwp.Converters;

using INAF.Libraries.Uwp.Logging;

using System;