From e6be03de10afc55c2ceac18dbd690e2ed127c8d8 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Mon, 18 Mar 2019 13:33:45 +0200
Subject: Improved Job Outline Control. Improved job events grid performance.

---
 .../Converters/StringToEllipsisConverter.cs        | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/StringToEllipsisConverter.cs

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/StringToEllipsisConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/StringToEllipsisConverter.cs
new file mode 100644
index 000000000..2a14bce1e
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/StringToEllipsisConverter.cs
@@ -0,0 +1,31 @@
+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.MachineStudio.Developer.Converters
+{
+    public class StringToEllipsisConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            String text = value as String;
+            int length = 0;
+
+            if (text != null && parameter != null && int.TryParse(parameter.ToString(), out length))
+            {
+                return text.Ellipsis(length);
+            }
+
+            return String.Empty;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
-- 
cgit v1.3.1


From 73327143a2ac187695bed0ecded52c4d675165c4 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 18 Mar 2019 15:01:20 +0200
Subject: Fixed issue with brush stop duplication on developer module.

---
 .../Converters/LiquidVolumesToLubricantLiquidVolume.cs        | 11 +++++++++--
 .../Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs    |  1 +
 .../Modules/Tango.MachineStudio.Developer/Views/JobView.xaml  |  6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/LiquidVolumesToLubricantLiquidVolume.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/LiquidVolumesToLubricantLiquidVolume.cs
index e59141e7f..5939bfd53 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/LiquidVolumesToLubricantLiquidVolume.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/LiquidVolumesToLubricantLiquidVolume.cs
@@ -14,8 +14,15 @@ namespace Tango.MachineStudio.Developer.Converters
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            IEnumerable<LiquidVolume> liquid_volumes = value as IEnumerable<LiquidVolume>;
-            return liquid_volumes.SingleOrDefault(x => x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.Lubricant.ToInt32());
+            if (value != null)
+            {
+                IEnumerable<LiquidVolume> liquid_volumes = value as IEnumerable<LiquidVolume>;
+                return liquid_volumes.SingleOrDefault(x => x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.Lubricant.ToInt32());
+            }
+            else
+            {
+                return null;
+            }
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 41f57794a..02431fd98 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -2179,6 +2179,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 var cloned = stop.Clone();
                 cloned.StopIndex = SelectedSegment.BrushStops.Max(x => x.StopIndex) + 1;
+                cloned.SetLiquidVolumes(ActiveJob.Machine.Configuration, SelectedRML, SelectedProcessParametersTable);
                 SelectedSegment.BrushStops.Add(cloned);
             }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 9504d5769..c4c831011 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -962,11 +962,11 @@
                                                                                                                 <Run FontFamily="{StaticResource digital-7}" Text="{Binding OffsetPercent,StringFormat={}{0:F1}%}"></Run>
                                                                                                                 <Run FontSize="12" Foreground="Gray" Text="{Binding OffsetMeters,Mode=OneWay,StringFormat={}   ( {0:F1}m )}"></Run>
                                                                                                 </TextBlock>
-                                                                                                <Slider ValueChanged="Offset_Slider_ValueChanged" Style="{StaticResource GradientOffsetSlider}" SmallChange="0.1" IsSnapToTickEnabled="True" TickFrequency="0.1" Margin="0 20 0 0" HorizontalAlignment="Center" Width="300" Value="{Binding OffsetPercent}" IsEnabled="{Binding IsMiddle}">
+                                                                                                <Slider ValueChanged="Offset_Slider_ValueChanged" Style="{StaticResource GradientOffsetSlider}" SmallChange="0.1" IsSnapToTickEnabled="True" TickFrequency="0.1" Margin="0 20 0 0" HorizontalAlignment="Center" Width="300" Value="{Binding OffsetPercent}" IsEnabled="{Binding IsMiddle}" Minimum="0" Maximum="100">
                                                                                                     <Slider.Foreground>
                                                                                                         <SolidColorBrush Color="{Binding Color}"></SolidColorBrush>
                                                                                                     </Slider.Foreground>
-                                                                                                    <Slider.Minimum>
+                                                                                                    <!--<Slider.Minimum>
                                                                                                         <MultiBinding Converter="{StaticResource BrushStopToOffsetLimitConverter}" ConverterParameter="min">
                                                                                                             <Binding Path="."></Binding>
                                                                                                             <Binding RelativeSource="{RelativeSource AncestorType=UserControl,Mode=FindAncestor}" Path="DataContext.SelectedSegment"></Binding>
@@ -979,7 +979,7 @@
                                                                                                             <Binding RelativeSource="{RelativeSource AncestorType=UserControl,Mode=FindAncestor}" Path="DataContext.SelectedSegment"></Binding>
                                                                                                             <Binding Path="StopIndex"></Binding>
                                                                                                         </MultiBinding>
-                                                                                                    </Slider.Maximum>
+                                                                                                    </Slider.Maximum>-->
                                                                                                 </Slider>
                                                                                             </StackPanel>
                                                                                         </Grid>
-- 
cgit v1.3.1