Commit 599a3374 authored by Francesco Carraro's avatar Francesco Carraro
Browse files

added info about incidence,emission angles in measurementInfo

parent 48ea05d7

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

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

                /* usercontrols viewmodels */

                .AddScoped<AlignmentViewModel>()

                .AddScoped<MeasurementInfoViewModel>()

                .AddScoped<InfoViewModel>()

                .AddScoped<InfoMeasurementInfoViewModel>()

                .AddScoped<InfoSampleDataViewModel>()

                .AddSingleton<SegmentsFitViewModel>()

                .AddScoped<SmoothingViewModel>()

                .AddSingleton<UserControlsViewModelFactory>()

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

+2 −2
Original line number Diff line number Diff line
@@ -276,8 +276,8 @@ 
    <Compile Include="ViewModels\ShellViewModel.cs" />

    <Compile Include="ViewModels\UserControlViewModels\ChartPanels\BaseUserControlViewModel.cs" />

    <Compile Include="ViewModels\UserControlViewModels\ChartPanels\IUserControlViewModel.cs" />

    <Compile Include="ViewModels\UserControlViewModels\ChartPanels\MeasurementInfoViewModel.cs" />

    <Compile Include="ViewModels\UserControlViewModels\ChartPanels\InfoViewModel.cs" />

    <Compile Include="ViewModels\UserControlViewModels\ChartPanels\InfoMeasurementInfoViewModel.cs" />

    <Compile Include="ViewModels\UserControlViewModels\ChartPanels\InfoSampleDataViewModel.cs" />

    <Compile Include="ViewModels\UserControlViewModels\ChartPanels\SampleAndMeasurementBaseViewModel.cs" />

    <Compile Include="ViewModels\UserControlViewModels\ChartPanels\SegmentsFitViewModel.cs" />

    <Compile Include="ViewModels\UserControlViewModels\ChartPanels\SmoothingViewModel.cs" />

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

+12 −0
Original line number Diff line number Diff line
@@ -991,4 +991,16 @@ 
  <data name="ZoomRegionEmptyCoordsErrorMessage" xml:space="preserve">

    <value>An error occurred while trying to create the zoomed chart</value>

  </data>

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

    <value>Angles info</value>

  </data>

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

    <value>Emission angle</value>

  </data>

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

    <value>Incidence angle</value>

  </data>

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

    <value>Spectrum info</value>

  </data>

</root>
 
 No newline at end of file

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

+10 −10
Original line number Diff line number Diff line
@@ -208,18 +208,18 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
            set { SetProperty(ref alignmentViewModel, value); }

        }



        private MeasurementInfoViewModel measurementInfoViewModel;

        public MeasurementInfoViewModel MeasurementInfoViewModel

        private InfoMeasurementInfoViewModel infoMeasurementInfoViewModel;

        public InfoMeasurementInfoViewModel InfoMeasurementInfoViewModel

        {

            get { return measurementInfoViewModel; }

            set { SetProperty(ref measurementInfoViewModel, value); }

            get { return infoMeasurementInfoViewModel; }

            set { SetProperty(ref infoMeasurementInfoViewModel, value); }

        }



        private InfoViewModel infoViewModel;

        public InfoViewModel SampleDataViewModel

        private InfoSampleDataViewModel infoSampleDataViewModel;

        public InfoSampleDataViewModel InfoSampleDataViewModel

        {

            get { return infoViewModel; }

            set { SetProperty(ref infoViewModel, value); }

            get { return infoSampleDataViewModel; }

            set { SetProperty(ref infoSampleDataViewModel, value); }

        }



        private SegmentsFitViewModel segmentsFitViewModel;
@@ -443,8 +443,8 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
            AlignmentViewModel?.Dispose();

            SegmentsFitViewModel?.Dispose();

            SmoothingViewModel?.Dispose();

            SampleDataViewModel?.Dispose();

            MeasurementInfoViewModel?.Dispose();

            InfoSampleDataViewModel?.Dispose();

            InfoMeasurementInfoViewModel?.Dispose();



            IsLoading = false;

        }

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

+26 −26
Original line number Diff line number Diff line
@@ -56,13 +56,13 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 


        private void deleteSelectedMineral()

        {

            SampleDataViewModel.deleteSelectedMineral(SelectedMineralForDeleting);

            InfoSampleDataViewModel.deleteSelectedMineral(SelectedMineralForDeleting);

            tryRemoveActionUserControl();

        }



        private async Task loadSampleDataValuesFromWebAsync()

        {

            SampleDataViewModel = await userControlsViewModelFactory.createSampleDataViewModelAsync();

            InfoSampleDataViewModel = await userControlsViewModelFactory.createSampleDataViewModelAsync();

        }



        private (bool isOk, string warningMessage, MaterialBaseModel selectedRock) manageMeteorClassSelection()
@@ -71,8 +71,8 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
            string warningMessage = string.Empty;

            MaterialBaseModel selectedMeteorClass = MaterialBaseModel.CreateEmpty();



            if (infoViewModel.SelectedSuggestedMeteorClass != null)

                selectedMeteorClass = infoViewModel.SelectedSuggestedMeteorClass;

            if (infoSampleDataViewModel.SelectedSuggestedMeteorClass != null)

                selectedMeteorClass = infoSampleDataViewModel.SelectedSuggestedMeteorClass;



            return (isOk, warningMessage, selectedMeteorClass);

        }
@@ -85,11 +85,11 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 


            /* create list of selected minerals */

            List<MaterialModel> selectedMinerals = new List<MaterialModel>();

            switch (infoViewModel.MineralsSelectionType)

            switch (infoSampleDataViewModel.MineralsSelectionType)

            {

                case Constants.Enums.MineralsSelectionType.SingleItem:

                    if (infoViewModel.SelectedSuggestedMineral != null)

                        selectedMinerals.Add(infoViewModel.SelectedSuggestedMineral);

                    if (infoSampleDataViewModel.SelectedSuggestedMineral != null)

                        selectedMinerals.Add(infoSampleDataViewModel.SelectedSuggestedMineral);

                    else

                    {

                        isOk = false;
@@ -97,8 +97,8 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
                    }

                    break;

                case Constants.Enums.MineralsSelectionType.MultipleItems:

                    if (infoViewModel.SelectedSuggestedMinerals?.Count > 0)

                        selectedMinerals = infoViewModel.SelectedSuggestedMinerals.ToList();

                    if (infoSampleDataViewModel.SelectedSuggestedMinerals?.Count > 0)

                        selectedMinerals = infoSampleDataViewModel.SelectedSuggestedMinerals.ToList();

                    else

                    {

                        isOk = false;
@@ -116,8 +116,8 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
            string warningMessage = string.Empty;

            MaterialBaseModel selectedRock = MaterialBaseModel.CreateEmpty();



            if (infoViewModel.SelectedSuggestedRock != null)

                selectedRock = infoViewModel.SelectedSuggestedRock;

            if (infoSampleDataViewModel.SelectedSuggestedRock != null)

                selectedRock = infoSampleDataViewModel.SelectedSuggestedRock;



            return (isOk, warningMessage, selectedRock);

        }
@@ -125,7 +125,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
        private async Task saveInfoAsync()

        {

            /* check on name */

            if (string.IsNullOrEmpty(SampleDataViewModel.SampleName))

            if (string.IsNullOrEmpty(InfoSampleDataViewModel.SampleName))

            {

                showDialogMessage("SaveSpectrumOfTypeSampleDataNameErrorMessage".GetText());

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



            /* check rock/minerals selection */

            switch (infoViewModel.SelectedMineralTypeValue.Value)

            switch (infoSampleDataViewModel.SelectedMineralTypeValue.Value)

            {

                case "Monomineralic":

                case "Mix":
@@ -183,18 +183,18 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
            InfoSelectedValuesModel sampleDataSelectedValues = new InfoSelectedValuesModel()

            {

                FileId = rawFileId,

                Name = SampleDataViewModel.SampleName,

                SampleType = SampleDataViewModel.SelectedSampleDataValue,

                GrainSizeLowerValue = SampleDataViewModel.SelectedGrainSizeLowerLimitValue,

                GrainSizeUpperValue = SampleDataViewModel.SelectedGrainSizeUpperLimitValue,

                GrainSizeType = SampleDataViewModel.SelectedGrainSizeTypeValue,

                OriginType = SampleDataViewModel.SelectedOriginTypeValue,

                MineralType = SampleDataViewModel.SelectedMineralTypeValue,

                Name = InfoSampleDataViewModel.SampleName,

                SampleType = InfoSampleDataViewModel.SelectedSampleDataValue,

                GrainSizeLowerValue = InfoSampleDataViewModel.SelectedGrainSizeLowerLimitValue,

                GrainSizeUpperValue = InfoSampleDataViewModel.SelectedGrainSizeUpperLimitValue,

                GrainSizeType = InfoSampleDataViewModel.SelectedGrainSizeTypeValue,

                OriginType = InfoSampleDataViewModel.SelectedOriginTypeValue,

                MineralType = InfoSampleDataViewModel.SelectedMineralTypeValue,

                Minerals = selectedMinerals,

                Rock = selectedRock,

                MeteorClass = selectedMeteorClass,

                NumOfAcquiredSpectra = MeasurementInfoViewModel.NumOfAcquiredSpectra,

                NumOfAcquisitionsForSpectrum = MeasurementInfoViewModel.NumOfAcquisitionsForSpectrum,

                NumOfAcquiredSpectra = InfoMeasurementInfoViewModel.NumOfAcquiredSpectra,

                NumOfAcquisitionsForSpectrum = InfoMeasurementInfoViewModel.NumOfAcquisitionsForSpectrum,

            };



            string spectrumFilename = WorkingItems.SpectraContainer.tryGetSpectrumOfType(SpectrumType.Raw).Filename;
@@ -235,11 +235,11 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 


        public async Task showInfoAndSampleDataViewModelsAsync()

        {

            if (MeasurementInfoViewModel == null)

                MeasurementInfoViewModel = await userControlsViewModelFactory.createMeasurementInfoViewModelAsync();

            if (InfoMeasurementInfoViewModel == null)

                InfoMeasurementInfoViewModel = await userControlsViewModelFactory.createMeasurementInfoViewModelAsync();



            if (SampleDataViewModel == null)

                SampleDataViewModel = await userControlsViewModelFactory.createSampleDataViewModelAsync();

            if (InfoSampleDataViewModel == null)

                InfoSampleDataViewModel = await userControlsViewModelFactory.createSampleDataViewModelAsync();



            raiseIsInfoUserControlRequired();

        }