From c8890c60c3ee1d9f33606d272fdc45e6f7f5ef3f Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 25 Jun 2018 11:16:50 +0300
Subject: Working on PPC job view gradients..

---
 Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
index 2629c6a14..448798e66 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
@@ -26,6 +26,8 @@
             <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" />
             <converters:DateTimeUTCToShortDateConverter x:Key="DateTimeUTCToShortDateConverter" />
             <converters:MathOperatorConverter x:Key="MathOperatorConverter" />
+            <converters:IsSegmentGradientConverter x:Key="IsSegmentGradientConverter" />
+            <converters:IsSegmentGradientToVisibilityConverter x:Key="IsSegmentGradientToVisibilityConverter" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
-- 
cgit v1.3.1


From 3c76016cff1a5e5d9c2ad270a954056e77ea9ce8 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 26 Jun 2018 13:54:56 +0300
Subject: Fixed issue on numeric text input. Updated machine studio update
 service to accept hashed passwords.. Added Job summery to job view.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 1572864 -> 1572864 bytes
 .../MachineStudioUpdateService.svc.cs              |   7 +-
 .../PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml  | 101 +++++++++++++++++++--
 .../PPC/Tango.PPC.Common/Resources/Merged.xaml     |   5 +
 .../Tango.BL/EntitiesExtensions/Job.cs             |  55 +++++++++++
 .../Converters/OneToPercentConverter.cs            |  23 +++++
 .../Converters/SegmentLengthToWidthConverter.cs    |  53 +++++++++++
 .../Converters/WidthHeightToRectConverter.cs       |  26 ++++++
 .../Tango.SharedUI/Tango.SharedUI.csproj           |   3 +
 .../Tango.Touch/Controls/TouchNumericTextBox.cs    |  10 +-
 .../Tango.Touch/Controls/TouchNumericTextBox.xaml  |   6 ++
 .../Tango.Touch/Controls/TouchSlider.xaml          |  14 +--
 .../Visual_Studio/Tango.Touch/Resources/Fonts.xaml |   1 +
 14 files changed, 279 insertions(+), 25 deletions(-)
 create mode 100644 Software/Visual_Studio/Tango.SharedUI/Converters/OneToPercentConverter.cs
 create mode 100644 Software/Visual_Studio/Tango.SharedUI/Converters/SegmentLengthToWidthConverter.cs
 create mode 100644 Software/Visual_Studio/Tango.SharedUI/Converters/WidthHeightToRectConverter.cs

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common')

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 3f8e84e8b..655618cca 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 251cd8ee9..3ca849535 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
index b90a03c1d..49521fb1d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
@@ -60,8 +60,7 @@ namespace Tango.MachineStudio.UpdateService
                     db.UsersRoles.ToList();
                     db.RolesPermissions.ToList();
 
-                    String hash = User.GetPasswordHash(request.Password);
-                    var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == hash);
+                    var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == request.Password);
 
                     if (user != null && user.HasPermission(Permissions.RunMachineStudio) || (request.Email == "ForceUpdate"))
                     {
@@ -111,9 +110,7 @@ namespace Tango.MachineStudio.UpdateService
                     db.UsersRoles.ToList();
                     db.RolesPermissions.ToList();
 
-                    String hash = User.GetPasswordHash(request.Password);
-
-                    var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == hash);
+                    var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == request.Password);
 
                     if (user != null && user.HasPermission(Permissions.PublishMachineStudioVersion))
                     {
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
index c3817c5d1..c42435f94 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
@@ -13,7 +13,7 @@
              xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:local="clr-namespace:Tango.PPC.Jobs.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:JobViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.JobViewVM}">
+             d:DesignHeight="2000" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:JobViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.JobViewVM}">
 
     <UserControl.Resources>
         <Style TargetType="FrameworkElement" x:Key="Level1Container">
@@ -36,15 +36,15 @@
 
         <DataTemplate x:Key="CMYK_Template" DataType="{x:Type entities:BrushStop}">
             <UniformGrid Rows="1" Columns="4">
-                <touch:TouchNumericTextBox Margin="2 0" HorizontalContentAlignment="Center" Value="{Binding Cyan}" keyboard:KeyboardView.Container="{Binding ElementName=Container}" HasDecimalPoint="True" Maximum="100" />
-                <touch:TouchNumericTextBox Margin="2 0" HorizontalContentAlignment="Center" Value="{Binding Magenta}" keyboard:KeyboardView.Container="{Binding ElementName=Container}" HasDecimalPoint="True" Maximum="100" />
-                <touch:TouchNumericTextBox Margin="2 0" HorizontalContentAlignment="Center" Value="{Binding Yellow}" keyboard:KeyboardView.Container="{Binding ElementName=Container}" HasDecimalPoint="True" Maximum="100" />
-                <touch:TouchNumericTextBox Margin="2 0" HorizontalContentAlignment="Center" Value="{Binding Black}" keyboard:KeyboardView.Container="{Binding ElementName=Container}" HasDecimalPoint="True" Maximum="100" />
+                <touch:TouchNumericTextBox Margin="2 0" HorizontalContentAlignment="Center" Value="{Binding Cyan,Converter={StaticResource OneToPercentConverter}}" keyboard:KeyboardView.Container="{Binding ElementName=Container}" HasDecimalPoint="True" Maximum="100"  StringFormat="0"  />
+                <touch:TouchNumericTextBox Margin="2 0" HorizontalContentAlignment="Center" Value="{Binding Magenta,Converter={StaticResource OneToPercentConverter}}" keyboard:KeyboardView.Container="{Binding ElementName=Container}" HasDecimalPoint="True" Maximum="100" StringFormat="0" />
+                <touch:TouchNumericTextBox Margin="2 0" HorizontalContentAlignment="Center" Value="{Binding Yellow,Converter={StaticResource OneToPercentConverter}}" keyboard:KeyboardView.Container="{Binding ElementName=Container}" HasDecimalPoint="True" Maximum="100" StringFormat="0" />
+                <touch:TouchNumericTextBox Margin="2 0" HorizontalContentAlignment="Center" Value="{Binding Black,Converter={StaticResource OneToPercentConverter}}" keyboard:KeyboardView.Container="{Binding ElementName=Container}" HasDecimalPoint="True" Maximum="100" StringFormat="0" />
             </UniformGrid>
         </DataTemplate>
 
         <DataTemplate x:Key="LAB_Template" DataType="{x:Type entities:BrushStop}">
-            <UniformGrid Rows="1" Columns="4">
+            <UniformGrid Rows="1" Columns="3">
                 <touch:TouchNumericTextBox Margin="2 0" HorizontalContentAlignment="Center" Value="{Binding L}" keyboard:KeyboardView.Container="{Binding ElementName=Container}" HasDecimalPoint="True" Minimum="0" Maximum="100" StringFormat="0.00" />
                 <touch:TouchNumericTextBox Margin="2 0" HorizontalContentAlignment="Center" Value="{Binding A}" keyboard:KeyboardView.Container="{Binding ElementName=Container}" HasDecimalPoint="True" Minimum="-128" Maximum="128" StringFormat="0.00" />
                 <touch:TouchNumericTextBox Margin="2 0" HorizontalContentAlignment="Center" Value="{Binding B}" keyboard:KeyboardView.Container="{Binding ElementName=Container}" HasDecimalPoint="True" Minimum="-128" Maximum="128" StringFormat="0.00" />
@@ -300,9 +300,17 @@
                                                                                     </ContentControl>
                                                                                 </DockPanel>
 
-                                                                                <DockPanel LastChildFill="False" Margin="0 20 0 0">
+                                                                                <DockPanel LastChildFill="False" Margin="0 20 0 0" IsEnabled="{Binding IsMiddle}">
                                                                                     <TextBlock VerticalAlignment="Bottom" DockPanel.Dock="Left">Position (m):</TextBlock>
-                                                                                    <touch:TouchNumericTextBox Margin="20 0 0 0" DockPanel.Dock="Right" HorizontalAlignment="Right" Width="300" Value="{Binding OffsetMeters}" HasDecimalPoint="True" StringFormat="0.0" Maximum="{Binding Segment.Length}" KeyboardContainer="{Binding ElementName=Container}"></touch:TouchNumericTextBox>
+                                                                                    <Grid Margin="20 0 0 0" Width="300" DockPanel.Dock="Right">
+                                                                                        <Grid.ColumnDefinitions>
+                                                                                            <ColumnDefinition Width="1*" />
+                                                                                            <ColumnDefinition Width="2*" />
+                                                                                        </Grid.ColumnDefinitions>
+
+                                                                                        <touch:TouchNumericTextBox Value="{Binding OffsetMeters}" HasDecimalPoint="True" StringFormat="0.0" Maximum="{Binding Segment.Length}" KeyboardContainer="{Binding ElementName=Container}"></touch:TouchNumericTextBox>
+                                                                                        <touch:TouchSlider Grid.Column="1" Height="30" Margin="10 0 0 -23" Maximum="{Binding Segment.Length}" Value="{Binding OffsetMeters}" />
+                                                                                    </Grid>
                                                                                 </DockPanel>
                                                                             </StackPanel>
                                                                         </Grid>
@@ -363,12 +371,87 @@
                                 </StackPanel>
                             </Border>
 
-                            <Border Style="{StaticResource TangoTouchBorder}" Margin="0 12 0 0" Padding="0 0 0 40">
+                            <Border Style="{StaticResource TangoTouchBorder}" Margin="0 20 0 0" Padding="0 0 0 50">
                                 <StackPanel>
                                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center"  Style="{StaticResource Level1Container}">
                                         <Image Source="../Images/JobView/job-summary.png" Width="39" />
                                         <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Job Summary</TextBlock>
                                     </StackPanel>
+
+                                    <StackPanel Style="{StaticResource Level2ContainerExtraMargin}">
+                                        <ItemsControl ClipToBounds="False" ItemsSource="{Binding Job.EffectiveSegments}">
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <StackPanel Orientation="Horizontal" ClipToBounds="False"></StackPanel>
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                            <ItemsControl.ItemTemplate>
+                                                <DataTemplate>
+                                                    <Grid>
+                                                        <Grid.Width>
+                                                            <MultiBinding Converter="{StaticResource SegmentLengthToWidthConverter}">
+                                                                <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.Job"></Binding>
+                                                                <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.Job.Length"></Binding>
+                                                                <Binding RelativeSource="{RelativeSource AncestorType=ItemsControl}" Path="ActualWidth"></Binding>
+                                                                <Binding Path="Length"></Binding>
+                                                            </MultiBinding>
+                                                        </Grid.Width>
+
+                                                        <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoSmallFontSize}">
+                                                             <Run Text="{Binding Length,Mode=OneWay,StringFormat=N0}"></Run><Run Text="m"></Run>
+                                                        </TextBlock>
+                                                    </Grid>
+                                                </DataTemplate>
+                                            </ItemsControl.ItemTemplate>
+                                        </ItemsControl>
+
+                                        <Border x:Name="brush_border" ClipToBounds="False" CornerRadius="10" Height="17" Margin="0 5 0 0">
+                                            <Border.Clip>
+                                                <RectangleGeometry RadiusX="10" RadiusY="10">
+                                                    <RectangleGeometry.Rect>
+                                                        <MultiBinding Converter="{StaticResource WidthHeightToRectConverter}">
+                                                            <Binding ElementName="brush_border" Path="ActualWidth"  />
+                                                            <Binding ElementName="brush_border" Path="ActualHeight"  />
+                                                        </MultiBinding>
+                                                    </RectangleGeometry.Rect>
+                                                </RectangleGeometry>
+                                            </Border.Clip>
+                                            <Grid>
+                                                <ItemsControl ClipToBounds="False" ItemsSource="{Binding Job.EffectiveSegments}">
+                                                    <ItemsControl.ItemsPanel>
+                                                        <ItemsPanelTemplate>
+                                                            <StackPanel Orientation="Horizontal" ClipToBounds="False"></StackPanel>
+                                                        </ItemsPanelTemplate>
+                                                    </ItemsControl.ItemsPanel>
+                                                    <ItemsControl.ItemTemplate>
+                                                        <DataTemplate>
+                                                            <Grid>
+                                                                <Grid.Width>
+                                                                    <MultiBinding Converter="{StaticResource SegmentLengthToWidthConverter}">
+                                                                        <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.Job"></Binding>
+                                                                        <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.Job.Length"></Binding>
+                                                                        <Binding RelativeSource="{RelativeSource AncestorType=ItemsControl}" Path="ActualWidth"></Binding>
+                                                                        <Binding Path="Length"></Binding>
+                                                                    </MultiBinding>
+                                                                </Grid.Width>
+                                                                <Rectangle>
+                                                                    <Rectangle.Fill>
+                                                                        <MultiBinding Converter="{StaticResource SegmentToBrushConverterMulti}">
+                                                                            <Binding Path="."></Binding>
+                                                                            <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.Job"></Binding>
+                                                                            <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.Job.Length"></Binding>
+                                                                        </MultiBinding>
+                                                                    </Rectangle.Fill>
+                                                                </Rectangle>
+                                                            </Grid>
+                                                        </DataTemplate>
+                                                    </ItemsControl.ItemTemplate>
+                                                </ItemsControl>
+
+                                                <Rectangle Stroke="{StaticResource TangoGrayBrush}" StrokeThickness="1" StrokeDashArray="5 5 5 5" RadiusX="10" RadiusY="10" />
+                                            </Grid>
+                                        </Border>
+                                    </StackPanel>
                                 </StackPanel>
                             </Border>
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
index 448798e66..5c03af129 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
@@ -28,6 +28,11 @@
             <converters:MathOperatorConverter x:Key="MathOperatorConverter" />
             <converters:IsSegmentGradientConverter x:Key="IsSegmentGradientConverter" />
             <converters:IsSegmentGradientToVisibilityConverter x:Key="IsSegmentGradientToVisibilityConverter" />
+            <converters:SegmentToBrushConverterMulti x:Key="SegmentToBrushConverterMulti" />
+            <converters:SegmentLengthToWidthConverter x:Key="SegmentLengthToWidthConverter" />
+            <converters:WidthHeightToRectConverter x:Key="WidthHeightToRectConverter" />
+            <converters:OneToPercentConverter x:Key="OneToPercentConverter" />
+            
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Job.cs b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Job.cs
index 623a94f43..71a2285ad 100644
--- a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Job.cs
+++ b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Job.cs
@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Drawing;
 using System.Linq;
@@ -98,6 +99,48 @@ namespace Tango.BL.Entities
             }
         }
 
+        /// <summary>
+        /// Gets or sets the effective segments.
+        /// </summary>
+        [NotMapped]
+        [JsonIgnore]
+        public ObservableCollection<Segment> EffectiveSegments
+        {
+            get
+            {
+                if (EnableInterSegment)
+                {
+                    ObservableCollection<Segment> effectiveSegments = new ObservableCollection<Segment>();
+                    foreach (var s in Segments)
+                    {
+                        effectiveSegments.Add(s);
+
+                        if (Segments.IndexOf(s) != Segments.Count - 1)
+                        {
+                            effectiveSegments.Add(new Segment()
+                            {
+                                Length = InterSegmentLength,
+                                BrushStops = new ObservableCollection<BrushStop>()
+                            {
+                                new BrushStop()
+                                {
+                                     ColorSpace = new ColorSpace(),
+                                     Color = System.Windows.Media.Colors.White,
+                                }
+                            },
+                            });
+                        }
+                    }
+
+                    return effectiveSegments;
+                }
+                else
+                {
+                    return Segments;
+                }
+            }
+        }
+
         #endregion
 
         #region Event Handlers
@@ -115,6 +158,7 @@ namespace Tango.BL.Entities
             }
 
             OnLengthChanged();
+            RaisePropertyChanged(nameof(EffectiveSegments));
         }
 
         /// <summary>
@@ -163,12 +207,23 @@ namespace Tango.BL.Entities
                     Segments.CollectionChanged += Segments_CollectionChanged;
 
                     OnLengthChanged();
+                    RaisePropertyChanged(nameof(EffectiveSegments));
                 }
             }
 
             if (propName == nameof(InterSegmentLength) || propName == nameof(EnableInterSegment))
             {
                 OnLengthChanged();
+                RaisePropertyChanged(nameof(EffectiveSegments));
+            }
+
+            if (propName == nameof(ColorSpace))
+            {
+                //Make all brush stops the same color space if job color space is not null!
+                if (ColorSpace != null)
+                {
+                    Segments.SelectMany(x => x.BrushStops).ToList().ForEach(x => x.ColorSpace = ColorSpace);
+                }
             }
         }
 
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/OneToPercentConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/OneToPercentConverter.cs
new file mode 100644
index 000000000..1aaf8a873
--- /dev/null
+++ b/Software/Visual_Studio/Tango.SharedUI/Converters/OneToPercentConverter.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace Tango.SharedUI.Converters
+{
+    public class OneToPercentConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return System.Convert.ToDouble(value) * 100d;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return System.Convert.ToDouble(value) / 100d;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/SegmentLengthToWidthConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/SegmentLengthToWidthConverter.cs
new file mode 100644
index 000000000..64699e053
--- /dev/null
+++ b/Software/Visual_Studio/Tango.SharedUI/Converters/SegmentLengthToWidthConverter.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+using Tango.BL.Entities;
+
+namespace Tango.SharedUI.Converters
+{
+    public class SegmentLengthToWidthConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            try
+            {
+                if (values.Length == 4)
+                {
+                    Job job = values[0] as Job;
+
+                    if (job != null && values[1] is double)
+                    {
+                        double jobLength = System.Convert.ToDouble(values[1]);
+                        double elementWidth = System.Convert.ToDouble(values[2]);
+                        double segmentLength = System.Convert.ToDouble(values[3]);
+                        double totalLength = job.Length;
+
+                        return (segmentLength / totalLength) * elementWidth;
+                    }
+                    else
+                    {
+                        return 0d;
+                    }
+                }
+                else
+                {
+                    return 0d;
+                }
+            }
+            catch
+            {
+                return 0d;
+            }
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/WidthHeightToRectConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/WidthHeightToRectConverter.cs
new file mode 100644
index 000000000..25d7c7579
--- /dev/null
+++ b/Software/Visual_Studio/Tango.SharedUI/Converters/WidthHeightToRectConverter.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Tango.SharedUI.Converters
+{
+    public class WidthHeightToRectConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            double width = (double)values[0];
+            double height = (double)values[1];
+            return new Rect(new Size(width, height));
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
index b383c17c5..9048b487e 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
+++ b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
@@ -99,6 +99,8 @@
     <Compile Include="Converters\LastItemInContainerToBooleanConverter.cs" />
     <Compile Include="Converters\MathOperatorConverter.cs" />
     <Compile Include="Converters\NumberToFileSizeConverter.cs" />
+    <Compile Include="Converters\OneToPercentConverter.cs" />
+    <Compile Include="Converters\SegmentLengthToWidthConverter.cs" />
     <Compile Include="Converters\SegmentToBrushConverter.cs" />
     <Compile Include="Converters\SegmentToBrushConverterMulti.cs" />
     <Compile Include="Converters\SmallerThanToBooleanConverter.cs" />
@@ -112,6 +114,7 @@
     <Compile Include="Converters\StringFormatConverter.cs" />
     <Compile Include="Converters\StringNullOrEmptyToBooleanConverter.cs" />
     <Compile Include="Converters\StringToWordsConverter.cs" />
+    <Compile Include="Converters\WidthHeightToRectConverter.cs" />
     <Compile Include="DialogViewVM.cs" />
     <Compile Include="Editors\IParameterItemEditor.cs" />
     <Compile Include="Editors\ParameterItemEditor.cs" />
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
index 1453a38a6..09b5e8f96 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
@@ -177,12 +177,12 @@ namespace Tango.Touch.Controls
                 {
                     _text_block.Text = Value.ToString();
                 }
+            }
 
-                BindingExpression b = GetBindingExpression(ValueProperty);
-                if (b != null)
-                {
-                    b.UpdateSource();
-                }
+            BindingExpression b = GetBindingExpression(ValueProperty);
+            if (b != null)
+            {
+                b.UpdateSource();
             }
         }
 
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml
index 4d37ce1fd..7c3feb2df 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml
@@ -106,6 +106,12 @@
                             </DockPanel>
                         </DockPanel>
                     </Border>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{StaticResource TangoGrayTextBrush}"></Setter>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchSlider.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchSlider.xaml
index 6dbbefabe..dc9fc0b73 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchSlider.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchSlider.xaml
@@ -61,11 +61,10 @@
             <!--<Trigger Property="IsDragging" Value="true">
                 <Setter Property="Fill" TargetName="grip" Value="{StaticResource TangoPrimaryAccentBrush}"/>
                 <Setter Property="Stroke" TargetName="grip" Value="{StaticResource TangoPrimaryAccentBrush}"/>
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Fill" TargetName="grip" Value="{StaticResource TangoPrimaryAccentBrush}"/>
-                <Setter Property="Stroke" TargetName="grip" Value="{StaticResource TangoPrimaryAccentBrush}"/>
             </Trigger>-->
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Fill" TargetName="grip" Value="{StaticResource TangoGrayBrush}"/>
+            </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
@@ -74,8 +73,8 @@
     <ControlTemplate x:Key="SliderHorizontal" TargetType="{x:Type Slider}">
         <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
             <Grid>
-                <Border x:Name="TrackBackground" Height="2" Background="{StaticResource TangoGrayBrush}" Grid.Row="1" VerticalAlignment="Center">
-                    <Canvas Margin="-20 0 0 0">
+                <Border x:Name="TrackBackground" Height="1" Background="{StaticResource TangoGrayBrush}" Grid.Row="1" VerticalAlignment="Center">
+                    <Canvas Margin="-15 0 0 0">
                         <Rectangle x:Name="PART_SelectionRange" Fill="{StaticResource TangoPrimaryAccentBrush}" Height="{Binding RelativeSource={RelativeSource AncestorType=Canvas},Path=ActualHeight}" Visibility="Hidden"/>
                     </Canvas>
                 </Border>
@@ -99,6 +98,9 @@
             <Trigger Property="local:TouchSlider.IsMouseOrTouchDown" Value="True">
                 <Setter Property="Height" TargetName="TrackBackground" Value="3"></Setter>
             </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Fill" TargetName="PART_SelectionRange" Value="{StaticResource TangoGrayBrush}"/>
+            </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
diff --git a/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml b/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
index 90fc7bb5c..fd7f80045 100644
--- a/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
@@ -5,6 +5,7 @@
 
     <FontFamily x:Key="TangoFlexoFontFamily">Flexo</FontFamily>
 
+    <sys:Double x:Key="TangoSmallFontSize">14</sys:Double>
     <sys:Double x:Key="TangoDefaultFontSize">16</sys:Double>
     <sys:Double x:Key="TangoDataGridHeaderFontSize">16</sys:Double>
     <sys:Double x:Key="TangoNavigationLinksFontSize">18</sys:Double>
-- 
cgit v1.3.1