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

fixing management of materials....

parent c2f5c502

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

+6 −6
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
<logbook>

	<updates>

		<fixes>

			<fix>Issue in retrieving saved grain sizes</fix>

			<!--<fix>Fixed management of sample data/measurement info panel when changing RAW file</fix>

			<fix>Fixed file deletion when changing RAW file</fix>-->

			<fix>Fixed missing warning when saving info</fix>

			<fix>Removed wrong animation when resizing app and Chart page is active with right-panels opened</fix>

			<fix>Fixed smoothing by spectrum</fix>

		</fixes>

		<!--<addings>

			<adding>Added percentage of minerals for mix</adding>

		</addings>-->

		<addings>

			<adding>Added reload button for sample/measurement info panel</adding>

		</addings>

	</updates>

</logbook>
 
 No newline at end of file

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

+3 −1
Original line number Diff line number Diff line
@@ -153,11 +153,13 @@ namespace INAF.Apps.Uwp.SLabDataManager.Converters 
        {

            try

            {

                SmoothingType smoothingType = ((string)parameter).ToSmoothingType();



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



                var spectraContainer = Ioc.Default.GetService<SpectraContainer>();



                var destSpectrumType = smoothingViewModel.getDestSpectrumType(smoothingViewModel.SelectedSpectrumType);

                var destSpectrumType = smoothingViewModel.getDestSpectrumType(smoothingType, smoothingViewModel.SelectedSpectrumType);



                return spectraContainer.isAnySpectrumOfType(destSpectrumType);

            }

INAF.Apps.Uwp.SLabDataManager/Helpers/RemoteOperations/RemoteOperationsManagerMaterials.cs

+13 −6
Original line number Diff line number Diff line 
using INAF.Libraries.NetStandard.SLabCommonModels.Models.SampleData;

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

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

using System.Collections.Generic;

using System.Linq;

using System.Threading.Tasks;

using static INAF.Libraries.NetStandard.SLabCommonModels.Enums.Enums;
@@ -7,19 +10,23 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers.RemoteOperations 
{

    public partial class RemoteOperationsManager

    {

        public async Task<List<MaterialBaseModel>> getMeteorClassesAsync(string text)

        public async Task<MaterialsContainer> getMeteorClassesAsync(string text)

        {

            return await getAsync<List<MaterialBaseModel>>(RemoteOperationType.GetMeteorClasses, buildArgument("Text", text));

            return await getAsync<MaterialsContainer>(RemoteOperationType.GetMeteorClasses, buildArgument("Text", text));

        }



        public async Task<List<MaterialModel>> getMineralsAsync(string text)

        public async Task<List<IMaterialModel>> getMineralsAsync(string text)

        {

            return await getAsync<List<MaterialModel>>(RemoteOperationType.GetMinerals, buildArgument("Text", text));

            return (await getAsync<List<MaterialBaseModel>>(RemoteOperationType.GetMinerals, buildArgument("Text", text)))

                    .Cast<IMaterialModel>()

                    .ToList();

        }



        public async Task<List<MaterialBaseModel>> getRocksAsync(string text)

        public async Task<List<IMaterialModel>> getRocksAsync(string text)

        {

            return await getAsync<List<MaterialBaseModel>>(RemoteOperationType.GetRocks, buildArgument("Text", text));

            return (await getAsync<List<MaterialBaseModel>>(RemoteOperationType.GetRocks, buildArgument("Text", text)))?

                    .Cast<IMaterialModel>()

                    .ToList();

        }

    }

}

INAF.Apps.Uwp.SLabDataManager/Helpers/RemoteOperations/RemoteOperationsManagerSampleAndMeasurement.cs

+1 −2
Original line number Diff line number Diff line 
using INAF.Libraries.NetStandard.SLabCommonModels.Models.MeasurementInfo;

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

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

using INAF.Libraries.NetStandard.SLabCommonModels.Models.WebApp.Responses;

using System.Threading.Tasks;
@@ -21,7 +20,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers.RemoteOperations 


        public async Task<SampleDataSelectedValues> getSpectrumSampleDataAsync(int FileId)

        {

            return await getAsync<SampleDataSelectedValues>(RemoteOperationType.GetSpectrumSampleData, buildArgument(nameof(GenericRequestByIdModel.Id), FileId.ToString()));

            return await getAsync<SampleDataSelectedValues>(RemoteOperationType.GetSpectrumSampleData, buildArgument("Id", FileId.ToString()));

        }



        public async Task<GenericValueStringResponseModel> saveInfoAsync(InfoSelectedValuesModel saveSampleDataRequest)

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

+5 −4
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ using INAF.Apps.Uwp.SLabDataManager.Models.Chart; 
using INAF.Apps.Uwp.SLabDataManager.Models.Containers;

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;
@@ -158,7 +159,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers.UI 
        #endregion



        #region materials visibility

        public static Visibility GetSelectedMeteorClassVisibility(MaterialBaseModel selectedSuggestedMeteorClass, string parameter)

        public static Visibility GetSelectedMeteorClassVisibility(IMaterialModel selectedSuggestedMeteorClass, string parameter)

        {

            Visibility visibility = Visibility.Collapsed;
@@ -180,7 +181,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers.UI 
            return visibility;

        }



        public static Visibility GetSelectedMineralVisibility(MaterialModel selectedSuggestedMineral, MineralsSelectionType MineralsSelectionType, string parameter)

        public static Visibility GetSelectedMineralVisibility(IMaterialModel selectedSuggestedMineral, MineralsSelectionType MineralsSelectionType, string parameter)

        {

            Visibility visibility = Visibility.Collapsed;
@@ -209,7 +210,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers.UI 
            return visibility;

        }



        public static Visibility GetSelectedMineralsVisibility(ObservableCollection<MaterialModel> selectedSuggestedMinerals, MineralsSelectionType MineralsSelectionType, string parameter)

        public static Visibility GetSelectedMineralsVisibility(ObservableCollection<IMaterialModel> selectedSuggestedMinerals, MineralsSelectionType MineralsSelectionType, string parameter)

        {

            Visibility visibility = Visibility.Collapsed;
@@ -238,7 +239,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers.UI 
            return visibility;

        }



        public static Visibility GetSelectedRockVisibility(MaterialBaseModel selectedSuggestedRock, string parameter)

        public static Visibility GetSelectedRockVisibility(IMaterialModel selectedSuggestedRock, string parameter)

        {

            Visibility visibility = Visibility.Collapsed;