Commit 9ff65de4 authored by Francesco Carraro's avatar Francesco Carraro
Browse files

minor fixes for UI

parent a438b702

INAF.Apps.Uwp.SLabDataManager/Helpers/UI/AnimationsHelper.cs

+4 −2
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers.UI 
{

    public class AnimationsHelper

    {

        private static readonly int TO = -20;



        public static Storyboard GetExpandWidthStoryboard(FrameworkElement frameworkElement,

                                                          double refWidth)

        {
@@ -50,7 +52,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers.UI 
            DoubleAnimation translateAnimation = new DoubleAnimation()

            {

                From = from,

                To = 0,

                To = TO,

                Duration = TimeSpan.FromMilliseconds(300),

                EnableDependentAnimation = true,

                EasingFunction = new CubicEase() { EasingMode = EasingMode.EaseIn }
@@ -68,7 +70,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers.UI 
        {

            DoubleAnimation translateAnimation = new DoubleAnimation()

            {

                From = 0,

                From = TO,

                To = to,

                Duration = TimeSpan.FromMilliseconds(300),

                EnableDependentAnimation = true,

INAF.Apps.Uwp.SLabDataManager/Helpers/UI/UserControlsHelper.cs

+21 −8
Original line number Diff line number Diff line
@@ -56,6 +56,17 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers.UI 
            raiseIsAnyUserControlAddedOrRemoved();

        }



        public void bringToFrontUserControl(string name)

        {

            foreach (UserControl userControl in UserControls)

            {

                if (userControl.Name.Equals(name))

                    userControl.SetValue(Canvas.ZIndexProperty, 10);

                else

                    userControl.SetValue(Canvas.ZIndexProperty, 1);

            }

        }



        private void checkIsAvailable()

        {

            if (UserControls.Count > 1)
@@ -69,15 +80,17 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers.UI 
            return UserControls.Any(x => x.Name.Equals(name));

        }



        public void bringToFrontUserControl(string name)

        public double getUserControlWidth()

        {

            foreach (UserControl userControl in UserControls)

            {

                if (userControl.Name.Equals(name))

                    userControl.SetValue(Canvas.ZIndexProperty, 10);

            if (UserControls.Any())

                return UserControls.FirstOrDefault().Width;

            else

                    userControl.SetValue(Canvas.ZIndexProperty, 1);

                return 0;

        }



        public bool isAnyUserControl()

        {

            return UserControls.Any();

        }



        private void raiseIsAnyUserControlAddedOrRemoved()

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

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,13 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
        }



        #region properties

        private bool isZoomActive;

        public bool IsZoomActive

        {

            get { return isZoomActive; }

            set { SetProperty(ref isZoomActive, value); }

        }



        private bool isZoomPanelAutoOpenEnabled;

        public bool IsZoomPanelAutoOpenEnabled

        {
@@ -80,6 +87,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 


            initZoomSettings();



            IsZoomActive = false;

            IsZoomDrawRegionRequested = false;

            IsLegendItemTapped = false;

        }

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

+2 −14
Original line number Diff line number Diff line
@@ -233,13 +233,6 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
            set { SetProperty(ref isHideAlignmentFlyoutRequired, value); }

        }



        private bool isSampleDataPanelVisible;

        public bool IsSampleDataPanelVisible

        {

            get { return isSampleDataPanelVisible; }

            set { SetProperty(ref isSampleDataPanelVisible, value); }

        }



        private bool isSegmentsFitsUserControlAutoOpenEnabled;

        public bool IsSegmentsFitsUserControlAutoOpenEnabled

        {
@@ -261,8 +254,6 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
            set { SetProperty(ref isSegmentsFitsUserControlAvailable, value); }

        }



        public int SampleDataPanelTranslation { get; set; }



        private SampleDataViewModel sampleDataViewModel;

        public SampleDataViewModel SampleDataViewModel

        {
@@ -345,10 +336,6 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 


            IsHideAlignmentFlyoutRequired = false;



            /* sample-data panel */

            SampleDataPanelTranslation = 540;

            IsSampleDataPanelVisible = false;



            /* segmts-fit focus */

            IsDisableFitFocusRequired = false;

            IsFocusRequired = false;
@@ -481,7 +468,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 


        private void saveIsSegmentsFitUserControlAutoOpenEnabled()

        {

            settingsHelper.save(nameof(IsSegmentsFitsUserControlAutoOpenEnabled), IsSegmentsFitsUserControlAutoOpenEnabled);

            settingsHelper.save(nameof(IsSegmentsFitsUserControlAutoOpenEnabled), IsSegmentsFitsUserControlAutoOpenEnabled.ToString());

        }



        private void saveIsSegmentsFitsUserControlAutoOpenRequired()
@@ -1088,6 +1075,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
        private void resetZoom()

        {

            WorkingItems.SpectraContainer.updateBoundariesAsync();

            IsZoomActive = false;

        }

        #endregion

INAF.Apps.Uwp.SLabDataManager/Views/ChartPage.xaml

+11 −17
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
    xmlns:uihelpers="using:INAF.Apps.Uwp.SLabDataManager.Helpers.UI"

    xmlns:dialogs="using:INAF.Apps.Uwp.SLabDataManager.Views.ContentDialogs"

    xmlns:usercontrols="using:INAF.Apps.Uwp.SLabDataManager.Views.UserControls"

    xmlns:toolkitui="using:Microsoft.Toolkit.Uwp.UI"

    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"

    xmlns:xamlcontrols="using:Microsoft.UI.Xaml.Controls"

    xmlns:Core="using:Microsoft.Xaml.Interactions.Core"
@@ -105,7 +106,7 @@ 
                        Width="48"

                        Height="48"

                        Margin="8"

                        IsEnabled="{x:Bind ViewModel.IsZoomDrawRegionRequested, Mode=OneWay}"

                        IsEnabled="{x:Bind ViewModel.IsZoomActive, Mode=OneWay}"

                        Style="{StaticResource CircleButton}"

                        Background="{ThemeResource SystemAccentColor}"

                        Grid.Row="2"
@@ -286,6 +287,7 @@ 


    <!-- PAGE CONTENT -->

    <RelativePanel x:Name="ContentArea"

                   toolkitui:FrameworkElementExtensions.EnableActualSizeBinding="True"

                   Margin="{StaticResource MediumLeftRightMargin}">

        <!-- CHART LEGEND INFO BUTTON -->

        <Button x:Name="chartLegendInfoButton"
@@ -803,13 +805,10 @@ 
        <usercontrols:AlignmentConfigUserControl x:Name="alignmentConfigUserControl"

                                                 x:Load="{x:Bind ViewModel.UserControlsHelper.IsAnyUserControlAddedOrRemoved, Converter={StaticResource IsUserControlAvailableConverter}, ConverterParameter='alignmentConfigUserControl', Mode=OneWay}"

                                                 Width="400"

                                                 BorderBrush="{ThemeResource SystemAccentColor}"

                                                 BorderThickness="1,0,0,0"

                                                 Height="{Binding ElementName=ContentArea, Path=ActualHeight, Converter={StaticResource DimWithParameterConverter}, ConverterParameter='180', Mode=OneWay}"

                                                 Height="{Binding ElementName=ContentArea, Path=(toolkitui:FrameworkElementExtensions.ActualHeight), Converter={StaticResource DimWithParameterConverter}, ConverterParameter='180', Mode=OneWay}"

                                                 RelativePanel.Below="tabViewPanels"

                                                 RelativePanel.AlignRightWithPanel="True"

                                                 RelativePanel.RightOf="spectrumChart"

                                                 Canvas.ZIndex="1"

                                                 AreSeparatorsVisible="{x:Bind ViewModel.WorkingItems.SpectraContainer.SpectrumAlignmentConfig.AreSeparatorsVisible, Mode=TwoWay}"

                                                 SelectedRefBandXMin="{x:Bind ViewModel.WorkingItems.SpectraContainer.SelectedRefBand.XMin, Mode=OneWay}"

                                                 SelectedRefBandXMax="{x:Bind ViewModel.WorkingItems.SpectraContainer.SelectedRefBand.XMax, Mode=OneWay}"
@@ -829,9 +828,9 @@ 


        <!-- SAMPLE DATA -->

        <usercontrols:SampleDataUserControl x:Name="sampleDataUserControl"

                                            x:Load="{x:Bind ViewModel.IsSampleDataPanelVisible, Mode=OneWay}"

                                            x:Load="{x:Bind ViewModel.UserControlsHelper.IsAnyUserControlAddedOrRemoved, Converter={StaticResource IsUserControlAvailableConverter}, ConverterParameter='sampleDataUserControl', Mode=OneWay}"

                                            Width="400"

                                            Height="{Binding ElementName=ContentArea, Path=ActualHeight, Converter={StaticResource DimWithParameterConverter}, ConverterParameter='180', Mode=OneWay}"

                                            Height="{Binding ElementName=ContentArea, Path=(toolkitui:FrameworkElementExtensions.ActualHeight), Converter={StaticResource DimWithParameterConverter}, ConverterParameter='180', Mode=OneWay}"

                                            RelativePanel.Below="tabViewPanels"

                                            RelativePanel.RightOf="spectrumChart"

                                            RelativePanel.AlignRightWithPanel="True"
@@ -839,10 +838,7 @@ 
                                            CommandClearValues="{x:Bind ViewModel.CommandClearSampleDataValues}"

                                            CommandCloseUserControl="{x:Bind ViewModel.CommandCloseUserControl}"

                                            CommandRefreshSampleDataValues="{x:Bind ViewModel.CommandRefreshSampleDataValues}"

                                            CommandSaveSampleDataInfo="{x:Bind ViewModel.CommandSaveSampleDataInfo}"

                                            IsSampleDataPanelVisible="{x:Bind ViewModel.IsSampleDataPanelVisible, Mode=TwoWay}"

                                            SampleDataPanelTranslation="{x:Bind ViewModel.SampleDataPanelTranslation, Mode=OneWay}"

                                            Canvas.ZIndex="10">

                                            CommandSaveSampleDataInfo="{x:Bind ViewModel.CommandSaveSampleDataInfo}">

            <usercontrols:SampleDataUserControl.RenderTransform>

                <TranslateTransform X="400" Y="0" />

            </usercontrols:SampleDataUserControl.RenderTransform>
@@ -852,11 +848,10 @@ 
        <usercontrols:SegmentsFitUserControl x:Name="segmentsFitUserControl"

                                             x:Load="{x:Bind ViewModel.UserControlsHelper.IsAnyUserControlAddedOrRemoved, Converter={StaticResource IsUserControlAvailableConverter}, ConverterParameter='segmentsFitUserControl', Mode=OneWay}"

                                             Width="400"

                                             Height="{Binding ElementName=ContentArea, Path=ActualHeight, Converter={StaticResource DimWithParameterConverter}, ConverterParameter='180', Mode=TwoWay}"

                                             Height="{Binding ElementName=ContentArea, Path=(toolkitui:FrameworkElementExtensions.ActualHeight), Converter={StaticResource DimWithParameterConverter}, ConverterParameter='180', Mode=TwoWay}"

                                             RelativePanel.Below="tabViewPanels"

                                             RelativePanel.RightOf="spectrumChart"

                                             RelativePanel.AlignRightWithPanel="True"

                                             Canvas.ZIndex="1"

                                             NumOfPointsForMissingPoints="{x:Bind ViewModel.SegmentsFitModelHelper.NumOfPointsForMissingPoints, Mode=TwoWay}"

                                             SegmentsFitModelHelper="{x:Bind ViewModel.SegmentsFitModelHelper, Mode=OneWay}"

                                             AreButtonsForContinuumRemovedSpectrumEnabled="{x:Bind ViewModel.WorkingItems.SpectraContainer.IsAnySpectrumLoaded, Converter={StaticResource IsAnySpectrumOfTypeConverter}, ConverterParameter='ContinuumRemoved', Mode=OneWay}"
@@ -876,12 +871,12 @@ 
        <usercontrols:ZoomSettingsUserControl x:Name="zoomSettingsUserControl"

                                              x:Load="{x:Bind ViewModel.UserControlsHelper.IsAnyUserControlAddedOrRemoved, Converter={StaticResource IsUserControlAvailableConverter}, ConverterParameter='zoomSettingsUserControl', Mode=OneWay}"

                                              Width="400"

                                              Height="{Binding ElementName=ContentArea, Path=ActualHeight, Converter={StaticResource DimWithParameterConverter}, ConverterParameter='180', Mode=TwoWay}"

                                              Height="{Binding ElementName=ContentArea, Path=(toolkitui:FrameworkElementExtensions.ActualHeight), Converter={StaticResource DimWithParameterConverter}, ConverterParameter='180', Mode=TwoWay}"

                                              RelativePanel.Below="tabViewPanels"

                                              RelativePanel.RightOf="spectrumChart"

                                              RelativePanel.AlignRightWithPanel="True"

                                              Canvas.ZIndex="1"

                                              IsZoomPanelAutoOpenEnabled="{x:Bind ViewModel.IsZoomPanelAutoOpenEnabled, Mode=TwoWay}"                                              ZoomHelper="{x:Bind ViewModel.ZoomHelper, Mode=OneWay}"

                                              IsZoomPanelAutoOpenEnabled="{x:Bind ViewModel.IsZoomPanelAutoOpenEnabled, Mode=TwoWay}"

                                              ZoomHelper="{x:Bind ViewModel.ZoomHelper, Mode=OneWay}"

                                              ZoomCenter="{x:Bind ViewModel.ZoomCenter, Mode=TwoWay}"

                                              ZoomXAxisMaxValue="{x:Bind ViewModel.ZoomHelper.ZoomXAxisMaxValue, Mode=OneWay}"

                                              ZoomXAxisMinValue="{x:Bind ViewModel.ZoomHelper.ZoomXAxisMinValue, Mode=OneWay}"
@@ -889,7 +884,6 @@ 
                                              ZoomYAxisMinValue="{x:Bind ViewModel.ZoomHelper.ZoomYAxisMinValue, Mode=OneWay}"

                                              XShiftValue="{x:Bind ViewModel.ZoomHelper.ZoomRegionShiftX, Mode=TwoWay}"

                                              YShiftValue="{x:Bind ViewModel.ZoomHelper.ZoomRegionShiftY, Mode=TwoWay}"

                                              HorizontalAlignment="Right"

                                              CommandCloseUserControl="{x:Bind ViewModel.CommandCloseUserControl}"

                                              CommandMoveZoomRegion="{x:Bind ViewModel.CommandMoveZoomRegion}"

                                              CommandNavigateToLeft="{x:Bind ViewModel.CommandNavigateZoomToLeft}"