fixed continuumAnalysisPage (14af6952) · Commits · INAF / DotNET / Apps / Uwp / INAF.Apps.Uwp.LabDataManager

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ namespace INAF.Apps.Uwp.SLabDataManager
		private Lazy<ActivationService> _activationService;

		public static Dictionary<string, object> AppDictionary;
		public static Dictionary<UIContext, AppWindow> AppWindows;
		//public static Dictionary<UIContext, AppWindow> AppWindows;

		private ActivationService ActivationService
		{
		@@ -106,7 +106,7 @@ namespace INAF.Apps.Uwp.SLabDataManager
		AppDictionary = new Dictionary<string, object>();

		/* create app dictionary for AppWindow instances */
		AppWindows = new Dictionary<UIContext, AppWindow>();
		//AppWindows = new Dictionary<UIContext, AppWindow>();

		/* init logger */
		Logger logger = new Logger();

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts.Containers
		spectrum.PropertyChanged += Spectrum_PropertyChanged;
		}

		protected override void addSpectrum(SpectrumModel spectrum)
		protected void addSpectrum(SpectrumModel spectrum)
		{
		//spectrum.setColor();
		Spectra.Add(spectrum);
		@@ -52,7 +52,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts.Containers

		SpectrumModel clonedSpectrum = (SpectrumModel)tryGetSpectrumOfType(srcKey).Clone();
		clonedSpectrum.setKey(destKey);
		clonedSpectrum.updateTitle();
		clonedSpectrum.updateTitleForContinuum();
		return clonedSpectrum;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts.Containers
		//setXAxisMajorStep(wavelengthMeasureUnit);
		}

		protected override void addSpectrum(SpectrumModel spectrum)
		protected void addSpectrum(SpectrumModel spectrum)
		{
		spectrum.setColor();
		Spectra.Add(spectrum);

+7 −14

Original line number	Diff line number	Diff line
		@@ -33,6 +33,13 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts.Containers
		});
		}

		protected ObservableCollection<SpectrumModel> spectra;
		public ObservableCollection<SpectrumModel> Spectra
		{
		get { return spectra; }
		protected set { SetProperty(ref spectra, value); }
		}

		#region properties
		public bool IsAlignedSpectrumSaved { get; set; }

		@@ -89,13 +96,6 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts.Containers
		set { SetProperty(ref isChartUpdateLayoutRequired, value); }
		}

		protected ObservableCollection<SpectrumModel> spectra;
		public ObservableCollection<SpectrumModel> Spectra
		{
		get { return spectra; }
		protected set { SetProperty(ref spectra, value); }
		}

		public string YAxisTitle { get; protected set; }

		protected ObservableCollection<SpectrumSummaryModel> summaries;
		@@ -240,16 +240,9 @@ namespace INAF.Apps.Uwp.SLabDataManager.Charts.Containers
		YAxisBoundaries.updateAxisBoundaries(result.yMin, result.yMax);
		}

		#region virtual methods
		public virtual Task addOrUpdateSpectrumAsync(SpectrumModel spectrum)
		{
		throw new NotImplementedException();
		}

		protected virtual void addSpectrum(SpectrumModel spectrum)
		{
		throw new NotImplementedException();
		}
		#endregion
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers
		ElementCompositionPreview.SetAppWindowContent(appWindow, frame);

		/* save relationship into App-related dictionary */
		App.AppWindows.Add(frame.UIContext, appWindow);
		//App.AppWindows.Add(frame.UIContext, appWindow);
		appWindow.Title = "ContinuumAnalysisPageTitle".GetText();

		appWindow.Closed += delegate