Commit 9c826b76 authored by Francesco Carraro's avatar Francesco Carraro
Browse files

fixing removal of continuum

parent bc3eacff

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

+5 −4
Original line number Diff line number Diff line
@@ -119,13 +119,14 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                new ServiceCollection()

                /* singletons */

                .AddSingleton<ChartAnnotationsHelper>()

                .AddSingleton<ContinuumMissingPointsHelper>()

                .AddSingleton<ContinuumSpectraContainer>()

                .AddSingleton<FitMethodsContainer>()

                .AddSingleton<FitMethodsHelper>()

                .AddSingleton<Logger>(logger)

                .AddSingleton<RecentFilesHelper>()

                .AddSingleton<RemoteOperationsRepository>()

                .AddSingleton<SecondaryWindowHelper>()

                .AddSingleton<SegmentsFitModelContainer>()

                .AddSingleton<SegmentsFitModelHelper>()

                .AddSingleton<SelectedRefBand>()

                .AddSingleton<SettingsHelper>()

                .AddSingleton<SpectraContainer>()
@@ -139,7 +140,7 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                /* transient */

                .AddTransient<AuthenticationManager>()

                .AddTransient<ConfigReader>()

                .AddTransient<ContinuumMissingPointsHelper>()

                .AddTransient<ContinuumRemovalHelper>()

                .AddTransient<FitFunctionsReader>()

                .AddTransient<LinearFitHelper>()

                .AddTransient<LinearProcessingHelper>()
@@ -164,7 +165,7 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                .AddSingleton<ShellViewModel>()



                .BuildServiceProvider()

                ); ;

                );



        }

    }

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

0 → 100644
+44 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8" ?>

<fit>

	<!-- FUNCTIONS -->

	<functions>

		<function name="Straight line">

			<helperClass>LinearFitHelper</helperClass>

			<methodName>buildSpline1DFitInterpolant</methodName>

		</function>

		<function name="Linear spline">

			<helperClass>SplineFitHelper</helperClass>

			<methodName>buildSpline1DFitInterpolant</methodName>

			<parameter name="Regularization constant">

				<default>0.0001</default>

				<minimum>0.0001</minimum>

				<maximum>1</maximum>

			</parameter>

			<explanation>"Param:Regularization constant passed by user;Meaning:Value must be >= 0"</explanation>

		</function>

		<function name="Cubic spline">

			<helperClass>SplineFitHelper</helperClass>

			<methodName>buildSpline1DFitCubicInterpolant</methodName>

			<parameter name="Number of basis functions">

				<default>4</default>

				<minimum>4</minimum>

				<maximum>100</maximum>

			</parameter>

			<explanation>"Param:Number of basis functions;Meaning:Value must be >= 4"</explanation>

		</function>

		<function name="Hermite spline">

			<helperClass>SplineFitHelper</helperClass>

			<methodName>buildSpline1DFitHermiteInterpolant</methodName>

			<parameter name="Number of basis functions">

				<default>4</default>

				<minimum>4</minimum>

				<maximum>100</maximum>

			</parameter>

			<explanation>"Param:Number of basis functions;Meaning:Value must be >= 4"</explanation>

		</function>

	</functions>

	<!-- SETTINGS -->

	<settings>

		<numOfPointsForMissingPoints>30</numOfPointsForMissingPoints>

	</settings>

</fit>
 
 No newline at end of file

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

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8" ?>

<functions>

	<function name="Straight line">

		<helperClass>LinearFitHelper</helperClass>

		<methodName>buildSpline1DFitInterpolant</methodName>

	</function>

	<function name="Linear spline">

		<helperClass>SplineFitHelper</helperClass>

		<methodName>buildSpline1DFitInterpolant</methodName>

		<parameter name="Regularization constant">

			<default>0.0001</default>

			<minimum>0.0001</minimum>

			<maximum>1</maximum>

		</parameter>

		<explanation>"Param:Regularization constant passed by user;Meaning:Value must be >= 0"</explanation>

	</function>

	<function name="Cubic spline">

		<helperClass>SplineFitHelper</helperClass>

		<methodName>buildSpline1DFitCubicInterpolant</methodName>

		<parameter name="Number of basis functions">

			<default>4</default>

			<minimum>4</minimum>

			<maximum>100</maximum>

		</parameter>

		<explanation>"Param:Number of basis functions;Meaning:Value must be >= 4"</explanation>

	</function>

	<function name="Hermite spline">

		<helperClass>SplineFitHelper</helperClass>

		<methodName>buildSpline1DFitHermiteInterpolant</methodName>

		<parameter name="Number of basis functions">

			<default>4</default>

			<minimum>4</minimum>

			<maximum>100</maximum>

		</parameter>

		<explanation>"Param:Number of basis functions;Meaning:Value must be >= 4"</explanation>

	</function>

</functions>
 
 No newline at end of file

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

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


        void raiseIsAnySpectrumLoaded();



        void raiseIsUpdateLayoutRequired();



        Task setBoundariesAsync();



        void setYAxisTitle(string title);

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

+0 −14
Original line number Diff line number Diff line
@@ -82,13 +82,6 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts.Containers 
            set { SetProperty(ref isSpectrumContinuumRemoved, value); }

        }



        protected bool isChartUpdateLayoutRequired;

        public bool IsChartUpdateLayoutRequired

        {

            get { return isChartUpdateLayoutRequired; }

            set { SetProperty(ref isChartUpdateLayoutRequired, value); }

        }



        public string YAxisTitle { get; protected set; }



        protected ObservableCollection<SpectrumSummaryModel> summaries;
@@ -186,7 +179,6 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts.Containers 
        {

            IsAlignedSpectrumSaved = false;

            IsAnySpectrumLoaded = false;

            IsChartUpdateLayoutRequired = false;



            XAxisMajorStepValues = new List<double>(2);

            XAxisMajorStepValues.Add(Constants.Constants.X_AXIS_MAJOR_STEP_0DOT1);
@@ -205,12 +197,6 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts.Containers 
            isAnySpectrumRemoved = false;// trick to enable for the next added spectrum

        }



        public void raiseIsUpdateLayoutRequired()

        {

            IsChartUpdateLayoutRequired = true;

            isChartUpdateLayoutRequired = false;

        }



        public async Task setBoundariesAsync()

        {

            (double xMin, double xMax, double yMin, double yMax) result = await getSpectrumAxesBoundariesAsync();