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

trying to mke it working again...

parent 9287c715

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

+2 −5
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ using INAF.Apps.Uwp.SLabDataManager.Helpers.UI; 
using INAF.Apps.Uwp.SLabDataManager.Helpers.UI.Chart;

using INAF.Apps.Uwp.SLabDataManager.Models;

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

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

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

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

using INAF.Apps.Uwp.SLabDataManager.Services;
@@ -14,12 +13,12 @@ using INAF.Apps.Uwp.SLabDataManager.ViewModels; 
using INAF.Apps.Uwp.SLabDataManager.ViewModels.ContentDialogsViewModel;

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

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

using INAF.Libraries.NetStandard.HyperLabCommonHelpers;

using INAF.Libraries.NetStandard.HyperLabCommonHelpers.ProcessingHelpers;

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

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

using INAF.Libraries.NetStandard.Math.Models;

using INAF.Libraries.NetStandard.Math.Smoothing;

using INAF.Libraries.NetStandard.HyperLabCommonHelpers;

using INAF.Libraries.NetStandard.HyperLabCommonHelpers.ProcessingHelpers;

using INAF.Libraries.Uwp.Logging;

using INAF.Libraries.Uwp.Settings;

using INAF.Libraries.Uwp.Settings.RecentStorageItems;
@@ -28,14 +27,12 @@ using Microsoft.AppCenter; 
using Microsoft.AppCenter.Analytics;

using Microsoft.AppCenter.Crashes;

using Microsoft.Extensions.DependencyInjection;

using Microsoft.Toolkit.Uwp.UI.Controls;

using System;

using System.Collections.Generic;

using Windows.ApplicationModel.Activation;

using Windows.UI;

using Windows.UI.WindowManagement;

using Windows.UI.Xaml;

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



namespace INAF.Apps.Uwp.SLabDataManager

{

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

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

<remoteOperationsData>

	<!-- baseUrl has been moved into appsettings.json -->

	<!--<baseUrl>http://melody.iaps.inaf.it:80</baseUrl>-->

	<!--<baseUrl>http://localhost:81</baseUrl>-->

	<operationUrls>

		<!-- ACCOUNT -->

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

INAF.Apps.Uwp.SLabDataManager/Constants/Constants.cs

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
        public static readonly string XML_CONTINUUM_REMOVAL_SETTINGS = "ContinuumRemovalSettings";

        public static readonly string XML_CONTINUUM_REMOVAL_SETTINGS_SEGMENT_FIT_METHOD_NAME = "FitMethodName";

        public static readonly string XML_CONTINUUM_REMOVAL_SETTINGS_SEGMENT_PARAMETER_VALUE = "ParameterValue";

        public static readonly string XML_ELEMENTS = "Elements";

        public static readonly string XML_ELEMENTS = "Points";

        public static readonly string XML_ELEMENT = "Element";

        public static readonly string XML_NUM_OF_POINTS = "NumOfPoints";

        public static readonly string XML_RAW_FILENAME = "RawFilename";

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

+6 −3
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Converters 
                SpectraContainer spectraContainer = value as SpectraContainer;

                var rawSpectrum = spectraContainer.tryGetSpectrumOfType(SpectrumType.Raw);

                if (rawSpectrum != null)

                    return rawSpectrum.Elements;

                    return rawSpectrum.Points;

                else

                    return null;

            }
@@ -384,9 +384,12 @@ namespace INAF.Apps.Uwp.SLabDataManager.Converters 
        {

            try

            {

                string userControlName = (string)parameter;



                var userControlsHelper = Ioc.Default.GetRequiredService<UserControlsHelper>();



                if (userControlsHelper.RequiredUserControlName == null)

                    return false;



                string userControlName = (string)parameter;

                return userControlsHelper.RequiredUserControlName.Equals(userControlName);

            }

            catch (Exception)

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

+1 −16
Original line number Diff line number Diff line
@@ -41,21 +41,6 @@ namespace INAF.Apps.Uwp.SLabDataManager.Extensions 
            }

        }



        public static PointModel ToPointModel(this ElementModel element)

        {

            try

            {

                if (element.YStdDev == null)

                    return new PointModel(element.getValueInNanometers(), element.Y);

                else

                    return new PointModel(element.getValueInNanometers(), element.Y, (double)element.YStdDev);

            }

            catch (Exception)

            {

                return null;

            }

        }



        public static PointModel ToPointModel(this Tuple<object, object> tuple)

        {

            try
@@ -81,7 +66,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Extensions 
        #endregion



        #region elements

        public static XmlElement ToXmlNode(this ElementModel element, XmlDocument dom)

        public static XmlElement ToXmlNode(this PointModel element, XmlDocument dom)

        {

            var xmlelement = dom.CreateElement(Constants.Constants.XML_ELEMENT);