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

fixed saving of continuum removed settings

parent db72e5de

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

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                .AddTransient<LinearFitHelper>()

                .AddTransient<LinearProcessingHelper>()

                .AddTransient<SplineProcessingHelper>()

                .AddTransient<RemoteOperationsHelper>()

                .AddTransient<RemoteOperationsManager>()

                .AddTransient<RemoteOperationsXmlReader>()

                .AddTransient<SegmentFitModelsFactory>()

INAF.Apps.Uwp.SLabDataManager/Assets/xml/remoteoperations.xml

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
	<baseUrl>http://localhost:81</baseUrl>

	<operationUrls>

		<operation type="Authentication">Account/LoginForJwt</operation>

		<operation type="CheckAlive">AppActions/CheckAlive</operation>

		<operation type="IsTokenValid">Account/IsTokenValid</operation>

		<operation type="IsLoginValid">Account/IsLoginValid</operation>

		<operation type="SaveSpectrumOfTypeAligned">AppSpectraFilesActions/SaveSpectrumOfTypeAligned</operation>

INAF.Apps.Uwp.SLabDataManager/Charts/Containers/SpectraContainer.cs

+5 −0
Original line number Diff line number Diff line
@@ -71,6 +71,11 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts.Containers 
            return clonedSpectrum;

        }



        public int getSpectraNum()

        {

            return spectra.Count;

        }



        public bool isAnySpectrumOfType(SpectrumType spectrumType)

        {

            return Spectra.Any(x => x.Type == spectrumType);

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

+3 −2
Original line number Diff line number Diff line
@@ -326,10 +326,11 @@ namespace INAF.Apps.Uwp.SLabDataManager.Extensions 


        public static SegmentFitModel ToSegmentFitModel(this INAF.Apps.Uwp.SLabDataManager.Models.Fit.SegmentFitModel segment)

        {

            return new SegmentFitModel(segment.SelectedFitMethod.Name,

            return new SegmentFitModel(segment.Id,

                                       segment.SelectedFitMethod.MethodName,

                                       segment.P1.X,

                                       segment.P2.X,

                                       segment.SelectedFitMethod.ParameterConstraintValue.Value); ;

                                       segment.SelectedFitMethod.ParameterConstraintValue?.Value);

        }



        public static SolidColorBrush ToSolidColorBrush(this string hexstring)

INAF.Apps.Uwp.SLabDataManager/Helpers/RemoteOperations/RemoteOperationsHelper.cs

deleted100644 → 0
+0 −76
Original line number Diff line number Diff line 
using INAF.Libraries.NetStandard.SLabCommonModels.Models.Files;

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

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

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

using System;

using System.Threading.Tasks;



namespace INAF.Apps.Uwp.SLabDataManager.Helpers.RemoteOperations

{

    public sealed class RemoteOperationsHelper

    {

        private readonly RemoteOperationsManager remoteOperationsManager;



        public RemoteOperationsHelper(RemoteOperationsManager remoteOperationsManager)

        {

            this.remoteOperationsManager = remoteOperationsManager;

        }



        public async Task<GenericIdResponseModel> isSavedOnCloudAsync(string filename)

        {

            var requestModel = new IsFileSavedOnCloudRequestModel()

            {

                Filename = filename

            };

            return await remoteOperationsManager.isSavedOnCloudAsync(requestModel);

        }



        public async Task<GenericIdResponseModel> saveSpectrumOfTypeAlignedAsync(SaveSpectrumOfTypeAlignedRequestModel saveSpectrumRequest)

        {

            try

            {

                return await remoteOperationsManager.saveSpectrumOfTypeAlignedAsync(saveSpectrumRequest);

            }

            catch (Exception ex)

            {

                return new GenericIdResponseModel() { IsOk = false };

            }

        }



        public async Task<GenericIdResponseModel> saveSpectrumOfTypeContinuumRemovedAsync(SaveSpectrumOfTypeContinuumRemovedRequestModel saveSpectrumRequest)

        {

            try

            {

                return await remoteOperationsManager.saveSpectrumOfTypeContinuumRemovedAsync(saveSpectrumRequest);

            }

            catch (Exception ex)

            {

                return new GenericIdResponseModel() { IsOk = false };

            }

        }



        public async Task<GenericIdResponseModel> saveSpectrumOfTypeRawAsync(SaveSpectrumOfTypeRawRequestModel saveSpectrumRequest)

        {

            try

            {

                return await remoteOperationsManager.saveSpectrumOfTypeRawAsync(saveSpectrumRequest);

            }

            catch (Exception ex)

            {

                return new GenericIdResponseModel() { IsOk = false };

            }

        }



        public async Task<GenericIdResponseModel> saveSpectrumSampleDataAsync(SampleDataSelectedValuesModel saveSampleDataRequest)

        {

            try

            {

                return await remoteOperationsManager.saveSpectrumSampleDataAsync(saveSampleDataRequest);

            }

            catch (Exception ex)

            {

                return new GenericIdResponseModel() { IsOk = false };

            }

        }

    }

}