From 0ba98d08cb6cb95b620ee7182387fb3b1457e830 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 21 Jun 2018 12:28:07 +0300
Subject: Machine Studio Version 1.0.0.3

---
 .../Views/DBViews/DispenserTypeView.xaml           | 36 ----------------------
 .../Views/DBViews/DispenserTypesView.xaml          | 14 ---------
 2 files changed, 50 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypeView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypeView.xaml
index e7b5957e2..55c995360 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypeView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypeView.xaml
@@ -28,42 +28,6 @@
             <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.NlPerPulse,Mode=TwoWay}"></mahapps:NumericUpDown>
             <TextBlock Text="Capacity:" FontWeight="Bold"></TextBlock>
             <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.Capacity,Mode=TwoWay}"></mahapps:NumericUpDown>
-
-            <TextBlock Text="Min Frequency:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="0" Maximum="40000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.MinFrequency,Mode=TwoWay}"></mahapps:NumericUpDown>
-
-            <TextBlock Text="Max Frequency:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="0" Maximum="40000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.MaxFrequency,Mode=TwoWay}"></mahapps:NumericUpDown>
-
-            <TextBlock Text="Min Micro Step:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.MinMicroStep,Mode=TwoWay}"></mahapps:NumericUpDown>
-
-            <TextBlock Text="Max Micro Step:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.MaxMicroStep,Mode=TwoWay}"></mahapps:NumericUpDown>
-
-            <TextBlock Text="Correction Gain:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.CorrectionGain,Mode=TwoWay}"></mahapps:NumericUpDown>
-
-            <TextBlock Text="Ratio To Dryer Speed:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.RatioToDryerSpeed,Mode=TwoWay}"></mahapps:NumericUpDown>
-
-            <TextBlock Text="KP:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.KP,Mode=TwoWay}"></mahapps:NumericUpDown>
-
-            <TextBlock Text="KI:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.Ki,Mode=TwoWay}"></mahapps:NumericUpDown>
-
-            <TextBlock Text="KD:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.Kd,Mode=TwoWay}"></mahapps:NumericUpDown>
-
-            <TextBlock Text="Change Slope:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.ChangeSlope,Mode=TwoWay}"></mahapps:NumericUpDown>
-
-            <TextBlock Text="High Length Micro Second:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.HighLengthMicroSecond,Mode=TwoWay}"></mahapps:NumericUpDown>
-
-            <TextBlock Text="Control Timing:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.ControlTiming,Mode=TwoWay}"></mahapps:NumericUpDown>
         </controls:TableGrid>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypesView.xaml
index e88e0dfea..040ac5799 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypesView.xaml
@@ -19,20 +19,6 @@
                     <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Nanolitter Per Pulse" Binding="{Binding NlPerPulse}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Capacity" Binding="{Binding Capacity}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Min Frequency" Binding="{Binding MinFrequency}"></DataGridTextColumn>
-
-                    <DataGridTextColumn Header="Max Frequency" Binding="{Binding MaxFrequency}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Min Micro Step" Binding="{Binding MinMicroStep}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Max Micro Step" Binding="{Binding MaxMicroStep}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Correction Gain" Binding="{Binding CorrectionGain}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Ratio To Dryer Speed" Binding="{Binding RatioToDryerSpeed}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="KP" Binding="{Binding Kp}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="KI" Binding="{Binding Ki}"></DataGridTextColumn>
-
-                    <DataGridTextColumn Header="KD" Binding="{Binding Kd}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Change Slope" Binding="{Binding ChangeSlope}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="High Length Micro Second" Binding="{Binding HighLengthMicroSecond}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Control Timing" Binding="{Binding ControlTiming}"></DataGridTextColumn>
                 </DataGrid.Columns>
             </DataGrid>
         </controls:DbTableView>
-- 
cgit v1.3.1