Commit 1e137811 authored by Francesco Carraro's avatar Francesco Carraro
Browse files

bug fixing

parent 9d9b75a5

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

+5 −3
Original line number Diff line number Diff line
@@ -132,12 +132,10 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                .AddSingleton<RemoteOperationsRepository>()

                .AddSingleton<SecondaryWindowHelper>()

                .AddSingleton<SegmentFitModelsFactory>()

                .AddSingleton<SegmentsFitViewModel>()

                .AddSingleton<SelectedRefBand>()

                .AddSingleton<SettingsHelper>()

                .AddSingleton<SmoothingBoundariesContainer>()

                .AddSingleton<SpectraContainer>()

                .AddSingleton<AlignmentViewModel>()

                .AddSingleton<SpectrumChartOptionsModel>()

                .AddSingleton<StorageItemsSettingsHelper>()

                .AddSingleton<StorageItemsAccessHelper>()
@@ -145,7 +143,11 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                .AddSingleton<UpdateUIHelper>()

                .AddSingleton<WorkingFoldersContainer>()

                .AddSingleton<WorkingItemsModel>()



                /* scoped */

                .AddScoped<MeasurementInfoViewModel>()

                .AddScoped<SampleDataViewModel>()

                .AddScoped<AlignmentViewModel>()

                .AddScoped<SegmentsFitViewModel>()

                .AddScoped<SmoothingViewModel>()

                /* transient */

                .AddTransient<AnimationsHelper>()

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

+25 −0
Original line number Diff line number Diff line
@@ -127,6 +127,31 @@ namespace INAF.Apps.Uwp.SLabDataManager.Converters 
        }

    }



    public sealed class IsEnabledForegroundColorConverter : IValueConverter

    {

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

        {

            try

            {

                bool isEnabled = System.Convert.ToBoolean((string)value);



                if (isEnabled)

                    return AppThemeHelper.GetThemeValue<SolidColorBrush>((string)parameter);

                else

                    return App.Current.Resources["myGray"] as SolidColorBrush;

            }

            catch (Exception)

            {

                return false;

            }

        }



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

        {

            throw new NotImplementedException();

        }

    }



    public sealed class IsUserControlAvailableConverter : IValueConverter

    {

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

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

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ 
    <Compile Include="Helpers\UI\XamlHelpers.cs" />

    <Compile Include="Helpers\UpdateUIHelper.cs" />

    <Compile Include="ViewModels\ChartViewModelAlignment.cs" />

    <Compile Include="ViewModels\ChartViewModelContinuum.cs" />

    <Compile Include="ViewModels\ChartViewModelSegmentsFit.cs" />

    <Compile Include="ViewModels\ChartViewModelInfo.cs" />

    <Compile Include="ViewModels\ChartViewModelSmoothing.cs" />

    <Compile Include="ViewModels\ChartViewModelZoom.cs" />

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

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
    <converters:ChartGridItemsVisibilityConverter x:Key="ChartGridItemsVisibilityConverter" />

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

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

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

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

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

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

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

+8 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 


            foreach (SpectrumType spectrumType in Enum.GetValues(typeof(SpectrumType)))

            {

                System.Diagnostics.Debug.WriteLine($"closing {spectrumType.ToString()}...");

                System.Diagnostics.Debug.WriteLine($"closing {spectrumType}...");

                if (spectrumType == SpectrumType.Ref || spectrumType == SpectrumType.RefWhite)

                    continue;
@@ -383,6 +383,13 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
                        break;

                }

            }



            /* all usercontrol viewmodels are disposed when a new RAW file is read */

            //AlignmentViewModel?.Dispose();

            //SegmentsFitViewModel?.Dispose();

            //SmoothingViewModel?.Dispose();

            //SampleDataViewModel?.Dispose();

            //MeasurementInfoViewModel?.Dispose();

        }



        private async void initAsync()