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

methods for deleting spectra

parent a294b78c

INAF.Apps.Uwp.SLabDataManager/Assets/icons/delete.png

0 → 100644
+1.78 KiB
Loading image diff...

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

+1 −0
Original line number Diff line number Diff line
@@ -12,5 +12,6 @@ 
		<operation type="SaveSpectrumSampleData">AppSpectraFilesActions/SaveSpectrumSampleData</operation>

		<operation type="IsSavedOnCloud">AppSpectraFilesActions/IsSpectrumSavedOnCloud</operation>

		<operation type="GetSampleDataValues">AppSpectraFilesActions/GetSampleDataValues</operation>

		<operation type="DeleteSpectrum">AppSpectraFilesActions/DeleteSpectrum</operation>

	</operationUrls>

</remoteOperationsData>
 
 No newline at end of file

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

+8 −3
Original line number Diff line number Diff line 
using INAF.Libraries.NetStandard.SLabCommonModels.Authentication;

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

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

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

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

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

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

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

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

using INAF.Libraries.Uwp.Logging;

using INAF.Libraries.Uwp.Settings;

using Newtonsoft.Json;
@@ -36,6 +36,11 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers.RemoteOperations 
            return await getAsync(RemoteOperationType.CheckAlive);

        }



        public async Task<bool> deleteSpectrumAsync(DeleteSpectrumRequestModel deleteSpectrumRequest)

        {

            return await postAsync<bool>(deleteSpectrumRequest, RemoteOperationType.DeleteSpectrum);

        }



        public async Task<T> getValues<T>(RemoteOperationType remoteOperationType)

        {

            return await getAsync<T>(remoteOperationType);

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

+8 −0
Original line number Diff line number Diff line
@@ -265,6 +265,9 @@ 
    <Compile Include="Views\UserControls\AlignmentConfigUserControl.xaml.cs">

      <DependentUpon>AlignmentConfigUserControl.xaml</DependentUpon>

    </Compile>

    <Compile Include="Views\UserControls\DeleteQuestionUserControl.xaml.cs">

      <DependentUpon>DeleteQuestionUserControl.xaml</DependentUpon>

    </Compile>

    <Compile Include="Views\UserControls\SampleDataUserControl.xaml.cs">

      <DependentUpon>SampleDataUserControl.xaml</DependentUpon>

    </Compile>
@@ -345,6 +348,10 @@ 
      <SubType>Designer</SubType>

      <Generator>MSBuild:Compile</Generator>

    </Page>

    <Page Include="Views\UserControls\DeleteQuestionUserControl.xaml">

      <SubType>Designer</SubType>

      <Generator>MSBuild:Compile</Generator>

    </Page>

    <Page Include="Views\UserControls\SampleDataUserControl.xaml">

      <SubType>Designer</SubType>

      <Generator>MSBuild:Compile</Generator>
@@ -377,6 +384,7 @@ 
    <Content Include="Assets\BadgeLogo.scale-200.png" />

    <Content Include="Assets\BadgeLogo.scale-400.png" />

    <Content Include="Assets\brushes\NoiseTexture.png" />

    <Content Include="Assets\icons\delete.png" />

    <Content Include="Assets\icons\Error.png" />

    <Content Include="Assets\icons\Error_big.png" />

    <Content Include="Assets\icons\Ok.png" />

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

+46 −9
Original line number Diff line number Diff line
@@ -7,18 +7,17 @@ using INAF.Apps.Uwp.SLabDataManager.Helpers.UI.Chart.ProcessingHelpers; 
using INAF.Apps.Uwp.SLabDataManager.Helpers.XmlReaders;

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

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

using INAF.Apps.Uwp.SLabDataManager.Services;

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

using INAF.Apps.Uwp.SLabDataManager.Views;

using INAF.Libraries.NetStandard.Math.Fit.Linear;

using INAF.Libraries.NetStandard.Math.Models;

using INAF.Libraries.NetStandard.ScienceModels.OutputFormats;

using INAF.Libraries.NetStandard.ScienceModels.Spectra;

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

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

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

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

using INAF.Libraries.NetStandard.SLabCommonModels.Models.SaveSpectrum.SaveAlignedSpectrum;

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

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

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

using INAF.Libraries.Uwp.Logging;

using INAF.Libraries.Uwp.Settings;

using INAF.Libraries.Uwp.StorageItemsAccess;
@@ -31,7 +30,6 @@ using System.Linq; 
using System.Threading.Tasks;

using Windows.Storage;

using Windows.UI.Xaml.Navigation;

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

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



namespace INAF.Apps.Uwp.SLabDataManager.ViewModels
@@ -152,6 +150,13 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 


        public ContinuumRemovalHelper ContinuumRemovalHelper { get; private set; }



        private string deleteMessage;

        public string DeleteMessage

        {

            get { return deleteMessage; }

            set { SetProperty(ref deleteMessage, value); }

        }



        private bool isAddingPointsForContinuumRemovalAllowed;

        public bool IsAddingPointsForContinuumRemovalAllowed

        {
@@ -177,6 +182,13 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
            set { SetProperty(ref isContinuumRemovalEnabled, value); }

        }



        private bool isDeleteQuestionVisible;

        public bool IsDeleteQuestionVisible

        {

            get { return isDeleteQuestionVisible; }

            set { SetProperty(ref isDeleteQuestionVisible, value); }

        }



        private bool isDisableFitFocusRequired;

        public bool IsDisableFitFocusRequired

        {
@@ -683,7 +695,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
            WorkingItems.SpectraContainer.tryRemoveSpectrumOfTypeAsync(SpectrumType.Continuum);



            /* remove the continuum-removed spectrum, if existing */

            removeContinuumSpectrum();

            deleteContinuumSpectrumAsync();

        }



        private bool isContinuumSpectrumCompleted()
@@ -794,8 +806,30 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
            showSuccessMessage("ContinuumSpectrumSavedSuccessfullyMessage".GetText());

        }



        private void removeContinuumSpectrum()

        private async Task deleteContinuumSpectrumAsync()

        {

            if (WorkingItems.SpectraContainer.isAnySpectrumOfType(SpectrumType.ContinuumRemoved))

            {

                var spectrum = WorkingItems.SpectraContainer.tryGetSpectrumOfType(SpectrumType.ContinuumRemoved);



                if (spectrum.IsSavedOnCloud)

                {



                    IsDeleteQuestionVisible = true;



                    var remoteOperationsManager = serviceProvider.GetRequiredService<RemoteOperationsManager>();

                    if (await remoteOperationsManager.deleteSpectrumAsync(new DeleteSpectrumRequestModel() { Id = spectrum.Id }))

                    {



                    }

                    else

                    {



                    }

                }

            }



            /* remove spectrum from chart */

            WorkingItems.SpectraContainer.tryRemoveSpectrumOfTypeAsync(SpectrumType.ContinuumRemoved);

        }
@@ -899,6 +933,9 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
        #endregion



        #region commands

        private RelayCommand commandCancelDelete;

        public RelayCommand CommandCancelDelete => commandCancelDelete ?? (commandCancelDelete = new RelayCommand(() => IsDeleteQuestionVisible = false));



        #region alignment

        private RelayCommand commandAlignSpectrum;

        public RelayCommand CommandAlignSpectrum => commandAlignSpectrum ?? (commandAlignSpectrum = new RelayCommand(() => executeSpectrumAlignmentAsync()));
@@ -923,8 +960,8 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
        private RelayCommand commandExecuteContinuumRemoval;

        public RelayCommand CommandExecuteContinuumRemoval => commandExecuteContinuumRemoval ?? (commandExecuteContinuumRemoval = new RelayCommand(() => executeContinuumRemovalProcedure()));



        private RelayCommand commandRemoveContinuumSpectrum;

        public RelayCommand CommandRemoveContinuumSpectrum => commandRemoveContinuumSpectrum ?? (commandRemoveContinuumSpectrum = new RelayCommand(() => removeContinuumSpectrum()));

        private RelayCommand commandDeleteContinuumSpectrum;

        public RelayCommand CommandDeleteContinuumSpectrum => commandDeleteContinuumSpectrum ?? (commandDeleteContinuumSpectrum = new RelayCommand(() => deleteContinuumSpectrumAsync()));



        private RelayCommand commandSaveContinuumSpectrum;

        public RelayCommand CommandSaveContinuumSpectrum => commandSaveContinuumSpectrum ?? (commandSaveContinuumSpectrum = new RelayCommand(() => saveSpectrumOfTypeContinuumRemovedAsync()));