From de57858a147ece47a71e288660fbf85451e396b5 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 12 Feb 2018 17:56:24 +0200
Subject: Fixed issue with CMYK display on developer module.

---
 .../Modules/Tango.MachineStudio.Developer/Views/MainView.xaml    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
index cd5cdb8a2..f53fd003e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
@@ -57,6 +57,7 @@
         <localConverters:BrushStopToOffsetValueConverter x:Key="BrushStopToOffsetValueConverter" />
         <converters:StringEllipsisConverter x:Key="StringEllipsisConverter" />
         <converters:NumberToFileSizeConverter x:Key="NumberToFileSizeConverter"/>
+        <localConverters:OneToPercentConverter x:Key="OneToPercentConverter"/>
 
         <SolidColorBrush x:Key="SideBarBackground" Color="White">
 
@@ -1180,7 +1181,7 @@
                                                                                                                             <Setter.Value>
                                                                                                                                 <StackPanel Orientation="Horizontal">
                                                                                                                                     <ContentControl Style="{StaticResource numberBorder}" Foreground="Cyan" Width="50" Height="50" Margin="10 0 0 0">
-                                                                                                                                        <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Cyan, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                        <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Cyan,Converter={StaticResource OneToPercentConverter}, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                                                                                                                                             <mahapps:NumericUpDown.Resources>
                                                                                                                                                 <Style TargetType="TextBox"/>
                                                                                                                                             </mahapps:NumericUpDown.Resources>
@@ -1188,7 +1189,7 @@
                                                                                                                                     </ContentControl>
 
                                                                                                                                     <ContentControl Style="{StaticResource numberBorder}" Foreground="Magenta" Width="50" Height="50" Margin="10 0 0 0">
-                                                                                                                                        <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Magenta, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                        <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Magenta,Converter={StaticResource OneToPercentConverter}, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                                                                                                                                             <mahapps:NumericUpDown.Resources>
                                                                                                                                                 <Style TargetType="TextBox"/>
                                                                                                                                             </mahapps:NumericUpDown.Resources>
@@ -1196,7 +1197,7 @@
                                                                                                                                     </ContentControl>
 
                                                                                                                                     <ContentControl Style="{StaticResource numberBorder}" Foreground="Yellow" Width="50" Height="50" Margin="10 0 0 0">
-                                                                                                                                        <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Yellow, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                        <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Yellow,Converter={StaticResource OneToPercentConverter}, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                                                                                                                                             <mahapps:NumericUpDown.Resources>
                                                                                                                                                 <Style TargetType="TextBox"/>
                                                                                                                                             </mahapps:NumericUpDown.Resources>
@@ -1204,7 +1205,7 @@
                                                                                                                                     </ContentControl>
 
                                                                                                                                     <ContentControl Style="{StaticResource numberBorder}" Foreground="Black" Width="50" Height="50" Margin="10 0 0 0">
-                                                                                                                                        <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Black, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                        <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Black,Converter={StaticResource OneToPercentConverter}, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                                                                                                                                             <mahapps:NumericUpDown.Resources>
                                                                                                                                                 <Style TargetType="TextBox"/>
                                                                                                                                             </mahapps:NumericUpDown.Resources>
-- 
cgit v1.3.1


From 5ad6f22637da5afba7c6c00de7585c385e30e0b0 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 13 Feb 2018 14:03:05 +0200
Subject: Implemented DispensingDivisionStep.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 8388608 -> 8388608 bytes
 .../ViewModels/MainViewVM.cs                       |   2 +-
 .../Views/MainView.xaml                            |  70 ++++++++++++++++++---
 .../Dispensing/DispenserStepDivisions.cs           |  27 ++++++++
 .../Dispensing/DispensingCalcBase.cs               |   2 +-
 .../Tango.Integration/Printing/LiquidVolume.cs     |   8 +++
 .../Tango.Integration/Tango.Integration.csproj     |   1 +
 .../Converters/EnumToItemsSourceConverter.cs       |   2 +-
 9 files changed, 100 insertions(+), 12 deletions(-)
 create mode 100644 Software/Visual_Studio/Tango.Integration/Dispensing/DispenserStepDivisions.cs

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

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 0d352d3a1..dee5d4c24 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 8cafb6614..8e9fee248 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
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 f9ec5b063..8ce8c64d0 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
@@ -916,7 +916,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         private void UpdateEstimatedDuration()
         {
-            if (SelectedJob != null && SelectedProcessParametersTable != null)
+            if (SelectedJob != null && SelectedProcessParametersTable != null && SelectedProcessParametersTable.DyeingSpeed > 0)
             {
                 EstimatedDuration = TimeSpan.FromSeconds(SelectedJob.Length / (SelectedProcessParametersTable.DyeingSpeed / 100d));
             }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
index f53fd003e..844a38917 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
@@ -7,8 +7,11 @@
              xmlns:global="clr-namespace:Tango.MachineStudio.Developer"
              xmlns:dragAndDrop="clr-namespace:Tango.DragAndDrop;assembly=Tango.DragAndDrop"
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:techViews="clr-namespace:Tango.MachineStudio.Technician.Views;assembly=Tango.MachineStudio.Technician"
              xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker"
+             xmlns:printing="clr-namespace:Tango.Integration.Printing;assembly=Tango.Integration"
+             xmlns:dispensing="clr-namespace:Tango.Integration.Dispensing;assembly=Tango.Integration"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:db="clr-namespace:Tango.MachineStudio.DB.Views.DBViews;assembly=Tango.MachineStudio.DB"
              xmlns:commonControls="clr-namespace:Tango.MachineStudio.Common.Controls;assembly=Tango.MachineStudio.Common"
@@ -58,6 +61,16 @@
         <converters:StringEllipsisConverter x:Key="StringEllipsisConverter" />
         <converters:NumberToFileSizeConverter x:Key="NumberToFileSizeConverter"/>
         <localConverters:OneToPercentConverter x:Key="OneToPercentConverter"/>
+        <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
+        <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
+
+
+        <ObjectDataProvider x:Key="dispenserDivisions" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="dispensing:DispenserStepDivisions"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+
 
         <SolidColorBrush x:Key="SideBarBackground" Color="White">
 
@@ -1345,7 +1358,13 @@
                                                                                                     </Style>
                                                                                                 </Grid.Style>
                                                                                                 <Grid>
-                                                                                                    <DataGrid ItemsSource="{Binding LiquidVolumes}" AutoGenerateColumns="False" Background="Transparent">
+                                                                                                    <DataGrid ItemsSource="{Binding LiquidVolumes}" AutoGenerateColumns="False" Background="Transparent" SelectionUnit="FullRow">
+                                                                                                        <DataGrid.CellStyle>
+                                                                                                            <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                                                                                                                <Setter Property="BorderThickness" Value="0"/>
+                                                                                                                <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                                                                                                            </Style>
+                                                                                                        </DataGrid.CellStyle>
                                                                                                         <DataGrid.Columns>
                                                                                                             <DataGridTemplateColumn Header="IDS PACK">
                                                                                                                 <DataGridTemplateColumn.CellTemplate>
@@ -1361,7 +1380,7 @@
                                                                                                                     </DataTemplate>
                                                                                                                 </DataGridTemplateColumn.CellTemplate>
                                                                                                             </DataGridTemplateColumn>
-                                                                                                            <DataGridTemplateColumn Header="DISPENSER NL / PULSE">
+                                                                                                            <DataGridTemplateColumn Header="D/F">
                                                                                                                 <DataGridTemplateColumn.CellTemplate>
                                                                                                                     <DataTemplate>
                                                                                                                         <TextBlock VerticalAlignment="Center">
@@ -1371,7 +1390,25 @@
                                                                                                                     </DataTemplate>
                                                                                                                 </DataGridTemplateColumn.CellTemplate>
                                                                                                             </DataGridTemplateColumn>
-                                                                                                            <DataGridTemplateColumn Header="LIQUID MAX NL / CM">
+                                                                                                            <DataGridTemplateColumn Header="STEP">
+                                                                                                                <DataGridTemplateColumn.CellTemplate>
+                                                                                                                    <DataTemplate>
+                                                                                                                        <ComboBox ItemsSource="{Binding Source={StaticResource dispenserDivisions}}" SelectedItem="{Binding DispenserStepDivision,UpdateSourceTrigger=PropertyChanged}">
+                                                                                                                            <ComboBox.ItemContainerStyle>
+                                                                                                                                <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
+                                                                                                                                    <Setter Property="Background" Value="#ECECEC"></Setter>
+                                                                                                                                </Style>
+                                                                                                                            </ComboBox.ItemContainerStyle>
+                                                                                                                            <ComboBox.ItemTemplate>
+                                                                                                                                <DataTemplate>
+                                                                                                                                    <TextBlock Text="{Binding Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock>
+                                                                                                                                </DataTemplate>
+                                                                                                                            </ComboBox.ItemTemplate>
+                                                                                                                        </ComboBox>
+                                                                                                                    </DataTemplate>
+                                                                                                                </DataGridTemplateColumn.CellTemplate>
+                                                                                                            </DataGridTemplateColumn>
+                                                                                                            <DataGridTemplateColumn Header="MAX NL / CM">
                                                                                                                 <DataGridTemplateColumn.CellTemplate>
                                                                                                                     <DataTemplate>
                                                                                                                         <TextBlock VerticalAlignment="Center">
@@ -1423,10 +1460,25 @@
                                                                                                             <DataGridTemplateColumn Header="PULSE / SEC">
                                                                                                                 <DataGridTemplateColumn.CellTemplate>
                                                                                                                     <DataTemplate>
-                                                                                                                        <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding PulsePerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                        <Run Text="(pulse)" FontSize="9" Foreground="Gray"></Run>
-                                                                                                                        </TextBlock>
+                                                                                                                        <Label VerticalAlignment="Center">
+                                                                                                                            <Label.Style>
+                                                                                                                                <Style TargetType="Label">
+                                                                                                                                    <Setter Property="Content">
+                                                                                                                                        <Setter.Value>
+                                                                                                                                            <TextBlock>
+                                                                                                                                                 <Run Text="{Binding PulsePerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
+                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="Gray"></Run>
+                                                                                                                                            </TextBlock>
+                                                                                                                                        </Setter.Value>
+                                                                                                                                    </Setter>
+                                                                                                                                    <Style.Triggers>
+                                                                                                                                        <DataTrigger Binding="{Binding DispenserStepDivision}" Value="{x:Static dispensing:DispenserStepDivisions.Auto}">
+                                                                                                                                            <Setter Property="Content" Value="Auto"></Setter>
+                                                                                                                                        </DataTrigger>
+                                                                                                                                    </Style.Triggers>
+                                                                                                                                </Style>
+                                                                                                                            </Label.Style>
+                                                                                                                        </Label>
                                                                                                                     </DataTemplate>
                                                                                                                 </DataGridTemplateColumn.CellTemplate>
                                                                                                             </DataGridTemplateColumn>
@@ -1961,7 +2013,7 @@
                             </Grid>
 
                             <!--MONITORING-->
-                            <Grid Grid.ColumnSpan="3" Background="White" Visibility="Visible">
+                            <!--<Grid Grid.ColumnSpan="3" Background="White" Visibility="Visible">
                                 <Grid.Style>
                                     <Style TargetType="Grid">
                                         <Setter Property="RenderTransform">
@@ -1991,7 +2043,7 @@
                                 </Grid.Style>
 
                                 <techViews:MachineTechView DataContext="{Binding MachineTechViewVM}" />
-                            </Grid>
+                            </Grid>-->
                         </Grid>
                     </Grid>
                 </Grid>
diff --git a/Software/Visual_Studio/Tango.Integration/Dispensing/DispenserStepDivisions.cs b/Software/Visual_Studio/Tango.Integration/Dispensing/DispenserStepDivisions.cs
new file mode 100644
index 000000000..55d47ab75
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Integration/Dispensing/DispenserStepDivisions.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.Integration.Dispensing
+{
+    public enum DispenserStepDivisions
+    {
+        [Description("Auto")]
+        Auto = 0,
+        [Description("2")]
+        D2 = 2,
+        [Description("4")]
+        D4 = 4,
+        [Description("8")]
+        D8 = 8,
+        [Description("16")]
+        D16 = 16,
+        [Description("32")]
+        D32 = 32,
+        [Description("64")]
+        D64 = 64,
+    }
+}
diff --git a/Software/Visual_Studio/Tango.Integration/Dispensing/DispensingCalcBase.cs b/Software/Visual_Studio/Tango.Integration/Dispensing/DispensingCalcBase.cs
index 27f5de79d..d4abc2a33 100644
--- a/Software/Visual_Studio/Tango.Integration/Dispensing/DispensingCalcBase.cs
+++ b/Software/Visual_Studio/Tango.Integration/Dispensing/DispensingCalcBase.cs
@@ -54,7 +54,7 @@ namespace Tango.Integration.Dispensing
         /// <returns></returns>
         public virtual double CalculatePulsePerSecond(LiquidVolume liquidVolume)
         {
-            return CalculateNanoliterPerSecond(liquidVolume) / liquidVolume.IdsPack.DispenserType.NlPerPulse;
+            return (CalculateNanoliterPerSecond(liquidVolume) / liquidVolume.IdsPack.DispenserType.NlPerPulse) * (liquidVolume.DispenserStepDivision != DispenserStepDivisions.Auto ? (double)liquidVolume.DispenserStepDivision.ToInt32() : 1d);
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/Tango.Integration/Printing/LiquidVolume.cs b/Software/Visual_Studio/Tango.Integration/Printing/LiquidVolume.cs
index 802ea8462..f3e4df309 100644
--- a/Software/Visual_Studio/Tango.Integration/Printing/LiquidVolume.cs
+++ b/Software/Visual_Studio/Tango.Integration/Printing/LiquidVolume.cs
@@ -59,6 +59,14 @@ namespace Tango.Integration.Printing
             }
         }
 
+        private DispenserStepDivisions _dispenserStepDivision;
+
+        public DispenserStepDivisions DispenserStepDivision
+        {
+            get { return _dispenserStepDivision; }
+            set { _dispenserStepDivision = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(PulsePerSecond)); }
+        }
+
         public void Invalidate()
         {
             InvalidateSolo();
diff --git a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
index 4e1500c22..346d91f12 100644
--- a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
+++ b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
@@ -178,6 +178,7 @@
     <Compile Include="Printing\Job.cs" />
     <Compile Include="Operators\JobHandler.cs" />
     <Compile Include="Printing\LiquidVolume.cs" />
+    <Compile Include="Dispensing\DispenserStepDivisions.cs" />
     <Compile Include="Printing\ProcessParametersTable.cs" />
     <Compile Include="Printing\Segment.cs" />
     <Compile Include="Services\ComPortInfo.cs" />
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToItemsSourceConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToItemsSourceConverter.cs
index 1699647bb..38f3467cf 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToItemsSourceConverter.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToItemsSourceConverter.cs
@@ -8,7 +8,7 @@ using System.Windows.Data;
 
 namespace Tango.SharedUI.Converters
 {
-    internal class EnumToItemsSourceConverter : IValueConverter
+    public class EnumToItemsSourceConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-- 
cgit v1.3.1