Commit cf8d7230 authored by Francesco Carraro's avatar Francesco Carraro
Browse files

improving smoothing panel by adding cloud icon for each pair... 

improving smoothing panel by adding cloud icon for each pair spectrumType-smoothingType; fixed login page crash when logging out;
parent c82f5ce8

INAF.Apps.Uwp.SLabDataManager/Assets/logbook/logbook.xml

+5 −4
Original line number Diff line number Diff line
@@ -2,10 +2,11 @@ 
<logbook>

	<updates>

		<fixes>

			<fix>Fixed saving of parent Id for each processing step</fix>

			<fix>When a processing step (alignment, etc) is saved on cloud, cloud icon appears on related panel</fix>

		</fixes>

		<!--<addings>

			<adding>Added reading of stdDev for Y values, when available</adding>

		</addings>-->

		<addings>

			<adding>Added warning message when saving on cloud overwrites data already saved on cloud</adding>

			<adding>Improved cloud icon in 'Smoothing' panel: each smoothing type has its own cloud icon</adding>

		</addings>

	</updates>

</logbook>
 
 No newline at end of file

INAF.Apps.Uwp.SLabDataManager/Helpers/UI/XamlHelpers.cs

+16 −1
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ using INAF.Apps.Uwp.SLabDataManager.Extensions; 
using INAF.Apps.Uwp.SLabDataManager.Models;

using INAF.Apps.Uwp.SLabDataManager.Models.Chart;

using INAF.Apps.Uwp.SLabDataManager.Models.Containers;

using INAF.Apps.Uwp.SLabDataManager.ViewModels.UserControlViewModels;

using INAF.Libraries.NetStandard.SLabCommonModels.Extensions;

using INAF.Libraries.NetStandard.SLabCommonModels.Models.SampleData;

using INAF.Libraries.NetStandard.SLabCommonModels.Models.SampleData.Interfaces;

using System;

using System.Collections.ObjectModel;

using System.Linq;
@@ -13,6 +13,7 @@ using Windows.UI.Xaml; 
using Windows.UI.Xaml.Media;

using Windows.UI.Xaml.Media.Imaging;

using static INAF.Apps.Uwp.SLabDataManager.Constants.Enums;

using static INAF.Libraries.NetStandard.SLabCommonModels.Values.Enums;



namespace INAF.Apps.Uwp.SLabDataManager.Helpers.UI

{
@@ -129,6 +130,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers.UI 
            return visibility;

        }



        /* bool IsAnySpectrumLoaded is used only to re-run this method when its values changes */

        public static SpectrumSummaryModel GetSpectrumSummaryOfType(bool IsAnySpectrumLoaded, string spectrumType)

        {

            return Ioc.Default.GetRequiredService<WorkingItemsModel>().LabSpectraSummaries.tryGetSummaryOfType(spectrumType.ToSpectrumType());
@@ -158,6 +160,19 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers.UI 
        }

        #endregion



        #region is saved on cloud for smoothing

        /* bool isUserControlShown is used only to re-run this method when its values changes */

        public static Visibility GetSpectrumTypeSmoothingTypeSavedOnCloudVisibility(bool isUserControlShown, SpectrumType selectedSpectrumType, string smoothingType)

        {

            var smoothingViewModel = Ioc.Default.GetRequiredService<SmoothingViewModel>();

            SpectrumType destSpectrumType = smoothingViewModel.getDestSpectrumType(smoothingType.ToSmoothingType(), selectedSpectrumType);

            if (smoothingViewModel.IsSpectrumTypeSavedOnCloud(destSpectrumType, smoothingType.ToSmoothingType()))

                return Visibility.Visible;

            else

                return Visibility.Collapsed;

        }

        #endregion



        #region materials visibility

        public static Visibility GetSelectedMeteorClassVisibility(MaterialBaseModel selectedSuggestedMeteorClass, string parameter)

        {

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

+2 −2
Original line number Diff line number Diff line
@@ -132,10 +132,10 @@ 
      <Version>8.2.0</Version>

    </PackageReference>

    <PackageReference Include="Microsoft.AppCenter.Analytics">

      <Version>5.0.1</Version>

      <Version>5.0.2</Version>

    </PackageReference>

    <PackageReference Include="Microsoft.AppCenter.Crashes">

      <Version>5.0.1</Version>

      <Version>5.0.2</Version>

    </PackageReference>

    <PackageReference Include="Microsoft.Extensions.Configuration.Json">

      <Version>7.0.0</Version>

INAF.Apps.Uwp.SLabDataManager/Models/Containers/ProcessedSpectraContainer.cs

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Models.Containers 


        public void clear()

        {

            ChartSpectraModels.Clear();

            ChartSpectraModels?.Clear();

        }



        public void delete(SpectrumType spectrumType)

INAF.Apps.Uwp.SLabDataManager/Package.appxmanifest

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
  <Identity

    Name="INAF.Apps.Uwp.SLabDataManager"

    Publisher="CN=INAF-IAPS, O=INAF, C=IT"

    Version="1.0.34.0" />

    Version="1.0.35.0" />



  <mp:PhoneIdentity PhoneProductId="07F38165-05DE-4ED7-8514-60D1E8CDCBFE" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>