Commit 26b7fc42 authored by Francesco Carraro's avatar Francesco Carraro
Browse files

fixed saving of incidence/emission angles

parent 599a3374

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

+4 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ 
  <data name="SampleDataOriginTypeLabel.Text" xml:space="preserve">

    <value>Select sample origin type</value>

  </data>

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

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

    <value>Fill info about current sample</value>

  </data>

  <data name="SampleDataTypeLabel.Text" xml:space="preserve">
@@ -1003,4 +1003,7 @@ 
  <data name="MeasurementInfoSpectrumInfoLabel.Text" xml:space="preserve">

    <value>Spectrum info</value>

  </data>

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

    <value>Fill info about measurement</value>

  </data>

</root>
 
 No newline at end of file

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

+2 −0
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
                Minerals = selectedMinerals,

                Rock = selectedRock,

                MeteorClass = selectedMeteorClass,

                EmissionAngle = InfoMeasurementInfoViewModel.EmissionAngle,

                IncidenceAngle = InfoMeasurementInfoViewModel.IncidenceAngle,

                NumOfAcquiredSpectra = InfoMeasurementInfoViewModel.NumOfAcquiredSpectra,

                NumOfAcquisitionsForSpectrum = InfoMeasurementInfoViewModel.NumOfAcquisitionsForSpectrum,

            };

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

+33 −16
Original line number Diff line number Diff line
@@ -10,6 +10,36 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels.UserControlViewModels 
        public InfoMeasurementInfoViewModel(IServiceProvider serviceProvider) : base(serviceProvider)

        { }



        #region properties

        private double? emissionAngle;

        public double? EmissionAngle

        {

            get { return emissionAngle; }

            set { SetProperty(ref emissionAngle, value); }

        }



        private double? incidenceAngle;

        public double? IncidenceAngle

        {

            get { return incidenceAngle; }

            set { SetProperty(ref incidenceAngle, value); }

        }



        private int numOfAcquiredSpectra;

        public int NumOfAcquiredSpectra

        {

            get { return numOfAcquiredSpectra; }

            set { SetProperty(ref numOfAcquiredSpectra, value); }

        }



        private int numOfAcquisitionsForSpectrum;

        public int NumOfAcquisitionsForSpectrum

        {

            get { return numOfAcquisitionsForSpectrum; }

            set { SetProperty(ref numOfAcquisitionsForSpectrum, value); }

        }

        #endregion



        public async Task initAsync()

        {

            AreInfoAvailableOnCloud = false;
@@ -39,24 +69,11 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels.UserControlViewModels 


        private void setRetrievedMeasurementInfoValues(SpectrumFileMeasurementInfoValues spectrumFileMeasurementInfoValues)

        {

            EmissionAngle = spectrumFileMeasurementInfoValues.EmissionAngle;

            IncidenceAngle = spectrumFileMeasurementInfoValues.IncidenceAngle;

            NumOfAcquiredSpectra = spectrumFileMeasurementInfoValues.NumOfAcquiredSpectra;

            numOfAcquisitionsForSpectrum = spectrumFileMeasurementInfoValues.NumOfAcquisitionsForSpectrum;

        }



        #region properties

        private int numOfAcquiredSpectra;

        public int NumOfAcquiredSpectra

        {

            get { return numOfAcquiredSpectra; }

            set { SetProperty(ref numOfAcquiredSpectra, value); }

        }

            NumOfAcquisitionsForSpectrum = spectrumFileMeasurementInfoValues.NumOfAcquisitionsForSpectrum;



        private int numOfAcquisitionsForSpectrum;

        public int NumOfAcquisitionsForSpectrum

        {

            get { return numOfAcquisitionsForSpectrum; }

            set { SetProperty(ref numOfAcquisitionsForSpectrum, value); }

        }

        #endregion

    }

}

INAF.Apps.Uwp.SLabDataManager/Views/UserControls/ChartPanels/InfoUserControl.xaml

+13 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
                        <RowDefinition Height="*" />

                    </Grid.RowDefinitions>

                    <!-- TITLE BAR -->

                    <TextBlock x:Uid="SampleDataTitle"

                    <TextBlock x:Uid="InfoSampleDataTitle"

                               Margin="8"

                               TextAlignment="Center"

                               FontSize="18"
@@ -539,6 +539,16 @@ 
                                <TextBlock x:Uid="InfoSpectrumFileSampleDataAvailableOnCloud" />

                            </ToolTipService.ToolTip>

                        </FontIcon>

                        <!-- LABEL -->

                        <TextBlock x:Uid="InfoMeasurementInfoDataTitle"

                                   Text="Fill info about measurement"

                                   HorizontalAlignment="Center"

                                   Margin="8"

                                   TextAlignment="Center"

                                   FontSize="18"

                                   Grid.Row="0"

                                   Grid.Column="0"

                                   Grid.ColumnSpan="2" />

                        <!-- BORDER INFO ABOUT SPECTRUM -->

                        <Border x:Name="borderSpectrumInfo"

                                BorderThickness="1"
@@ -619,7 +629,7 @@ 
                                                        MaxWidth="300"

                                                        Margin="8,8,0,0"

                                                        HorizontalAlignment="Left"

                                                        Value="{Binding ElementName=self, Path=InfoMeasurementInfoViewModel.NumOfAcquiredSpectra, Mode=TwoWay}"

                                                        Value="{Binding ElementName=self, Path=InfoMeasurementInfoViewModel.IncidenceAngle, Mode=TwoWay}"

                                                        SpinButtonPlacementMode="Inline"

                                                        SmallChange="0.1"

                                                        LargeChange="1"
@@ -632,7 +642,7 @@ 
                                                        MaxWidth="300"

                                                        Margin="8,16,0,0"

                                                        HorizontalAlignment="Left"

                                                        Value="{Binding ElementName=self, Path=InfoMeasurementInfoViewModel.NumOfAcquisitionsForSpectrum, Mode=TwoWay}"

                                                        Value="{Binding ElementName=self, Path=InfoMeasurementInfoViewModel.EmissionAngle, Mode=TwoWay}"

                                                        SpinButtonPlacementMode="Inline"

                                                        SmallChange="0.1"

                                                        LargeChange="1"