aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2020-02-27 00:34:46 +0200
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2020-02-27 00:34:46 +0200
commit882a6d54d60f05f3bf542ab43c3681f64152df41 (patch)
tree3d62d27ad3517f93fffd5d8e690f7551a15a4b5a /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
parent8e5ab17ced647a8c9fbba764c6fa0c06d56269c9 (diff)
downloadTango-882a6d54d60f05f3bf542ab43c3681f64152df41.tar.gz
Tango-882a6d54d60f05f3bf542ab43c3681f64152df41.zip
Added thread parameters DB, PMR, MachineOperator merging, Machine Studio.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml5
1 files changed, 4 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
index 6ee41ac38..e967c7d83 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
@@ -149,9 +149,12 @@
<Setter Property="Padding" Value="20,2"></Setter>
</Style>
</TabControl.Resources>
- <TabItem Header="PROCESS PARAMETERS" Margin="-100 0 0 0 ">
+ <TabItem Header="PROCESS PARAMETERS" Margin="-100 0 0 0">
<local:ProcessParametersView x:Name="processParametersView" WidthLilquidFactors="{Binding ElementName=calibrationDataView,Path=ActualWidth}"/>
</TabItem>
+ <TabItem Header="THREAD PARAMETERS" Margin="-100 0 0 0">
+ <local:ThreadParametersView/>
+ </TabItem>
<TabItem Header="COLOR CONVERSION" Margin="-100 0 0 0 ">
<Grid>
<Grid.ColumnDefinitions>