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

working on chart...

parent 65eb9cbd

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

+61 −0
Original line number Diff line number Diff line
@@ -39,6 +39,67 @@ namespace INAF.Apps.Uwp.SLabDataManager.Converters 
        }

    }



    public sealed class XAxisTitleConverter : IValueConverter

    {

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

        {

            try

            {

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



                return "SpectrumXAxisTitle".GetText().Replace("r_v", workingItemsModel.Spectrum.SelectedWavelengthMeasureUnit.GetDescription());

            }

            catch (Exception)

            {

                return string.Empty;

            }

        }



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

        {

            throw new NotImplementedException();

        }

    }



    public sealed class XScaleLabelFormatConverter : IValueConverter

    {

        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.Spectrum.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}";

            }

        }



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

        {

            throw new NotImplementedException();

        }

    }



    public sealed class StatusToImageConverter : IValueConverter

    {

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

INAF.Apps.Uwp.SLabDataManager/Strings/en-us/Resources.resw

+9 −0
Original line number Diff line number Diff line
@@ -212,4 +212,13 @@ 
  <data name="ChartTooltipLabel" xml:space="preserve">

    <value>x,y: rv_1 rv_mu, rv_2</value>

  </data>

  <data name="SpectrumMeasurementUnitSelectionLabel.Text" xml:space="preserve">

    <value>Select measurement units:</value>

  </data>

  <data name="SpectrumXAxisTitle" xml:space="preserve">

    <value>Wavelengths (r_v)</value>

  </data>

  <data name="SpectrumYAxisTitle" xml:space="preserve">

    <value>Reflectance</value>

  </data>

</root>
 
 No newline at end of file

INAF.Apps.Uwp.SLabDataManager/Styles/Custom.xaml

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
    <converters:StatusToImageConverter x:Key="StatusToImageConverter" />

    <converters:StatusToSolidColorBrushConverter x:Key="StatusToSolidColorBrushConverter" />

    <converters:StatusToVisibilityConverter x:Key="StatusToVisibilityConverter" />

    <converters:XAxisTitleConverter x:Key="XAxisTitleConverter" />

    <converters:XScaleLabelFormatConverter x:Key="XScaleLabelFormatConverter" />



    <SolidColorBrush x:Key="myBackground" Color="#ff3983f9" />

    <SolidColorBrush x:Key="mySemiTransparentBackground" Color="#993983f9" />

INAF.Apps.Uwp.SLabDataManager/ViewModels/ChartViewModel.cs

+8 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
using INAF.Apps.Uwp.SLabDataManager.Core.Services;

using INAF.Libraries.Uwp.Settings;

using INAF.Libraries.Uwp.StorageItemsAccess;

using Microsoft.Toolkit.Mvvm.Input;

using System;

using System.Collections.ObjectModel;

using System.Threading.Tasks;
@@ -21,7 +22,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
        #region navigation events

        public void OnNavigatedTo(NavigationEventArgs e)

        {

            init();

            //init();

        }



        public void OnNavigatingFrom(NavigatingCancelEventArgs e)
@@ -30,9 +31,14 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
        }

        #endregion



        private void init()

        private void showChartOptions()

        {



        }



        #region commands

        private RelayCommand commandShowChartOptions;

        public RelayCommand CommandShowChartOptions => commandShowChartOptions ?? (commandShowChartOptions = new RelayCommand(() => showChartOptions()));

        #endregion

    }

}

INAF.Apps.Uwp.SLabDataManager/ViewModels/MainViewModel.cs

+5 −1
Original line number Diff line number Diff line
@@ -67,7 +67,11 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
                /* ...and manage lines... */

                if (lines?.Count > 0)

                {

                    spectrum = new SpectrumModel();

                    spectrum = new SpectrumModel()

                    {

                        Filename = file.DisplayName,

                        YAxisTitle = "SpectrumYAxisTitle".GetText()

                    };



                    int linesNum = lines.Count;