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

adding second window for continuum analysis

parent 83da616f

INAF.Apps.Uwp.SLabDataManager.sln

+22 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "INAF.Libraries.Uwp.RemoteAu 
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}"

EndProject

Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "INAF.Libraries.NetStandard.AlgLib", "..\..\Libraries\NetStandard\INAF.Libraries.NetStandard.AlgLib\INAF.Libraries.NetStandard.AlgLib\INAF.Libraries.NetStandard.AlgLib.csproj", "{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}"

EndProject

Global

	GlobalSection(SolutionConfigurationPlatforms) = preSolution

		Debug|Any CPU = Debug|Any CPU
@@ -287,6 +289,26 @@ Global 
		{E02E4913-486E-4EFA-9057-B8936ADB2AD0}.Release|x64.Build.0 = Release|Any CPU

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

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

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Debug|Any CPU.Build.0 = Debug|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Debug|ARM.ActiveCfg = Debug|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Debug|ARM.Build.0 = Debug|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Debug|ARM64.ActiveCfg = Debug|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Debug|ARM64.Build.0 = Debug|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Debug|x64.ActiveCfg = Debug|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Debug|x64.Build.0 = Debug|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Debug|x86.ActiveCfg = Debug|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Debug|x86.Build.0 = Debug|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Release|Any CPU.ActiveCfg = Release|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Release|Any CPU.Build.0 = Release|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Release|ARM.ActiveCfg = Release|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Release|ARM.Build.0 = Release|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Release|ARM64.ActiveCfg = Release|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Release|ARM64.Build.0 = Release|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Release|x64.ActiveCfg = Release|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Release|x64.Build.0 = Release|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Release|x86.ActiveCfg = Release|Any CPU

		{1BA32F86-A1B8-4DE2-83A0-E75DA27355F3}.Release|x86.Build.0 = Release|Any CPU

	EndGlobalSection

	GlobalSection(SolutionProperties) = preSolution

		HideSolutionNode = FALSE

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

+11 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ using INAF.Apps.Uwp.SLabDataManager.Models; 
using INAF.Apps.Uwp.SLabDataManager.Models.Spectrum;

using INAF.Apps.Uwp.SLabDataManager.Services;

using INAF.Apps.Uwp.SLabDataManager.ViewModels;

using INAF.Libraries.NetStandard.AlgLib;

using INAF.Libraries.Uwp.Logging;

using INAF.Libraries.Uwp.RemoteAuthentication;

using INAF.Libraries.Uwp.Settings;
@@ -22,6 +23,8 @@ using Microsoft.Toolkit.Mvvm.DependencyInjection; 
using System;

using System.Collections.Generic;

using Windows.ApplicationModel.Activation;

using Windows.UI;

using Windows.UI.WindowManagement;

using Windows.UI.Xaml;



namespace INAF.Apps.Uwp.SLabDataManager
@@ -31,6 +34,7 @@ namespace INAF.Apps.Uwp.SLabDataManager 
        private Lazy<ActivationService> _activationService;



        public static Dictionary<string, object> AppDictionary;

        public static Dictionary<UIContext, AppWindow> AppWindows;



        private ActivationService ActivationService

        {
@@ -100,6 +104,9 @@ namespace INAF.Apps.Uwp.SLabDataManager 
            /* create app dictionary shared across all app */

            AppDictionary = new Dictionary<string, object>();



            /* create app dictionary for AppWindow instances */

            AppWindows = new Dictionary<UIContext, AppWindow>();



            /* init logger */

            Logger logger = new Logger();

            logger.Init("Inaf.Apps.Uwp.SLabDataManager.log");
@@ -112,11 +119,11 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                .AddSingleton<Logger>(logger)

                .AddSingleton<RecentFilesHelper>()

                .AddSingleton<RemoteOperationsRepository>()

                .AddSingleton<SecondaryWindowHelper>()

                .AddSingleton<SelectedRefBand>()

                .AddSingleton<SettingsHelper>()

                .AddSingleton<SpectrumAlignmentConfigModel>()

                .AddSingleton<SpectrumChartOptionsModel>()

                .AddSingleton<SpectraContainer>()

                .AddSingleton<StorageItemsSettingsHelper>()

                .AddSingleton<StorageItemsAccessHelper>()

                .AddSingleton<UpdateUIHelper>()
@@ -128,12 +135,15 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                .AddTransient<RemoteOperationsHelper>()

                .AddTransient<RemoteOperationsManager>()

                .AddTransient<RemoteOperationsXmlReader>()

                .AddTransient<SpectraContainer>()

                .AddTransient<SpectrumModelFactory>()

                .AddTransient<SpectrumProcessingHelper>()

                .AddTransient<SpectrumReader>()

                .AddTransient<SplineFitHelper>()

                .AddTransient<XmlHelper>()

                /* view models */

                .AddSingleton<ChartViewModel>()

                .AddSingleton<ContinuumAnalysisViewModel>()

                .AddTransient<LoginViewModel>()

                .AddTransient<LoginCheckViewModel>()

                .AddSingleton<MainViewModel>()

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

+20 −14
Original line number Diff line number Diff line
@@ -177,18 +177,18 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts 
            await updateBoundariesAsync();

        }



        private void setXAxisMajorStep(WavelengthMeasureUnit wavelengthMeasureUnit)

        {

            switch (wavelengthMeasureUnit)

            {

                case WavelengthMeasureUnit.Nanometers:

                    SelectedXAxisMajorStep = XAxisMajorStepValues.FirstOrDefault(x => x == Constants.Constants.X_AXIS_MAJOR_STEP_100);

                    break;

                case WavelengthMeasureUnit.Microns:

                    SelectedXAxisMajorStep = XAxisMajorStepValues.FirstOrDefault(x => x == Constants.Constants.X_AXIS_MAJOR_STEP_0DOT1);

                    break;

            }

        }

        //private void setXAxisMajorStep(WavelengthMeasureUnit wavelengthMeasureUnit)

        //{

        //    switch (wavelengthMeasureUnit)

        //    {

        //        case WavelengthMeasureUnit.Nanometers:

        //            SelectedXAxisMajorStep = XAxisMajorStepValues.FirstOrDefault(x => x == Constants.Constants.X_AXIS_MAJOR_STEP_100);

        //            break;

        //        case WavelengthMeasureUnit.Microns:

        //            SelectedXAxisMajorStep = XAxisMajorStepValues.FirstOrDefault(x => x == Constants.Constants.X_AXIS_MAJOR_STEP_0DOT1);

        //            break;

        //    }

        //}



        public void setYAxisTitle(string title)

        {
@@ -205,6 +205,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts 
        #region spectra

        public async Task addOrUpdateSpectrumAsync(SpectrumModel spectrum)

        {

            if (isAnySummaryOfType(spectrum.Type))

                tryGetSummaryOfType(spectrum.Type).init(spectrum);



            if (Spectra.Any(x => x.Type == spectrum.Type))
@@ -244,7 +245,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts 
        }

        #endregion



        public void addSpectrum(SpectrumModel spectrum)

        private void addSpectrum(SpectrumModel spectrum)

        {

            spectrum.setColor();

            Spectra.Add(spectrum);
@@ -293,6 +294,11 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts 
                requestedSummary.reset();

        }



        public bool isAnySummaryOfType(SpectrumType spectrumType)

        {

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

        }



        public SpectrumSummaryModel tryGetSummaryOfType(SpectrumType spectrumType)

        {

            return Summaries.FirstOrDefault(x => x.Type == spectrumType);

INAF.Apps.Uwp.SLabDataManager/Charts/SpectrumChartOptionsModel.cs

+5 −0
Original line number Diff line number Diff line
@@ -181,6 +181,11 @@ namespace INAF.Apps.Uwp.Charts 
        }

        #endregion



        //public void p()

        //{

        //    RaisePropertyChanged(nameof(MajorLinesVisibilityValues));

        //}



        #region WavelengthMeasureUnits

        private WavelengthMeasureUnit selectedWavelengthMeasureUnit;

        public WavelengthMeasureUnit SelectedWavelengthMeasureUnit

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

+1 −29
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Converters 
                string _spectrumType = (string)parameter;

                SpectrumType spectrumType = _spectrumType.ToSpectrumType();



                SpectraContainer spectraContainer = Ioc.Default.GetService<SpectraContainer>();

                SpectraContainer spectraContainer = Ioc.Default.GetService<WorkingItemsModel>().SpectraContainer;

                return spectraContainer.isAnySpectrumOfType(spectrumType);

            }

            catch (Exception)
@@ -274,34 +274,6 @@ namespace INAF.Apps.Uwp.SLabDataManager.Converters 
    {

        public object Convert(object value, Type targetType, object parameter, string language)

        {

            //try

            //{

            //    string format = string.Empty;



            //    WorkingItemsModel workingItemsModel = Ioc.Default.GetService<WorkingItemsModel>();



            //    var selectedUnitMeasure = workingItemsModel.SpectrumChartOptions.SelectedWavelengthMeasureUnit;



            //    switch (selectedUnitMeasure)

            //    {

            //        //case Libraries.NetStandard.ScienceModels.Enums.Enums.WavelengthMeasureUnit.Nanometers:

            //        //    format = "N";

            //        //    break;

            //        case Libraries.NetStandard.ScienceModels.Enums.Enums.WavelengthMeasureUnit.Microns:

            //            format = "{0:0.###E-0}";

            //            break;

            //        default:

            //            format = "{0:G}";

            //            break;

            //    }



            //    return format;

            //}

            //catch (Exception)

            //{

            //    return "{0:G}";

            //}



            return "{0:G}"; ;

        }