Commit 1662a942 authored by Francesco Carraro's avatar Francesco Carraro
Browse files

fixing UI...

parent 25513c56

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

+10 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ namespace INAF.Apps.Uwp.Charts 
            this.settingsHelper = settingsHelper;



            WavelengthMeasureUnits = Enum.GetValues(typeof(WavelengthMeasureUnit)).Cast<WavelengthMeasureUnit>().ToList();

            WavelengthMeasureUnits.Remove(WavelengthMeasureUnit.None);

            if (!tryReadWavelengthMeasureUnits())

                SelectedWavelengthMeasureUnit = WavelengthMeasureUnit.Nanometers;
@@ -187,7 +188,15 @@ namespace INAF.Apps.Uwp.Charts 
        public WavelengthMeasureUnit SelectedWavelengthMeasureUnit

        {

            get { return selectedWavelengthMeasureUnit; }

            set { selectedWavelengthMeasureUnit = value; saveWavelengthMeasureUnits(value); RaisePropertyChanged(nameof(SelectedWavelengthMeasureUnit)); }

            set

            {

                if (value != selectedWavelengthMeasureUnit)

                {

                    selectedWavelengthMeasureUnit = value;

                    saveWavelengthMeasureUnits(value);

                    RaisePropertyChanged(nameof(SelectedWavelengthMeasureUnit));

                }

            }

        }



        public List<WavelengthMeasureUnit> WavelengthMeasureUnits { get; private set; }

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

+9 −13
Original line number Diff line number Diff line
@@ -69,6 +69,14 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
            SpectrumReader reader = serviceProvider.GetRequiredService<SpectrumReader>();

            SpectrumModel spectrum = await reader.readAsync(spectrumType);



            /* input file has X values in nm but user option may be different, so we need to set x axis values in user-selected unit measure */

            await Task.Run(() =>

            {

                /* switch unit of measure for spectrum, if needed */

                if (spectrumChartOptionsModel.SelectedWavelengthMeasureUnit != WavelengthMeasureUnit.Nanometers)

                    spectrum.switchToMeasureUnit(spectrumChartOptionsModel.SelectedWavelengthMeasureUnit);

            });



            /* if spectrum has been successfully opened, then do operations for showing chart */

            if (spectrum != null)

            {
@@ -79,19 +87,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
                        WorkingItems.RawSpectrumSummary.init(spectrum);



                        spectrumChartOptionsModel.Filename = spectrum.Filename;

                        //spectrumChartOptionsModel.YAxisTitle = "SpectrumYAxisTitle".GetText();



                        /* input file has X values in nm but user option may be different, so we need to set x axis values in user-selected unit measure */

                        await Task.Run(() =>

                        {

                            /* switch unit of measure for spectrum, if needed */

                            if (spectrumChartOptionsModel.SelectedWavelengthMeasureUnit != WavelengthMeasureUnit.Nanometers)

                                spectrum.switchToMeasureUnit(spectrumChartOptionsModel.SelectedWavelengthMeasureUnit);

                        });



                        //spectrumChartOptionsModel.setSpectrum(spectrum);

                        //WorkingItems.SpectrumChartOptions = spectrumChartOptionsModel;

                        //WorkingItems.setSpectrumChartOptionsEventListener();

                        break;

                    case SpectrumType.Ref:

                        await WorkingItems.addOrUpdateSpectrum(spectrum);

INAF.Apps.Uwp.SLabDataManager/Views/ChartPage.xaml

+7 −7

File changed.

Contains only whitespace changes.