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

added call for saving continuum-removed spectrum

parent 9c826b76

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

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<functions>

		<function name="Straight line">

			<helperClass>LinearFitHelper</helperClass>

			<methodName>buildSpline1DFitInterpolant</methodName>

			<methodName>straightLine</methodName>

		</function>

		<function name="Linear spline">

			<helperClass>SplineFitHelper</helperClass>

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

+4 −2
Original line number Diff line number Diff line
@@ -5,8 +5,10 @@ 
		<operation type="Authentication">Account/LoginForJwt</operation>

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

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

		<operation type="SaveAlignedFile">AppSpectraFilesActions/SaveAlignedSpectrum</operation>

		<operation type="SaveFileOfType">AppSpectraFilesActions/SaveSpectrumOfType</operation>

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

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

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

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

		<operation type="IsSavedOnCloud">AppSpectraFilesActions/IsSpectrumSavedOnCloud</operation>

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

	</operationUrls>

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

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts.Containers 
{

    public interface ISpectraContainer

    {

        bool IsAlignedSpectrumSaved { get; set; }



        Task addOrUpdateSpectrumAsync(SpectrumModel spectrum);



        void init();

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

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts.Containers 
        public void removeAlignedSpectrum()

        {

            tryRemoveSpectrumOfTypeAsync(SpectrumType.Aligned);

            IsAlignedSpectrumSaved = false;

        }



        public IEnumerable<SpectrumModel> tryGetSpectraOfTypeOtherThan(IEnumerable<SpectrumType> spectrumTypes)

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

+18 −9
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts.Containers 
        }



        #region properties

        public bool IsAlignedSpectrumSaved { get; set; }



        protected bool isAnySummaryUpdated;

        public bool IsAnySummaryUpdated

        {
@@ -137,11 +135,17 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts.Containers 
            tasks.Add(Task.Run(() =>

            {

                List<double> xvalues = new List<double>();

                foreach (var spectrum in Spectra)

                int spectraNum = Spectra.Count;

                for (int i = 0; i < spectraNum; i++)

                {

                    if (spectrum.IsVisible)

                        xvalues.AddRange(spectrum.Elements.Select(x => x.X));

                    if (spectra[i].IsVisible)

                        xvalues.AddRange(spectra[i].Elements.Select(x => x.X));

                }

                //foreach (var spectrum in Spectra)

                //{

                //    if (spectrum.IsVisible)

                //        xvalues.AddRange(spectrum.Elements.Select(x => x.X));

                //}



                if (xvalues.Count > 0)

                {
@@ -153,11 +157,17 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts.Containers 
            tasks.Add(Task.Run(() =>

            {

                List<double> yvalues = new List<double>();

                foreach (var spectrum in Spectra)

                int spectraNum = Spectra.Count;

                for (int i = 0; i < spectraNum; i++)

                {

                    if (spectrum.IsVisible)

                        yvalues.AddRange(spectrum.Elements.Select(x => x.Y));

                    if (spectra[i].IsVisible)

                        yvalues.AddRange(spectra[i].Elements.Select(x => x.Y));

                }

                //foreach (var spectrum in Spectra)

                //{

                //    if (spectrum.IsVisible)

                //        yvalues.AddRange(spectrum.Elements.Select(x => x.Y));

                //}

                //(double yMin, double yMax) yresult = yvalues.GetBoundaries();

                //yMin = yresult.yMin;

                //yMax = yresult.yMax;
@@ -177,7 +187,6 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts.Containers 


        public virtual void init()

        {

            IsAlignedSpectrumSaved = false;

            IsAnySpectrumLoaded = false;



            XAxisMajorStepValues = new List<double>(2);