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

fixed sample/measurement info

parent f3991da5

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

+2 −2
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                .AddTransient<XmlSpectrumFileReader>()

                /* usercontrols viewmodels */

                .AddScoped<AlignmentViewModel>()

                .AddScoped<InfoMeasurementInfoViewModel>()

                .AddSingleton<InfoSampleDataViewModel>()

                .AddTransient<InfoMeasurementInfoViewModel>()

                .AddTransient<InfoSampleDataViewModel>()

                .AddSingleton<SegmentsFitViewModel>()

                .AddScoped<SmoothingViewModel>()

                .AddSingleton<UserControlsViewModelFactory>()

INAF.Apps.Uwp.SLabDataManager/Strings/en-us/Resources.resw

+3 −0
Original line number Diff line number Diff line
@@ -1090,4 +1090,7 @@ 
  <data name="ProcessedReadingErrorMessage" xml:space="preserve">

    <value>An error occurred while reading file: </value>

  </data>

  <data name="InfoRefreshLabel.Text" xml:space="preserve">

    <value>Refresh values</value>

  </data>

</root>
 
 No newline at end of file

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

+0 −1
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 


        #region usercontrols viewmodels

        private AlignmentViewModel alignmentViewModel;



        public AlignmentViewModel AlignmentViewModel

        {

            get { return alignmentViewModel; }

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

+13 −14
Original line number Diff line number Diff line
@@ -62,10 +62,10 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
            tryRemoveActionUserControl();

        }



        private async Task loadSampleDataValuesFromWebAsync()

        {

            InfoSampleDataViewModel = await userControlsViewModelFactory.initSampleDataViewModelAsync();

        }

        //private async Task loadInfoFromWebAsync()

        //{

        //    InfoSampleDataViewModel = await userControlsViewModelFactory.initSampleDataViewModelAsync();

        //}



        private (bool isOk, string warningMessage, MaterialBaseModel selectedRock) manageMeteorClassSelection()

        {
@@ -148,7 +148,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
            MaterialBaseModel selectedMeteorClass = MaterialBaseModel.CreateEmpty();



            /* check rock/minerals selection */

            switch (infoSampleDataViewModel.SelectedMineralTypeValue.Value)

            switch (InfoSampleDataViewModel.SelectedMineralTypeValue.Value)

            {

                case "Monomineralic":

                case "Mix":
@@ -197,6 +197,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 


            try

            {

                int? selectedGrainSizeTypeValueId = (InfoSampleDataViewModel?.SelectedGrainSizeTypeValue != null ? InfoSampleDataViewModel?.SelectedGrainSizeTypeValue.Id : null);

                int? lowerValueId = (InfoSampleDataViewModel?.SelectedGrainSizeLowerLimitValue != null ? InfoSampleDataViewModel?.SelectedGrainSizeLowerLimitValue.Id : null);

                int? upperValueId = (InfoSampleDataViewModel?.SelectedGrainSizeUpperLimitValue != null ? InfoSampleDataViewModel?.SelectedGrainSizeUpperLimitValue.Id : null);

                var inputSpectra = (InfoMeasurementInfoViewModel.SpectraFiles?.Count > 0 ? InfoMeasurementInfoViewModel.SpectraFiles.ToList() : null);
@@ -210,7 +211,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
                        SampleTypeId = InfoSampleDataViewModel.SelectedSampleDataValue.Id,

                        GrainSizeLowerValueId = lowerValueId,

                        GrainSizeUpperValueId = upperValueId,

                        GrainSizeTypeId = InfoSampleDataViewModel.SelectedGrainSizeTypeValue.Id,

                        GrainSizeTypeId = selectedGrainSizeTypeValueId,

                        OriginTypeId = InfoSampleDataViewModel.SelectedOriginTypeValue.Id,

                        MineralTypeId = InfoSampleDataViewModel.SelectedMineralTypeValue.Id,

                        Minerals = selectedMinerals,
@@ -275,12 +276,13 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
            isInfoUserControlHide = false;

        }



        public async Task showInfoAndSampleDataViewModelsAsync()

        public async Task showInfoAndSampleDataViewModelsAsync(bool isRaiseIsInfoUserControlRequired = true)

        {

            InfoMeasurementInfoViewModel = await userControlsViewModelFactory.createMeasurementInfoViewModelAsync();

            InfoMeasurementInfoViewModel = await userControlsViewModelFactory.initMeasurementInfoViewModelAsync();



            InfoSampleDataViewModel = await userControlsViewModelFactory.initSampleDataViewModelAsync();



            if (isRaiseIsInfoUserControlRequired)

                raiseIsInfoUserControlRequired();

        }
@@ -295,17 +297,14 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
        private RelayCommand<MaterialModel> commandAskDeleteSelectedMineral;

        public RelayCommand<MaterialModel> CommandAskDeleteSelectedMineral => commandAskDeleteSelectedMineral ?? (commandAskDeleteSelectedMineral = new RelayCommand<MaterialModel>((item) => askDeleteSelectedMineral(item)));



        private RelayCommand commandClearSampleDataValues;

        public RelayCommand CommandClearSampleDataValues => commandClearSampleDataValues ?? (commandClearSampleDataValues = new RelayCommand(() => loadSampleDataValuesFromWebAsync()));



        private RelayCommand commandDeleteSelectedMineral;

        public RelayCommand CommandDeleteSelectedMineral => commandDeleteSelectedMineral ?? (commandDeleteSelectedMineral = new RelayCommand(() => deleteSelectedMineral()));



        private RelayCommand commandHideInfoUserControl;

        public RelayCommand CommandHideInfoUserControl => commandHideInfoUserControl ?? (commandHideInfoUserControl = new RelayCommand(() => hideInfoUserControl()));



        private RelayCommand commandRefreshSampleDataValues;

        public RelayCommand CommandRefreshSampleDataValues => commandRefreshSampleDataValues ?? (commandRefreshSampleDataValues = new RelayCommand(() => loadSampleDataValuesFromWebAsync()));

        private RelayCommand commandRefreshInfoValues;

        public RelayCommand CommandRefreshInfoValues => commandRefreshInfoValues ?? (commandRefreshInfoValues = new RelayCommand(() => showInfoAndSampleDataViewModelsAsync(isRaiseIsInfoUserControlRequired: false)));



        private RelayCommand commandSaveInfo;

        public RelayCommand CommandSaveInfo => commandSaveInfo ?? (commandSaveInfo = new RelayCommand(() => saveInfoAsync()));

INAF.Apps.Uwp.SLabDataManager/ViewModels/UserControlViewModels/ChartPanels/InfoSampleDataViewModel.cs

+5 −0
Original line number Diff line number Diff line
@@ -327,6 +327,9 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels.UserControlViewModels 
        {

            if (sampleData.GrainSizeValues?.Count > 0)

            {

                /* set selector to 'Range' option */

                SelectedGrainSizeTypeValue = GrainSizeTypeValues[1];



                /* fill grain-size values */

                GrainSizeValues = sampleData.GrainSizeValues;
@@ -338,6 +341,8 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels.UserControlViewModels 
            }

            else

            {

                SelectedGrainSizeTypeValue = null;



                /* reset grain size boundaries */

                SelectedGrainSizeLowerLimitValue = null;

                SelectedGrainSizeUpperLimitValue = null;