Commit 8527a6cd authored by Francesco Carraro's avatar Francesco Carraro
Browse files

fixed issues in segments-fit; fixed issues in inserting sample data and measurement info

parent c91a1b63

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

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                /* usercontrols viewmodels */

                .AddScoped<AlignmentViewModel>()

                .AddScoped<MeasurementInfoViewModel>()

                .AddScoped<InfoViewModel>()

                .AddScoped<SampleDataViewModel>()

                .AddSingleton<SegmentsFitViewModel>()

                .AddScoped<SmoothingViewModel>()

                .AddSingleton<UserControlsViewModelFactory>()

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

+8 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8" ?>

<remoteOperationsData>

	<baseUrl>http://localhost:81</baseUrl>

	<baseUrl>http://melody.iaps.inaf.it:80</baseUrl>

	<!--<baseUrl>http://localhost:81</baseUrl>-->

	<operationUrls>

		<!-- ACCOUNT -->

		<operation type="Authentication">Account/LoginForJwt</operation>
@@ -18,11 +19,16 @@ 
		<operation type="SaveSpectrumSampleData">AppSpectraFilesActions/SaveSpectrumSampleData</operation>

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

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

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

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

		<!-- USERS -->

		<operation type="GetUserPermissions">Users/GetUserPermissions</operation>

		<!-- PERMISSIONS -->

		<operation type="IsSaveOnCloudFromAppPermissionGranted">Permissions/IsSaveOnCloudFromAppPermissionGranted</operation>

		<!-- SAMPLE AND MEASUREMENT -->

		<operation type="GetSpectrumMeasurementInfo">SampleAndMeasurement/GetSpectrumMeasurementInfo</operation>

		<operation type="GetSpectrumSampleData">SampleAndMeasurement/GetSpectrumSampleData</operation>

		<!-- MINERALS -->

		<operation type="GetMinerals">Minerals/GetMinerals</operation>

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

	</operationUrls>

</remoteOperationsData>
 
 No newline at end of file

INAF.Apps.Uwp.SLabDataManager/Constants/Enums.cs

+7 −0
Original line number Diff line number Diff line
@@ -38,5 +38,12 @@ namespace INAF.Apps.Uwp.SLabDataManager.Constants 
            Beginning = 0,

            End

        }



        public enum MineralsSelectionType

        {

            None = 0,

            SingleItem,

            MultipleItems

        }

    }

}

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

+48 −24
Original line number Diff line number Diff line
@@ -40,30 +40,6 @@ namespace INAF.Apps.Uwp.SLabDataManager.Converters 
        }

    }



    public sealed class IsSpectrumAvailablelWithParameterConverter : IValueConverter

    {

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

        {

            try

            {

                string _spectrumType = (string)parameter;

                SpectrumType spectrumType = _spectrumType.ToSpectrumType();



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

                return spectraContainer.isAnySpectrumOfType(spectrumType);

            }

            catch (Exception)

            {

                return false;

            }

        }



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

        {

            throw new NotImplementedException();

        }

    }



    public sealed class ChartDataPointConverter : IValueConverter

    {

        public object Convert(object value, Type targetType, object parameter, string language)
@@ -151,6 +127,30 @@ namespace INAF.Apps.Uwp.SLabDataManager.Converters 
        }

    }



    public sealed class IsSpectrumAvailablelWithParameterConverter : IValueConverter

    {

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

        {

            try

            {

                string _spectrumType = (string)parameter;

                SpectrumType spectrumType = _spectrumType.ToSpectrumType();



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

                return spectraContainer.isAnySpectrumOfType(spectrumType);

            }

            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)
@@ -196,6 +196,30 @@ namespace INAF.Apps.Uwp.SLabDataManager.Converters 
        }

    }



    public sealed class MineralsListVisibilityConverter : IValueConverter

    {

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

        {

            try

            {

                string _spectrumType = (string)parameter;

                SpectrumType spectrumType = _spectrumType.ToSpectrumType();



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

                return spectraContainer.isAnySpectrumOfType(spectrumType);

            }

            catch (Exception)

            {

                return false;

            }

        }



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

        {

            throw new NotImplementedException();

        }

    }



    public sealed class ShortFilepathConverter : IValueConverter

    {

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

INAF.Apps.Uwp.SLabDataManager/Extensions/Extensions.cs

+23 −2
Original line number Diff line number Diff line
@@ -349,6 +349,22 @@ namespace INAF.Apps.Uwp.SLabDataManager.Extensions 
        }



        /* used for 'saveSpectrumOfTypeAsLocalFileAsync' method in BaseUserControlViewModel */

        public static XmlDocument ToXml(this IChartSpectrumModel spectrum)

        {

            if (spectrum == null || spectrum.Elements == null || spectrum.Elements.Count == 0)

                return null;



            XmlDocument dom = GetCommonXml(spectrum);



            var xmlspectrum = dom.SelectSingleNode(Constants.Constants.XML_SPECTRUM);



            /* append spectrum data (wavelength, value) */

            var xmlelements = GetElements(spectrum, dom);

            xmlspectrum.AppendChild(xmlelements);



            return dom;

        }



        public static XmlDocument ToXml(this IChartSpectrumOfTypeProcessedModel spectrum)

        {

            if (spectrum == null || spectrum.Elements == null || spectrum.Elements.Count == 0)
@@ -384,7 +400,12 @@ namespace INAF.Apps.Uwp.SLabDataManager.Extensions 
        /* used for 'ToSpectrumFile' extension method */

        public static string ToXmlString(this IChartSpectrumModel spectrum)

        {

            return ((IChartSpectrumOfTypeProcessedModel)spectrum).ToXml().GetXml();

            return spectrum.ToXml().GetXml();

        }



        public static string ToXmlString(this IChartSpectrumOfTypeProcessedModel spectrum)

        {

            return spectrum.ToXml().GetXml();

        }

        #endregion