fixed string format for Y values with 3 digits (c2f5c502) · Commits · INAF / DotNET / Apps / Uwp / INAF.Apps.Uwp.LabDataManager

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

+18 −17

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ using INAF.Libraries.NetStandard.SLabCommonModels.Extensions;
		using INAF.Libraries.NetStandard.SLabCommonModels.Models.WebApp.Permissions;
		using System;
		using System.Collections.Generic;
		using System.Globalization;
		using System.IO;
		using Telerik.Charting;
		using Windows.UI.Xaml;
		@@ -18,20 +19,24 @@ using static INAF.Libraries.NetStandard.SLabCommonModels.Enums.Enums;

		namespace INAF.Apps.Uwp.SLabDataManager.Converters
		{
		public sealed class DimWithParameterConverter : IValueConverter
		public sealed class ChartDataPointConverter : IValueConverter
		{
		public object Convert(object value, Type targetType, object parameter, string language)
		{
		try
		{
		double dim = (double)value;
		double offset = System.Convert.ToDouble(parameter);
		SpectrumChartOptionsModel spectrumChartOptions = Ioc.Default.GetService<SpectrumChartOptionsModel>();

		return dim - offset;
		ScatterDataPoint scatterDataPoint = value as ScatterDataPoint;

		return "ChartTooltipLabel".GetText()
		.Replace("rv_1", scatterDataPoint.XValue.ToString())
		.Replace("rv_mu", spectrumChartOptions.SelectedWavelengthMeasureUnit.GetDescription())
		.Replace("rv_2", scatterDataPoint.YValue.ToString("0.000", CultureInfo.InvariantCulture));
		}
		catch (Exception)
		{
		return 0;
		return string.Empty;
		}
		}

		@@ -41,20 +46,15 @@ namespace INAF.Apps.Uwp.SLabDataManager.Converters
		}
		}

		public sealed class ChartDataPointConverter : IValueConverter
		public sealed class ChartGridItemsVisibilityConverter : IValueConverter
		{
		public object Convert(object value, Type targetType, object parameter, string language)
		{
		try
		{
		SpectrumChartOptionsModel spectrumChartOptions = Ioc.Default.GetService<SpectrumChartOptionsModel>();

		ScatterDataPoint scatterDataPoint = value as ScatterDataPoint;
		WorkingItemsModel workingItemsModel = Ioc.Default.GetService<WorkingItemsModel>();

		return "ChartTooltipLabel".GetText()
		.Replace("rv_1", scatterDataPoint.XValue.ToString())
		.Replace("rv_mu", spectrumChartOptions.SelectedWavelengthMeasureUnit.GetDescription())
		.Replace("rv_2", scatterDataPoint.YValue.ToString());
		return workingItemsModel.SpectrumChartOptions.SelectedMajorLinesVisibility.ToString();
		}
		catch (Exception)
		{
		@@ -68,19 +68,20 @@ namespace INAF.Apps.Uwp.SLabDataManager.Converters
		}
		}

		public sealed class ChartGridItemsVisibilityConverter : IValueConverter
		public sealed class DimWithParameterConverter : IValueConverter
		{
		public object Convert(object value, Type targetType, object parameter, string language)
		{
		try
		{
		WorkingItemsModel workingItemsModel = Ioc.Default.GetService<WorkingItemsModel>();
		double dim = (double)value;
		double offset = System.Convert.ToDouble(parameter);

		return workingItemsModel.SpectrumChartOptions.SelectedMajorLinesVisibility.ToString();
		return dim - offset;
		}
		catch (Exception)
		{
		return string.Empty;
		return 0;
		}
		}

INAF.Apps.Uwp.SLabDataManager/Helpers/UI/Chart/YAxisLabelFormatter.cs

0 → 100644

+15 −0

Original line number	Diff line number	Diff line
		using System.Globalization;
		using Telerik.Charting;

		namespace INAF.Apps.Uwp.SLabDataManager.Helpers.UI.Chart
		{
		public class YAxisLabelFormatter : IContentFormatter
		{
		public object Format(object owner, object content)
		{
		// The owner parameter is the Axis instance which labels are currently formatted
		//var axis = owner as Axis;
		return ((decimal)content).ToString("0.000", CultureInfo.InvariantCulture);
		}
		}
		}

INAF.Apps.Uwp.SLabDataManager/INAF.Apps.Uwp.SLabDataManager.csproj

+1 −0

Original line number	Diff line number	Diff line
		@@ -184,6 +184,7 @@
		<Compile Include="Helpers\RemoteAuthenticationHelper.cs" />
		<Compile Include="Helpers\RemoteOperations\RemoteOperationsManagerMaterials.cs" />
		<Compile Include="Helpers\RemoteOperations\RemoteOperationsManagerSampleAndMeasurement.cs" />
		<Compile Include="Helpers\UI\Chart\YAxisLabelFormatter.cs" />
		<Compile Include="Models\Chart\SelectedRefBand.cs" />
		<Compile Include="Models\Containers\SpectraContainer.cs" />
		<Compile Include="Models\Chart\Smoothing\SmoothingSegment.cs" />

INAF.Apps.Uwp.SLabDataManager/Models/SpectrumSummaryModel.cs

+3 −2

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		using INAF.Apps.Uwp.SLabDataManager.Helpers;
		using INAF.Apps.Uwp.SLabDataManager.Models.Chart;
		using System.Linq;
		using INAF.Libraries.NetStandard.Extensions;
		using static INAF.Apps.Uwp.SLabDataManager.Constants.Enums;
		using static INAF.Libraries.NetStandard.SLabCommonModels.Enums.Enums;

		@@ -94,8 +95,8 @@ namespace INAF.Apps.Uwp.SLabDataManager.Models
		.Replace("rv_3", "XaxisLabel".GetText());

		YAxisReportText = "SpectrumSummaryYAxisText".GetText()
		.Replace("rv_1", yMinValue.ToString())
		.Replace("rv_2", yMaxValue.ToString())
		.Replace("rv_1", yMinValue.To3DigitsDoubleInvariantString())
		.Replace("rv_2", yMaxValue.To3DigitsDoubleInvariantString())
		.Replace("rv_3", "YaxisLabel".GetText());

		LinesNumText = "SpectrumSummaryLinesNumText".GetText()

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@
		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
		xmlns:uihelpers="using:INAF.Apps.Uwp.SLabDataManager.Helpers.UI"
		xmlns:uihelperschart="using:INAF.Apps.Uwp.SLabDataManager.Helpers.UI.Chart"
		xmlns:ui="using:INAF.Apps.Uwp.SLabDataManager.Helpers.UI.Chart"
		xmlns:dialogs="using:INAF.Apps.Uwp.SLabDataManager.Views.ContentDialogs"
		xmlns:usercontrols="using:INAF.Apps.Uwp.SLabDataManager.Views.UserControls"
		@@ -883,6 +884,9 @@
		<Setter Property="Stroke" Value="{StaticResource myLightGray}"></Setter>
		</Style>
		</telerikChart:LinearAxis.MajorTickStyle>
		<telerikChart:LinearAxis.LabelFormatter>
		<uihelperschart:YAxisLabelFormatter />
		</telerikChart:LinearAxis.LabelFormatter>
		</telerikChart:LinearAxis>
		</Setter.Value>
		</Setter>