From 02263b893b1366b084cf1b2358920dc195cfac01 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 17 Sep 2018 12:01:45 +0300
Subject: Implemented Segments Names Editing.

---
 .../ViewModels/MainViewVM.cs                       |  2 +-
 .../Views/JobView.xaml                             | 30 ++++++++++++++--------
 2 files changed, 21 insertions(+), 11 deletions(-)

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

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 e04b1539a..bf6a6ecbc 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
@@ -1810,7 +1810,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 LogManager.LogFormat("Adding new segment to job {0}...", ActiveJob.Name);
                 Segment seg = new Segment();
                 seg.Job = ActiveJob;
-                seg.Name = "Untitled Segment";
+                seg.Name = "SEGMENT";
                 seg.Length = 10;
 
                 if (ActiveJob.Segments.Count > 0)
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 06e8648e8..1f2e9294d 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
@@ -353,11 +353,6 @@
                                             </Polygon>
                                             <Border Height="100" Padding="5" IsHitTestVisible="False">
                                                 <Grid>
-                                                    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16" FontStyle="Italic">
-                                                <Run>#</Run>
-                                                <Run>SEGMENT</Run>
-                                                <Run Text="{Binding SegmentIndex}"></Run>
-                                                    </TextBlock>
                                                     <Rectangle VerticalAlignment="Bottom" Height="8">
                                                         <Rectangle.Fill>
                                                             <MultiBinding Converter="{StaticResource SegmentToBrushConverterMulti}">
@@ -371,6 +366,21 @@
                                                 </Grid>
                                             </Border>
 
+                                            <Grid Margin="20 10 10 10" TextElement.FontSize="16" TextElement.FontStyle="Italic" >
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="1*" />
+                                                </Grid.ColumnDefinitions>
+
+                                                <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                                                    <TextBlock FontWeight="SemiBold">#</TextBlock>
+                                                    <TextBlock FontWeight="SemiBold" Margin="5 0 0 0" Text="{Binding SegmentIndex}"></TextBlock>
+                                                </StackPanel>
+
+
+                                                <TextBox Grid.Column="1" VerticalAlignment="Center" Width="200" HorizontalContentAlignment="Center" Style="{x:Null}" BorderThickness="0" Background="Transparent" Text="{Binding Name}"></TextBox>
+                                            </Grid>
+
                                         </Grid>
                                     </DataTemplate>
                                 </ListBox.ItemTemplate>
@@ -731,7 +741,7 @@
                                                                                                                                 </ItemsControl.ItemsPanel>
                                                                                                                                 <ItemsControl.ItemTemplate>
                                                                                                                                     <DataTemplate>
-                                                                                                                                        <Border Width="60" Height="60">
+                                                                                                                                        <Border>
                                                                                                                                             <Border.Style>
                                                                                                                                                 <Style TargetType="Border">
                                                                                                                                                     <Setter Property="Visibility" Value="Visible"></Setter>
@@ -742,7 +752,7 @@
                                                                                                                                                     </Style.Triggers>
                                                                                                                                                 </Style>
                                                                                                                                             </Border.Style>
-                                                                                                                                            <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0">
+                                                                                                                                            <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0" Width="60" Height="60">
                                                                                                                                                 <ContentControl.Foreground>
                                                                                                                                                     <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
                                                                                                                                                 </ContentControl.Foreground>
@@ -774,7 +784,7 @@
                                                                                                                             <Run>)</Run>
                                                                                                                         </TextBlock>
 
-                                                                                                                        <Border Margin="60 0 0 0" DataContext="{Binding LiquidVolumes,Converter={StaticResource LiquidVolumesToLubricantLiquidVolume}}" Width="55" Height="55" BorderBrush="#E6E6E6" BorderThickness="1 0 0 0">
+                                                                                                                        <Border Margin="60 0 0 0" DataContext="{Binding LiquidVolumes,Converter={StaticResource LiquidVolumesToLubricantLiquidVolume}}" BorderBrush="#E6E6E6" BorderThickness="1 0 0 0">
                                                                                                                             <Border.Style>
                                                                                                                                 <Style TargetType="Border">
                                                                                                                                     <Setter Property="Visibility" Value="Collapsed"></Setter>
@@ -785,7 +795,7 @@
                                                                                                                                     </Style.Triggers>
                                                                                                                                 </Style>
                                                                                                                             </Border.Style>
-                                                                                                                            <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0">
+                                                                                                                            <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0" Width="55" Height="55">
                                                                                                                                 <ContentControl.Foreground>
                                                                                                                                     <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
                                                                                                                                 </ContentControl.Foreground>
@@ -1558,7 +1568,7 @@
                 <Button Background="Transparent" Command="{Binding ToggleSideBarCommand}" Padding="0" Style="{StaticResource MaterialDesignFlatButton}" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" HorizontalAlignment="Right" VerticalAlignment="Center" Height="200" Width="50" Margin="0 0 -50 0">
                     <Border Background="#F1F1F1" CornerRadius="0 10 10 0" BorderThickness="0 1 1 1" BorderBrush="#383838">
                         <Grid>
-                            <TextBlock Foreground="#FF7272" Text="CONFIGURATION" FontSize="16" RenderTransformOrigin="0.5,0.5" VerticalAlignment="Center" HorizontalAlignment="Center">
+                            <TextBlock Foreground="#FF7272" Text="PROCESS PARAMETERS" FontSize="16" RenderTransformOrigin="0.5,0.5" VerticalAlignment="Center" HorizontalAlignment="Center">
                                 <TextBlock.LayoutTransform>
                                     <RotateTransform Angle="270"></RotateTransform>
                                 </TextBlock.LayoutTransform>
-- 
cgit v1.3.1