Commit 23dcff0e authored by Francesco Carraro's avatar Francesco Carraro
Browse files

fixed point tooltip when changed x axis unit of measure;

parent 0e063139

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

+7 −5
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ namespace INAF.Apps.Uwp.Charts 
        public GridLineVisibility SelectedStripLinesVisibility

        {

            get { return selectedStripLinesVisibility; }

            set { selectedStripLinesVisibility = value; saveStripLinesVisibility(value); RaisePropertyChanged(nameof(SelectedStripLinesVisibility)); }

            private set { selectedStripLinesVisibility = value; saveStripLinesVisibility(value); RaisePropertyChanged(nameof(SelectedStripLinesVisibility)); }

        }



        private List<GridLineVisibility> stripLinesVisibilityValues;
@@ -124,7 +124,7 @@ namespace INAF.Apps.Uwp.Charts 
        public List<ChartPanZoomMode> ChartPanModeValues

        {

            get { return chartPanModeValues; }

            set { chartPanModeValues = value; RaisePropertyChanged(nameof(ChartPanModeValues)); }

            private set { chartPanModeValues = value; RaisePropertyChanged(nameof(ChartPanModeValues)); }

        }



        private ChartPanZoomMode selectedChartPanMode;
@@ -159,7 +159,7 @@ namespace INAF.Apps.Uwp.Charts 
        public List<ChartPanZoomMode> ChartZoomModeValues

        {

            get { return chartZoomModeValues; }

            set { chartZoomModeValues = value; RaisePropertyChanged(nameof(ChartZoomModeValues)); }

            private set { chartZoomModeValues = value; RaisePropertyChanged(nameof(ChartZoomModeValues)); }

        }



        private ChartPanZoomMode selectedChartZoomMode;
@@ -194,7 +194,7 @@ namespace INAF.Apps.Uwp.Charts 
        public WavelengthMeasureUnit SelectedWavelengthMeasureUnit

        {

            get { return selectedWavelengthMeasureUnit; }

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

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

        }



        public List<WavelengthMeasureUnit> WavelengthMeasureUnits { get; set; }
@@ -224,7 +224,7 @@ namespace INAF.Apps.Uwp.Charts 
        public double SelectedXAxisMajorStep

        {

            get { return selectedXAxisMajorStep; }

            set { selectedXAxisMajorStep = value; RaisePropertyChanged(nameof(SelectedXAxisMajorStep)); }

            private set { selectedXAxisMajorStep = value; RaisePropertyChanged(nameof(SelectedXAxisMajorStep)); }

        }



        public List<double> XAxisMajorStepValues { get; private set; }
@@ -269,6 +269,8 @@ namespace INAF.Apps.Uwp.Charts 
            Spectrum = spectrum;



            createSummary();



            setXAxisMajorStep();

        }



        private void switchXAxisValues()

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

+3 −0
Original line number Diff line number Diff line
@@ -254,4 +254,7 @@ 
  <data name="RefSpectrumFileReadingErrorMessage" xml:space="preserve">

    <value>An error occurred while trying ro read REF spectrum file, please check its content</value>

  </data>

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

    <value>Edit visualization options</value>

  </data>

</root>
 
 No newline at end of file

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

+5 −2
Original line number Diff line number Diff line
@@ -230,8 +230,11 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
                        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(() =>

                        {

                            if (spectrumChartOptionsModel.SelectedWavelengthMeasureUnit != Libraries.NetStandard.ScienceModels.Enums.Enums.WavelengthMeasureUnit.Nanometers)

                                spectrum.switchToMeasureUnit(spectrumChartOptionsModel.SelectedWavelengthMeasureUnit);

                        });



                        spectrumChartOptionsModel.setSpectrum(spectrum);

                        WorkingItemsModel.SpectrumChartOptions = spectrumChartOptionsModel;

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

+6 −2
Original line number Diff line number Diff line
@@ -155,7 +155,11 @@ 
                    Margin="8"

                    Grid.Column="2"

                    DataContext="{Binding ElementName=Self, Mode=OneWay}"

                    Flyout="{StaticResource OptionsFlyout}"/>

                    Flyout="{StaticResource OptionsFlyout}">

                <ToolTipService.ToolTip>

                    <TextBlock x:Uid="SpectrumButtonVisualizationOptions" />

                </ToolTipService.ToolTip>

            </Button>

        </Grid>

        <!-- CHART -->

        <Grid Grid.Row="1">
@@ -220,7 +224,7 @@ 
                    <telerikChart:ScatterLineSeries.HorizontalAxis>

                        <telerikChart:LinearAxis Minimum="{x:Bind ViewModel.WorkingItemsModel.SpectrumChartOptions.XAxisBoundaries.MinValue, Mode=OneWay}"

                                                 Maximum="{x:Bind ViewModel.WorkingItemsModel.SpectrumChartOptions.XAxisBoundaries.MaxValue, Mode=OneWay}"

                                                 

                                                 MajorStep="{x:Bind ViewModel.WorkingItemsModel.SpectrumChartOptions.SelectedXAxisMajorStep, Mode=OneWay}"

                                                 Title="{Binding ElementName=Self, Path=DataContext.WorkingItemsModel.SpectrumChartOptions.SelectedWavelengthMeasureUnit, Converter={StaticResource XAxisTitleConverter}, Mode=OneWay}">

                            <telerikChart:LinearAxis.LineStyle>

                                <Style TargetType="Line">