From 13e34402f91fae6229b2d9719ddb48ced1d37fbf Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 16 Jul 2018 15:51:33 +0300
Subject: Some fixed and improvements.

---
 .../Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs        | 1 +
 .../Modules/Tango.MachineStudio.Developer/Views/JobView.xaml      | 6 +++---
 .../Modules/Tango.MachineStudio.Developer/Views/MainView.xaml     | 8 ++++----
 .../MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt  | 2 +-
 .../MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs | 8 ++++----
 5 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio')

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 dacbc89b1..b4e588700 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
@@ -1478,6 +1478,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 {
                     seg.SegmentIndex = 1;
                 }
+
                 ActiveJob.Segments.Add(seg);
                 SelectedSegment = seg;
                 AddBrushStop();
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 fc62c0128..b4deb72a9 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
@@ -1085,7 +1085,7 @@
                                     <Grid Margin="0 -18 0 0">
                                         <Border VerticalAlignment="Center" Height="55" Margin="30 0 40 0" ClipToBounds="False">
                                             <Grid ClipToBounds="False">
-                                                <ItemsControl x:Name="jobBrushList" ClipToBounds="False">
+                                                <ItemsControl x:Name="jobBrushList" ClipToBounds="False" Margin="40 0 50 0">
                                                     <ItemsControl.ItemsPanel>
                                                         <ItemsPanelTemplate>
                                                             <StackPanel Orientation="Horizontal" ClipToBounds="False"></StackPanel>
@@ -1129,7 +1129,7 @@
                                                     </ItemsControl.ItemTemplate>
                                                 </ItemsControl>
 
-                                                <StackPanel Margin="-20 -5 0 0" HorizontalAlignment="Left">
+                                                <StackPanel Margin="-30 -5 0 0" HorizontalAlignment="Left">
                                                     <TextBlock FontSize="12" Foreground="Black">
                                                                                 <Run Text="0"></Run>
                                                                                 <Run Foreground="Gray" FontSize="10" Text="m"></Run>
@@ -1149,7 +1149,7 @@
                                                     </materialDesign:PackIcon>
                                                 </StackPanel>
 
-                                                <Border BorderBrush="Gainsboro" BorderThickness="1" VerticalAlignment="Bottom" Height="20">
+                                                <Border BorderBrush="Gainsboro" BorderThickness="1" VerticalAlignment="Bottom" Height="20" Margin="40 0 50 0">
 
                                                 </Border>
                                             </Grid>
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 2ece5c76b..fd3b2289d 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
@@ -110,7 +110,7 @@
                                     <Border Margin="0 10 0 0" VerticalAlignment="Bottom" Width="1200" BorderBrush="#404040" BorderThickness="0" ClipToBounds="False">
                                         <Grid ClipToBounds="False" >
 
-                                            <ItemsControl ClipToBounds="False" x:Name="runningJobBrushList" ItemsSource="{Binding RunningJobSegments}">
+                                            <ItemsControl ClipToBounds="False" x:Name="runningJobBrushList" ItemsSource="{Binding RunningJobSegments}" Margin="0 0 60 0">
                                                 <ItemsControl.ItemsPanel>
                                                     <ItemsPanelTemplate>
                                                         <StackPanel Orientation="Horizontal" ClipToBounds="False"></StackPanel>
@@ -179,7 +179,7 @@
                                                                 </Canvas>
                                                             </StackPanel>
 
-                                                            <Rectangle HorizontalAlignment="Right" Stroke="White" Margin="0 35 0 25"></Rectangle>
+                                                            <Rectangle HorizontalAlignment="Right" Stroke="White" Margin="0 35 0 25" ></Rectangle>
                                                         </Grid>
                                                     </DataTemplate>
                                                 </ItemsControl.ItemTemplate>
@@ -195,7 +195,7 @@
                                                 </materialDesign:PackIcon>
                                             </StackPanel>
 
-                                            <StackPanel Margin="0 -5 -40 0" HorizontalAlignment="Right">
+                                            <StackPanel Margin="0 -5 -70 0" HorizontalAlignment="Right">
                                                 <TextBlock FontSize="14">
                                                                                 <Run Text="{Binding RunningJob.Length,Mode=OneWay,StringFormat=N2}"></Run>
                                                                                 <Run FontSize="13" Text="m"></Run>
@@ -207,7 +207,7 @@
                                                 </materialDesign:PackIcon>
                                             </StackPanel>
 
-                                            <Border BorderBrush="#404040" BorderThickness="1" VerticalAlignment="Center" Height="30" Margin="0 11 0 0">
+                                            <Border BorderBrush="#404040" BorderThickness="1" VerticalAlignment="Center" Height="30" Margin="0 11 60 0">
 
                                             </Border>
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
index 53eb632e9..a112fbafb 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
@@ -1 +1 @@
-Mon 07/16/2018 10:23:46.28 
+Mon 07/16/2018 15:39:26.63 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index fd28d5b1e..a7762a5e6 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -444,9 +444,9 @@ namespace Tango.MachineStudio.UI.ViewModels
                                 {
                                     try
                                     {
-                                        if (!x.SelectedMachine.EnableDiagnostics)
+                                        if (x.SelectedMachine.EnableDiagnostics)
                                         {
-                                            x.SelectedMachine.EnableEmbeddedDebugging = false;
+                                            x.SelectedMachine.EnableEmbeddedDebugging = true;
                                         }
 
                                         await x.SelectedMachine.Connect();
@@ -484,9 +484,9 @@ namespace Tango.MachineStudio.UI.ViewModels
                                     {
                                         try
                                         {
-                                            if (!x.SelectedMachine.EnableDiagnostics)
+                                            if (x.SelectedMachine.EnableDiagnostics)
                                             {
-                                                x.SelectedMachine.EnableEmbeddedDebugging = false;
+                                                x.SelectedMachine.EnableEmbeddedDebugging = true;
                                             }
 
                                             await x.SelectedMachine.Connect();
-- 
cgit v1.3.1