From b8358b92b56ef5c17636aec6a0cf48186528ea23 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Wed, 12 May 2021 16:10:34 +0300
Subject: MS tech board custom name.

---
 .../Editors/BlowerElementEditor.xaml               |  2 +-
 .../Editors/BreakSensorElementEditor.xaml          |  2 +-
 .../Editors/ControllerElementEditor.xaml           |  2 +-
 .../Editors/DancerElementEditor.xaml               |  2 +-
 .../Editors/DigitalInElementEditor.xaml            |  2 +-
 .../Editors/DigitalOutElementEditor.xaml           |  2 +-
 .../Editors/DispenserElementEditor.xaml            |  2 +-
 .../Editors/HeaterElementEditor.xaml               |  2 +-
 .../Editors/MeterElementEditor.xaml                |  2 +-
 .../Editors/MonitorElementEditor.xaml              |  2 +-
 .../Editors/MotorElementEditor.xaml                |  2 +-
 .../Editors/MultiGraphElementEditor.xaml           |  2 +-
 .../Editors/PidElementEditor.xaml                  |  2 +-
 .../Editors/SingleGraphElementEditor.xaml          |  2 +-
 .../Editors/SpeedSensorElementEditor.xaml          |  2 +-
 .../Editors/ValveElementEditor.xaml                |  2 +-
 .../Editors/WinderElementEditor.xaml               |  2 +-
 .../TechItems/TechItem.cs                          | 31 ++++++++++++++++++++--
 .../Views/MachineTechView.xaml                     |  5 ++++
 19 files changed, 51 insertions(+), 19 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/BlowerElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/BlowerElementEditor.xaml
index dae945940..cdd7ff2c5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/BlowerElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/BlowerElementEditor.xaml
@@ -92,7 +92,7 @@
             </Viewbox>
 
             <Border Margin="0 0 0 -23" VerticalAlignment="Bottom">
-                <TextBlock Text="{Binding HardwareBlowerType.Description}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
+                <TextBlock Text="{Binding TechNameFinal}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/BreakSensorElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/BreakSensorElementEditor.xaml
index 78834aca7..da30b1237 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/BreakSensorElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/BreakSensorElementEditor.xaml
@@ -32,7 +32,7 @@
             <Image Source="../Images/break-big.png"></Image>
 
             <Border Margin="0 0 0 -23" VerticalAlignment="Bottom">
-                <TextBlock Text="{Binding HardwareBreakSensorType.Description}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
+                <TextBlock Text="{Binding TechNameFinal}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml
index e71f7e1e0..ed968a640 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml
@@ -138,7 +138,7 @@
             </Border>
 
             <Border Margin="0 0 0 -23" VerticalAlignment="Bottom">
-                <TextBlock Text="{Binding TechController.Description}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
+                <TextBlock Text="{Binding TechNameFinal}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DancerElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DancerElementEditor.xaml
index 2960a8807..2eba552a3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DancerElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DancerElementEditor.xaml
@@ -32,7 +32,7 @@
             <Image Source="../Images/dancer-big.png"></Image>
 
             <Border Margin="0 0 0 -23" VerticalAlignment="Bottom">
-                <TextBlock Text="{Binding HardwareDancerType.Description}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
+                <TextBlock Text="{Binding TechNameFinal}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DigitalInElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DigitalInElementEditor.xaml
index 60f785933..b040c2861 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DigitalInElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DigitalInElementEditor.xaml
@@ -42,7 +42,7 @@
             </Border>
 
             <Border VerticalAlignment="Bottom" Grid.Row="1" Margin="0 0 0 0">
-                <TextBlock TextWrapping="Wrap" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center" Text="{Binding TechName}"></TextBlock>
+                <TextBlock TextWrapping="Wrap" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center" Text="{Binding TechNameFinal}"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DigitalOutElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DigitalOutElementEditor.xaml
index a5a8c6f6e..3ee1077f9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DigitalOutElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DigitalOutElementEditor.xaml
@@ -53,7 +53,7 @@
             </Border>
 
             <Border VerticalAlignment="Bottom" Grid.Row="1" Margin="0 0 0 0">
-                <TextBlock TextWrapping="Wrap" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center" Text="{Binding TechName}"></TextBlock>
+                <TextBlock TextWrapping="Wrap" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center" Text="{Binding TechNameFinal}"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
index e0da8aa03..0b1e27cf2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
@@ -179,7 +179,7 @@
         <!--Content-->
         <Grid>
             <Border Margin="0 0 0 -23" VerticalAlignment="Bottom">
-                <TextBlock Text="{Binding DisplayName}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
+                <TextBlock Text="{Binding TechNameFinal}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/HeaterElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/HeaterElementEditor.xaml
index ffeb1f134..0fe11e2c7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/HeaterElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/HeaterElementEditor.xaml
@@ -222,7 +222,7 @@
             </Viewbox>
 
             <Border Margin="0 0 0 -23" VerticalAlignment="Bottom">
-                <TextBlock Text="{Binding TechHeater.Description}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
+                <TextBlock Text="{Binding TechNameFinal}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MeterElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MeterElementEditor.xaml
index 2631f3a06..566c9d960 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MeterElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MeterElementEditor.xaml
@@ -41,7 +41,7 @@
             </visuals:VUMeter>
 
             <Border VerticalAlignment="Bottom" Grid.Row="1" Margin="0 0 0 0">
-                <TextBlock TextWrapping="Wrap" Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=MeterItem.TechMonitor.Description}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
+                <TextBlock TextWrapping="Wrap" Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=MeterItem.TechNameFinal}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MonitorElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MonitorElementEditor.xaml
index 0f87896aa..4109af3f0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MonitorElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MonitorElementEditor.xaml
@@ -51,7 +51,7 @@
             </Viewbox>
 
             <Border Margin="0 0 0 -23" VerticalAlignment="Bottom">
-                <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=MonitorItem.TechMonitor.Description}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
+                <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=MonitorItem.TechNameFinal}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml
index 77cccaf8f..79522a54e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml
@@ -163,7 +163,7 @@
         <!--Content-->
         <Grid>
             <Border Margin="0 0 0 -23" VerticalAlignment="Bottom">
-                <TextBlock Text="{Binding HardwareMotorType.Description}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
+                <TextBlock Text="{Binding TechNameFinal}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml
index 6011102a2..00141b5e9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml
@@ -32,7 +32,7 @@
         <!--Content-->
         <Grid>
             <!--<Viewbox Stretch="Fill">-->
-            <controls:WpfGraphControl x:Name="InnerGraph" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}" x:FieldModifier="public"  DisplayName="{Binding TechMonitor.Description}" DisplayUnits="{Binding TechMonitor.Units}" StringFormat="{Binding DecimalPlaces,Converter={StaticResource DecimalPlacesToStringFormatConverter}}" />
+            <controls:WpfGraphControl x:Name="InnerGraph" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}" x:FieldModifier="public"  DisplayName="{Binding TechNameFinal}" DisplayUnits="{Binding TechMonitor.Units}" StringFormat="{Binding DecimalPlaces,Converter={StaticResource DecimalPlacesToStringFormatConverter}}" />
             <!--</Viewbox>-->
 
             <Border Margin="0 0 -102 0" HorizontalAlignment="Right" Width="Auto" BorderThickness="1" Background="{StaticResource graphBackgroundDark}" CornerRadius="5" TextElement.FontSize="11" Padding="5">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/PidElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/PidElementEditor.xaml
index 197640b14..79dfcd71e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/PidElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/PidElementEditor.xaml
@@ -32,7 +32,7 @@
             <Image Source="../Images/pid.png"></Image>
 
             <Border Margin="0 0 0 -23" VerticalAlignment="Bottom">
-                <TextBlock Text="{Binding HardwarePidType.Description}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
+                <TextBlock Text="{Binding TechNameFinal}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml
index 622ddfa8b..cd3f8f397 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml
@@ -32,7 +32,7 @@
         <!--Content-->
         <Grid>
             <!--<Viewbox Stretch="Fill">-->
-            <controls:WpfGraphControl x:Name="InnerGraph" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}" x:FieldModifier="public" DisplayName="{Binding TechMonitor.Description}" DisplayUnits="{Binding TechMonitor.Units}" StringFormat="{Binding DecimalPlaces,Converter={StaticResource DecimalPlacesToStringFormatConverter}}">
+            <controls:WpfGraphControl x:Name="InnerGraph" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}" x:FieldModifier="public" DisplayName="{Binding TechNameFinal}" DisplayUnits="{Binding TechMonitor.Units}" StringFormat="{Binding DecimalPlaces,Converter={StaticResource DecimalPlacesToStringFormatConverter}}">
 
             </controls:WpfGraphControl>
             <!--</Viewbox>-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SpeedSensorElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SpeedSensorElementEditor.xaml
index 8696a3c53..cd18e5d06 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SpeedSensorElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SpeedSensorElementEditor.xaml
@@ -32,7 +32,7 @@
             <Image Source="../Images/speed-big.png"></Image>
 
             <Border Margin="0 0 0 -23" VerticalAlignment="Bottom">
-                <TextBlock Text="{Binding HardwareSpeedSensorType.Description}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
+                <TextBlock Text="{Binding TechNameFinal}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ValveElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ValveElementEditor.xaml
index 20e4b46ff..404e4f71a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ValveElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ValveElementEditor.xaml
@@ -129,7 +129,7 @@
             </Viewbox>
 
             <Border Margin="0 0 0 -23" VerticalAlignment="Bottom">
-                <TextBlock Text="{Binding TechValve.Description}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
+                <TextBlock Text="{Binding TechNameFinal}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/WinderElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/WinderElementEditor.xaml
index 2b6ee303d..a8a294744 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/WinderElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/WinderElementEditor.xaml
@@ -32,7 +32,7 @@
             <Image Source="../Images/winder-big.png"></Image>
 
             <Border Margin="0 0 0 -23" VerticalAlignment="Bottom">
-                <TextBlock Text="{Binding HardwareWinderType.Description}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
+                <TextBlock Text="{Binding TechNameFinal}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs
index f59107ca2..95b36eb70 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs
@@ -104,6 +104,16 @@ namespace Tango.MachineStudio.Technician.TechItems
             set { _name = value; RaisePropertyChanged(nameof(Name)); }
         }
 
+        private String _customName;
+        /// <summary>
+        /// Gets or sets the name of the custom.
+        /// </summary>
+        public String CustomName
+        {
+            get { return _customName; }
+            set { _customName = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(TechNameFinal)); }
+        }
+
         private double _left;
         /// <summary>
         /// Item Left.
@@ -154,7 +164,7 @@ namespace Tango.MachineStudio.Technician.TechItems
             set { _angle = value; RaisePropertyChanged(nameof(Angle)); }
         }
 
-        
+
         private String _techName;
         /// <summary>
         /// Gets or sets the tech item name.
@@ -163,7 +173,24 @@ namespace Tango.MachineStudio.Technician.TechItems
         public String TechName
         {
             get { return _techName; }
-            set { _techName = value; RaisePropertyChangedAuto(); }
+            set { _techName = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(TechNameFinal)); }
+        }
+
+        private String _techNameFinal;
+        public String TechNameFinal
+        {
+            get
+            {
+                if (CustomName.IsNotNullOrEmpty())
+                {
+                    return CustomName;
+                }
+                else
+                {
+                    return _techName;
+                }
+            }
+            set { _techNameFinal = value; }
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
index 63d22d365..06e0a59fa 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
@@ -493,6 +493,11 @@
                                                 <TextBlock VerticalAlignment="Center" Margin="0 0 10 0" HorizontalAlignment="Left">Angle</TextBlock>
                                                 <mahapps:NumericUpDown Grid.Column="1" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="{StaticResource GrayBrush}" Maximum="360" Minimum="-360" HasDecimals="False" Margin="0 5 0 0" Value="{Binding SelectedTab.Editor.SelectedElement.Angle}"></mahapps:NumericUpDown>
                                             </Grid>
+
+                                            <!--<Angle-->
+                                            <Grid Margin="0 20 0 0">
+                                                <TextBox materialDesign:HintAssist.Hint="Custom Name" materialDesign:HintAssist.IsFloating="True" Margin="0 10 0 0" Text="{Binding SelectedTab.Editor.SelectedElement.HostedElement.CustomName,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+                                            </Grid>
                                         </StackPanel>
                                     </GroupBox>
                                     <ContentControl Margin="0 10 0 0" DataContext="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedTab.Editor.SelectedElement.HostedElement}" Content="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedTab.Editor.SelectedElement.HostedElement}">
-- 
cgit v1.3.1