From e068fa9d45e3ad6da977a08d722453756c38eee7 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 25 Feb 2019 11:26:06 +0200
Subject: Updated PMR.

---
 .../Views/MainView.xaml                            | 172 +++++++++++++++++++++
 .../Publish/MachineStudioPublisher.cs              |   2 +-
 .../Web/MachineStudioWebClientBase.cs              |   6 +-
 3 files changed, 176 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio')

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 429450370..6289f009b 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
@@ -40,6 +40,7 @@
         <converters:IsNotConverter x:Key="IsNotConverter" />
         <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
         <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
+        <converters:MathOperatorConverter x:Key="MathOperatorConverter" />
 
 
         <SolidColorBrush x:Key="SideBarBackground" Color="White">
@@ -131,6 +132,177 @@
                                                     <ItemsControl.ItemTemplate>
                                                         <DataTemplate>
                                                             <Grid ClipToBounds="False">
+
+                                                                <Grid.ToolTip>
+                                                                    <ToolTip Background="White" Padding="0" Visibility="{Binding IsInterSegment,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                                                        <Border BorderThickness="1" BorderBrush="#202020" CornerRadius="3" Padding="5">
+                                                                            <StackPanel Background="White">
+                                                                                <ItemsControl ItemsSource="{Binding BrushStops[0].LiquidVolumes}" VerticalAlignment="Center">
+                                                                                    <ItemsControl.ItemsPanel>
+                                                                                        <ItemsPanelTemplate>
+                                                                                            <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+                                                                                        </ItemsPanelTemplate>
+                                                                                    </ItemsControl.ItemsPanel>
+                                                                                    <ItemsControl.ItemTemplate>
+                                                                                        <DataTemplate>
+                                                                                            <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
+                                                                                                <ContentControl.Foreground>
+                                                                                                    <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                                                                                </ContentControl.Foreground>
+                                                                                                <TextBlock Foreground="#202020" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Volume,StringFormat=0.00}"></TextBlock>
+                                                                                            </ContentControl>
+                                                                                        </DataTemplate>
+                                                                                    </ItemsControl.ItemTemplate>
+                                                                                </ItemsControl>
+
+                                                                                <DataGrid Margin="0 10 0 0" SelectedIndex="-1" IsReadOnly="True" ItemsSource="{Binding BrushStops[0].LiquidVolumes}" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="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>
+                                                                                                <DataTemplate>
+                                                                                                    <Grid x:Name="t0">
+                                                                                                        <Polygon x:Name="t1" Points="0,0 15,0 0,15 0,0" Margin="-15 -11 0 0">
+                                                                                                            <Polygon.Fill>
+                                                                                                                <SolidColorBrush x:Name="t2" Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter},FallbackValue={StaticResource dummyColor}}" />
+                                                                                                            </Polygon.Fill>
+                                                                                                        </Polygon>
+                                                                                                        <TextBlock FontWeight="SemiBold" TextWrapping="Wrap" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding IdsPack.LiquidType.Name}"></TextBlock>
+                                                                                                    </Grid>
+                                                                                                </DataTemplate>
+                                                                                            </DataGridTemplateColumn.CellTemplate>
+                                                                                        </DataGridTemplateColumn>
+                                                                                        <DataGridTemplateColumn Header="IDX">
+                                                                                            <DataGridTemplateColumn.CellTemplate>
+                                                                                                <DataTemplate>
+                                                                                                    <TextBlock Text="{Binding IdsPack.PackIndex,Converter={StaticResource MathOperatorConverter},ConverterParameter='+1'}" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                                                                                </DataTemplate>
+                                                                                            </DataGridTemplateColumn.CellTemplate>
+                                                                                        </DataGridTemplateColumn>
+                                                                                        <DataGridTemplateColumn Header="D/F">
+                                                                                            <DataGridTemplateColumn.CellTemplate>
+                                                                                                <DataTemplate>
+                                                                                                    <TextBlock VerticalAlignment="Center">
+                                                                                                                        <Run Text="{Binding NanoliterPerStep,Mode=OneWay,StringFormat='0.00'}"></Run>
+                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
+                                                                                                    </TextBlock>
+                                                                                                </DataTemplate>
+                                                                                            </DataGridTemplateColumn.CellTemplate>
+                                                                                        </DataGridTemplateColumn>
+                                                                                        <DataGridTemplateColumn Header="STEP">
+                                                                                            <DataGridTemplateColumn.CellTemplate>
+                                                                                                <DataTemplate>
+                                                                                                    <ComboBox ItemsSource="{Binding Source={StaticResource dispenserDivisions}}" SelectedItem="{Binding DispenserStepDivision,UpdateSourceTrigger=PropertyChanged}" BorderThickness="0">
+                                                                                                        <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">
+                                                                                                                        <Run Text="{Binding LiquidMaxNanoliterPerCentimeter,Mode=OneWay,StringFormat='0.0'}"></Run>
+                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
+                                                                                                    </TextBlock>
+                                                                                                </DataTemplate>
+                                                                                            </DataGridTemplateColumn.CellTemplate>
+                                                                                        </DataGridTemplateColumn>
+                                                                                        <DataGridTemplateColumn Header="VOLUME">
+                                                                                            <DataGridTemplateColumn.CellTemplate>
+                                                                                                <DataTemplate>
+                                                                                                    <TextBlock VerticalAlignment="Center">
+                                                                                                                        <Run Text="{Binding Volume}"></Run>
+                                                                                                                        <Run Text="%" Foreground="Gray"></Run>
+                                                                                                    </TextBlock>
+                                                                                                </DataTemplate>
+                                                                                            </DataGridTemplateColumn.CellTemplate>
+                                                                                        </DataGridTemplateColumn>
+                                                                                        <DataGridTemplateColumn Header="FORMULA">
+                                                                                            <DataGridTemplateColumn.CellTemplate>
+                                                                                                <DataTemplate>
+                                                                                                    <TextBlock VerticalAlignment="Center">
+                                                                                                                        <Run Text="{Binding IdsPack.IdsPackFormula.Name}"></Run>
+                                                                                                    </TextBlock>
+                                                                                                </DataTemplate>
+                                                                                            </DataGridTemplateColumn.CellTemplate>
+                                                                                        </DataGridTemplateColumn>
+                                                                                        <DataGridTemplateColumn Header="NL / CM">
+                                                                                            <DataGridTemplateColumn.CellTemplate>
+                                                                                                <DataTemplate>
+                                                                                                    <TextBlock VerticalAlignment="Center">
+                                                                                                                        <Run Text="{Binding NanoliterPerCentimeter,Mode=OneWay,StringFormat='0.0'}"></Run>
+                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
+                                                                                                    </TextBlock>
+                                                                                                </DataTemplate>
+                                                                                            </DataGridTemplateColumn.CellTemplate>
+                                                                                        </DataGridTemplateColumn>
+                                                                                        <DataGridTemplateColumn Header="NL / SEC">
+                                                                                            <DataGridTemplateColumn.CellTemplate>
+                                                                                                <DataTemplate>
+                                                                                                    <TextBlock VerticalAlignment="Center">
+                                                                                                                        <Run Text="{Binding NanoliterPerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
+                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
+                                                                                                    </TextBlock>
+                                                                                                </DataTemplate>
+                                                                                            </DataGridTemplateColumn.CellTemplate>
+                                                                                        </DataGridTemplateColumn>
+                                                                                        <DataGridTemplateColumn Header="PULSE / SEC">
+                                                                                            <DataGridTemplateColumn.CellTemplate>
+                                                                                                <DataTemplate>
+                                                                                                    <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>
+                                                                                                                    <DataTrigger Binding="{Binding DispenserStepDivision,Converter={StaticResource IsNotConverter},ConverterParameter={x:Static dispensing:DispenserStepDivisions.Auto}}" Value="True">
+                                                                                                                        <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>
+                                                                                                                    </DataTrigger>
+                                                                                                                </Style.Triggers>
+                                                                                                            </Style>
+                                                                                                        </Label.Style>
+                                                                                                    </Label>
+                                                                                                </DataTemplate>
+                                                                                            </DataGridTemplateColumn.CellTemplate>
+                                                                                        </DataGridTemplateColumn>
+                                                                                    </DataGrid.Columns>
+                                                                                </DataGrid>
+                                                                            </StackPanel>
+                                                                        </Border>
+                                                                    </ToolTip>
+                                                                </Grid.ToolTip>
+
                                                                 <Grid.Width>
                                                                     <MultiBinding Converter="{StaticResource SegmentLengthToWidthConverter}">
                                                                         <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.RunningJobStatus.CurrentUnitTotalProgress"></Binding>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs
index dfbe0adc6..3ee81f19b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs
@@ -196,7 +196,7 @@ namespace Tango.MachineStudio.Common.Publish
 
                     OnPublishProgress(100, 100, $"Finalizing version upload...");
 
-                    _client.NotifyUploadCompleted(new UploadCompletedRequest()
+                    _client.NotifyVersionUploadCompleted(new UploadCompletedRequest()
                     {
                         Token = response.Token,
                     }).Wait();
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/MachineStudioWebClientBase.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/MachineStudioWebClientBase.cs
index 62a57ad93..665d25ccb 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/MachineStudioWebClientBase.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/MachineStudioWebClientBase.cs
@@ -68,12 +68,12 @@ namespace Tango.MachineStudio.Common.Web
         }
 
         /// <summary>
-        /// Executes the NotifyUploadCompleted action and returns Tango.MachineStudio.Common.Web.UploadCompletedResponse.
+        /// Executes the NotifyVersionUploadCompleted action and returns Tango.MachineStudio.Common.Web.UploadCompletedResponse.
         /// </summary>
         /// <returns></returns>
-        public Task<Tango.MachineStudio.Common.Web.UploadCompletedResponse> NotifyUploadCompleted(Tango.MachineStudio.Common.Web.UploadCompletedRequest request)
+        public Task<Tango.MachineStudio.Common.Web.UploadCompletedResponse> NotifyVersionUploadCompleted(Tango.MachineStudio.Common.Web.UploadCompletedRequest request)
         {
-            return Post<Tango.MachineStudio.Common.Web.UploadCompletedRequest, Tango.MachineStudio.Common.Web.UploadCompletedResponse>("NotifyUploadCompleted", request);
+            return Post<Tango.MachineStudio.Common.Web.UploadCompletedRequest, Tango.MachineStudio.Common.Web.UploadCompletedResponse>("NotifyVersionUploadCompleted", request);
         }
 
         /// <summary>
-- 
cgit v1.3.1