Commit 3636b961 authored by Francesco Carraro's avatar Francesco Carraro
Browse files

fixed crash for zoom; added versionlogbook

parent 8c4bafba

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

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

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

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

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

using INAF.Apps.Uwp.SLabDataManager.Services;

using INAF.Apps.Uwp.SLabDataManager.ViewModels;

using INAF.Apps.Uwp.SLabDataManager.ViewModels.ContentDialogsViewModel;
@@ -125,6 +126,7 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                /* singletons */

                .AddSingleton<ChartAnnotationsHelper>()

                .AddSingleton<FitMethodsHelper>()

                .AddSingleton<LogBookViewModel>()

                .AddSingleton<Logger>(logger)

                .AddSingleton<PermissionsHelper>()

                .AddSingleton<RecentFilesHelper>()
@@ -150,10 +152,12 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                .AddScoped<StorageItemsHelper>()

                /* transient */

                .AddTransient<AnimationsHelper>()

                .AddTransient<AppVersionUpdateHelper>()

                .AddTransient<AuthenticationManager>()

                .AddTransient<LabSpectrumFileReader>()

                .AddTransient<LinearFitHelper>()

                .AddTransient<LinearProcessingHelper>()

                .AddTransient<LogbookFileReader>()

                .AddTransient<RemoteOperationsManager>()

                .AddTransient<RemoteOperationsXmlReader>()

                .AddTransient<SavitzkyGolayHelper>()

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

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

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

0 → 100644
+11 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8" ?>

<logbook>

	<updates>

		<fixes>

			<fix>Fixed crash when user tries to zoom a chart region</fix>

		</fixes>

		<addings>

			<adding>Added way to classify sample as meteor by assigning it a class</adding>

		</addings>

	</updates>

</logbook>
 
 No newline at end of file

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

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

<remoteOperationsData>

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

	<!--<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>
@@ -32,5 +32,7 @@ 
		<operation type="GetMinerals">Materials/GetMinerals</operation>

		<operation type="GetRocks">Materials/GetRocks</operation>

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

		<!-- EXTSERVICES -->

		<operation type="GetMeteorClasses">ExtServices/GetMeteorClasses</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
@@ -33,6 +33,13 @@ namespace INAF.Apps.Uwp.SLabDataManager.Constants 
            OutputSpectra

        }



        public enum LogBookItemType

        {

            None = 0,

            Fix = 1,

            Adding = 2

        }



        public enum MissingPointPosition

        {

            Beginning = 0,