Commit 5476b6cb authored by Francesco Carraro's avatar Francesco Carraro
Browse files

working on visualization of errorbars...

parent 05835ba8

INAF.Apps.Uwp.SLabDataManager.sln

+0 −22
Original line number Original line Diff line number Diff line
@@ -21,8 +21,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "INAF.Libraries.Uwp.TelerikC 
EndProject

EndProject

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "INAF.Libraries.Uwp.Xml", "..\..\Libraries\Uwp\INAF.Libraries.Uwp.Xml\INAF.Libraries.Uwp.Xml\INAF.Libraries.Uwp.Xml.csproj", "{D9886C08-77CA-49A7-B55C-37613771079B}"

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "INAF.Libraries.Uwp.Xml", "..\..\Libraries\Uwp\INAF.Libraries.Uwp.Xml\INAF.Libraries.Uwp.Xml\INAF.Libraries.Uwp.Xml.csproj", "{D9886C08-77CA-49A7-B55C-37613771079B}"

EndProject

EndProject

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "INAF.Libraries.Uwp.RemoteAuthentication", "..\..\Libraries\Uwp\INAF.Libraries.Uwp.RemoteAuthentication\INAF.Libraries.Uwp.RemoteAuthentication\INAF.Libraries.Uwp.RemoteAuthentication.csproj", "{3931DDE2-4511-4458-B7D7-9E4A723D44B3}"

EndProject

Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "INAF.Libraries.NetStandard.SLabCommonModels", "..\..\Libraries\NetStandard\INAF.Libraries.NetStandard.SLabCommonModels\INAF.Libraries.NetStandard.SLabCommonModels\INAF.Libraries.NetStandard.SLabCommonModels.csproj", "{E02E4913-486E-4EFA-9057-B8936ADB2AD0}"

Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "INAF.Libraries.NetStandard.SLabCommonModels", "..\..\Libraries\NetStandard\INAF.Libraries.NetStandard.SLabCommonModels\INAF.Libraries.NetStandard.SLabCommonModels\INAF.Libraries.NetStandard.SLabCommonModels.csproj", "{E02E4913-486E-4EFA-9057-B8936ADB2AD0}"

EndProject

EndProject

Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "INAF.Libraries.NetStandard.Math", "..\..\Libraries\NetStandard\INAF.Libraries.NetStandard.Math\INAF.Libraries.NetStandard.Math\INAF.Libraries.NetStandard.Math.csproj", "{B3B6C5D4-35FF-46D2-A56C-829E10569601}"

Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "INAF.Libraries.NetStandard.Math", "..\..\Libraries\NetStandard\INAF.Libraries.NetStandard.Math\INAF.Libraries.NetStandard.Math\INAF.Libraries.NetStandard.Math.csproj", "{B3B6C5D4-35FF-46D2-A56C-829E10569601}"
@@ -227,26 +225,6 @@ Global 
		{D9886C08-77CA-49A7-B55C-37613771079B}.Release|x64.Build.0 = Release|x64

		{D9886C08-77CA-49A7-B55C-37613771079B}.Release|x64.Build.0 = Release|x64

		{D9886C08-77CA-49A7-B55C-37613771079B}.Release|x86.ActiveCfg = Release|x86

		{D9886C08-77CA-49A7-B55C-37613771079B}.Release|x86.ActiveCfg = Release|x86

		{D9886C08-77CA-49A7-B55C-37613771079B}.Release|x86.Build.0 = Release|x86

		{D9886C08-77CA-49A7-B55C-37613771079B}.Release|x86.Build.0 = Release|x86

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Debug|Any CPU.Build.0 = Debug|Any CPU

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Debug|ARM.ActiveCfg = Debug|ARM

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Debug|ARM.Build.0 = Debug|ARM

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Debug|ARM64.ActiveCfg = Debug|ARM64

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Debug|ARM64.Build.0 = Debug|ARM64

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Debug|x64.ActiveCfg = Debug|x64

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Debug|x64.Build.0 = Debug|x64

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Debug|x86.ActiveCfg = Debug|x86

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Debug|x86.Build.0 = Debug|x86

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Release|Any CPU.ActiveCfg = Release|Any CPU

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Release|Any CPU.Build.0 = Release|Any CPU

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Release|ARM.ActiveCfg = Release|ARM

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Release|ARM.Build.0 = Release|ARM

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Release|ARM64.ActiveCfg = Release|ARM64

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Release|ARM64.Build.0 = Release|ARM64

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Release|x64.ActiveCfg = Release|x64

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Release|x64.Build.0 = Release|x64

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Release|x86.ActiveCfg = Release|x86

		{3931DDE2-4511-4458-B7D7-9E4A723D44B3}.Release|x86.Build.0 = Release|x86

		{E02E4913-486E-4EFA-9057-B8936ADB2AD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

		{E02E4913-486E-4EFA-9057-B8936ADB2AD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

		{E02E4913-486E-4EFA-9057-B8936ADB2AD0}.Debug|Any CPU.Build.0 = Debug|Any CPU

		{E02E4913-486E-4EFA-9057-B8936ADB2AD0}.Debug|Any CPU.Build.0 = Debug|Any CPU

		{E02E4913-486E-4EFA-9057-B8936ADB2AD0}.Debug|ARM.ActiveCfg = Debug|Any CPU

		{E02E4913-486E-4EFA-9057-B8936ADB2AD0}.Debug|ARM.ActiveCfg = Debug|Any CPU

INAF.Apps.Uwp.SLabDataManager/App.xaml

+7 −7
Original line number Original line Diff line number Diff line
@@ -8,14 +8,14 @@ 
        <ResourceDictionary>

        <ResourceDictionary>

            <ResourceDictionary.MergedDictionaries>

            <ResourceDictionary.MergedDictionaries>

                <XamlControlsResources  xmlns="using:Microsoft.UI.Xaml.Controls" />

                <XamlControlsResources  xmlns="using:Microsoft.UI.Xaml.Controls" />

                <ResourceDictionary Source="/Styles/_Colors.xaml" />

                <ResourceDictionary Source="ms-appx:///Styles/_Colors.xaml" />

                <ResourceDictionary Source="/Styles/_FontSizes.xaml" />

                <ResourceDictionary Source="ms-appx:///Styles/_FontSizes.xaml" />

                <ResourceDictionary Source="/Styles/_Thickness.xaml" />

                <ResourceDictionary Source="ms-appx:///Styles/_Thickness.xaml" />





                <ResourceDictionary Source="/Styles/Custom.xaml" />

                <ResourceDictionary Source="ms-appx:///Styles/Custom.xaml" />





                <ResourceDictionary Source="/Styles/TextBlock.xaml" />

                <ResourceDictionary Source="ms-appx:///Styles/TextBlock.xaml" />

                <ResourceDictionary Source="/Styles/Page.xaml"/>

                <ResourceDictionary Source="ms-appx:///Styles/Page.xaml"/>

            </ResourceDictionary.MergedDictionaries>

            </ResourceDictionary.MergedDictionaries>

        </ResourceDictionary>

        </ResourceDictionary>

    </Application.Resources>

    </Application.Resources>

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ using INAF.Libraries.NetStandard.Math.Fit.Linear; 
using INAF.Libraries.NetStandard.Math.Fit.Spline;

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

using INAF.Libraries.NetStandard.Math.Smoothing;

using INAF.Libraries.NetStandard.Math.Smoothing;

using INAF.Libraries.Uwp.Logging;

using INAF.Libraries.Uwp.Logging;

using INAF.Libraries.Uwp.RemoteAuthentication;

using INAF.Libraries.Uwp.Settings;

using INAF.Libraries.Uwp.Settings;

using INAF.Libraries.Uwp.Settings.RecentStorageItems;

using INAF.Libraries.Uwp.Settings.RecentStorageItems;

using INAF.Libraries.Uwp.Xml;

using INAF.Libraries.Uwp.Xml;
@@ -93,7 +92,7 @@ namespace INAF.Apps.Uwp.SLabDataManager 
            var settingsHelper = Ioc.Default.GetService<SettingsHelper>();

            var settingsHelper = Ioc.Default.GetService<SettingsHelper>();

            if (settingsHelper.contains(Constants.Constants.AUTHENTICATION_TOKEN))

            if (settingsHelper.contains(Constants.Constants.AUTHENTICATION_TOKEN))

            {

            {

                AuthenticationManager authenticationManager = Ioc.Default.GetService<AuthenticationManager>();

                RemoteAuthenticationHelper authenticationManager = Ioc.Default.GetService<RemoteAuthenticationHelper>();

                if (!authenticationManager.isAuthenticationExpired(Constants.Constants.AUTHENTICATION_TOKEN))

                if (!authenticationManager.isAuthenticationExpired(Constants.Constants.AUTHENTICATION_TOKEN))

                    return new ActivationService(this, typeof(Views.LoginCheckPage), new Lazy<UIElement>(CreateShell));

                    return new ActivationService(this, typeof(Views.LoginCheckPage), new Lazy<UIElement>(CreateShell));

            }

            }
@@ -144,6 +143,7 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                .AddSingleton<WorkingItemsModel>()

                .AddSingleton<WorkingItemsModel>()

                /* scoped */

                /* scoped */

                .AddScoped<ActionQuestionViewModel>()

                .AddScoped<ActionQuestionViewModel>()

                .AddScoped<AppConfig>()

                .AddScoped<LegendItemsHelper>()

                .AddScoped<LegendItemsHelper>()

                .AddScoped<MultipleSelectionViewModel>()

                .AddScoped<MultipleSelectionViewModel>()

                .AddScoped<ProcessedSpectraContainer>()

                .AddScoped<ProcessedSpectraContainer>()
@@ -152,7 +152,7 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                /* transient */

                /* transient */

                .AddTransient<AnimationsHelper>()

                .AddTransient<AnimationsHelper>()

                .AddTransient<AppVersionUpdateHelper>()

                .AddTransient<AppVersionUpdateHelper>()

                .AddTransient<AuthenticationManager>()

                .AddTransient<RemoteAuthenticationHelper>()

                .AddTransient<LabSpectrumFileReader>()

                .AddTransient<LabSpectrumFileReader>()

                .AddTransient<LinearFitHelper>()

                .AddTransient<LinearFitHelper>()

                .AddTransient<LinearProcessingHelper>()

                .AddTransient<LinearProcessingHelper>()

INAF.Apps.Uwp.SLabDataManager/AppConfig.cs

0 → 100644
+28 −0
Original line number Original line Diff line number Diff line 
using Microsoft.Extensions.Configuration;

using Windows.ApplicationModel;



namespace INAF.Apps.Uwp.SLabDataManager

{

    public sealed class AppConfig

    {

        private readonly IConfigurationRoot configurationRoot;



        public AppConfig()

        {

            var builder = new ConfigurationBuilder()

                                .SetBasePath(Package.Current.InstalledLocation.Path)

#if DEBUG

                                .AddJsonFile("appsettings.development.json", optional: false);

#else

                                .AddJsonFile("appsettings.json", optional: false);

#endif



            configurationRoot = builder.Build();

        }



        public string getValue(string key)

        {

            return configurationRoot.GetSection("AppSettings").GetValue<string>(key);

        }

    }

}

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -2,11 +2,12 @@ 
<logbook>

<logbook>

	<updates>

	<updates>

		<fixes>

		<fixes>

			<fix>Fixed issue in saving input lab files. Previously no Level was set</fix>

			<fix>Fixed connection configuration</fix>

			<fix>Fixed error in saving spectrum sample data and measurement info</fix>

		</fixes>

		</fixes>

		<addings>

		<!--<addings>

			<adding>Creation of averaged files from single acquisitions</adding>

			<adding>Creation of averaged files from single acquisitions</adding>

			<adding>Save single acquisitions into DB as source of averaged file and retrieve as info</adding>

			<adding>Save single acquisitions into DB as source of averaged file and retrieve as info</adding>

		</addings>

		</addings>-->

	</updates>

	</updates>

</logbook>
 
</logbook>
 
 No newline at end of file