aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-01-28 13:32:33 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-01-28 13:32:33 +0200
commit20f0dc40cdbe85ab7cfedd78a9bc883e4469e4ab (patch)
tree7356c7beb47bfa4725980af29edc9f43b878d2c4 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views
parent08b6ea6e300ff8236594dd4f303387ef1366e49e (diff)
downloadTango-20f0dc40cdbe85ab7cfedd78a9bc883e4469e4ab.tar.gz
Tango-20f0dc40cdbe85ab7cfedd78a9bc883e4469e4ab.zip
DAL Observables are now also parameterized.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml149
1 files changed, 31 insertions, 118 deletions
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 b971d9124..572ebc785 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
@@ -14,6 +14,7 @@
xmlns:localConverters="clr-namespace:Tango.MachineStudio.Developer.Converters"
xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
xmlns:observables="clr-namespace:Tango.DAL.Observables;assembly=Tango.DAL.Observables"
+ xmlns:editors="clr-namespace:Tango.SharedUI.Editors;assembly=Tango.SharedUI"
xmlns:shapes="clr-namespace:Tango.SharedUI.Shapes;assembly=Tango.SharedUI"
xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
mc:Ignorable="d"
@@ -228,112 +229,23 @@
</WrapPanel.Resources>
-
- <ContentControl>
- <StackPanel>
- <TextBlock>Dyeing Speed:</TextBlock>
- <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding DyeingSpeed,Mode=TwoWay}"></mahapps:NumericUpDown>
- </StackPanel>
- </ContentControl>
-
- <ContentControl>
- <StackPanel>
- <TextBlock>Min Ink Uptake:</TextBlock>
- <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding MinInkUptake,Mode=TwoWay}"></mahapps:NumericUpDown>
- </StackPanel>
- </ContentControl>
-
- <ContentControl>
- <StackPanel>
- <TextBlock>Mixer Temp:</TextBlock>
- <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding MixerTemp,Mode=TwoWay}"></mahapps:NumericUpDown>
- </StackPanel>
- </ContentControl>
-
- <ContentControl>
- <StackPanel>
- <TextBlock>Head Zone1 Temp:</TextBlock>
- <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding HeadZone1Temp,Mode=TwoWay}"></mahapps:NumericUpDown>
- </StackPanel>
- </ContentControl>
-
- <ContentControl>
- <StackPanel>
- <TextBlock>Head Zone2 Temp:</TextBlock>
- <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding HeadZone2Temp,Mode=TwoWay}"></mahapps:NumericUpDown>
- </StackPanel>
- </ContentControl>
-
- <ContentControl>
- <StackPanel>
- <TextBlock>Head Zone3 Temp:</TextBlock>
- <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding HeadZone3Temp,Mode=TwoWay}"></mahapps:NumericUpDown>
- </StackPanel>
- </ContentControl>
-
- <ContentControl>
- <StackPanel>
- <TextBlock>Head Air Flow:</TextBlock>
- <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding HeadAirFlow,Mode=TwoWay}"></mahapps:NumericUpDown>
- </StackPanel>
- </ContentControl>
-
- <ContentControl>
- <StackPanel>
- <TextBlock>Feeder Tension:</TextBlock>
- <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding FeederTension,Mode=TwoWay}"></mahapps:NumericUpDown>
- </StackPanel>
- </ContentControl>
-
- <ContentControl>
- <StackPanel>
- <TextBlock>Puller Tension:</TextBlock>
- <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding PullerTension,Mode=TwoWay}"></mahapps:NumericUpDown>
- </StackPanel>
- </ContentControl>
-
- <ContentControl>
- <StackPanel>
- <TextBlock>Dryer Buffer Length:</TextBlock>
- <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding DryerBufferLength,Mode=TwoWay}"></mahapps:NumericUpDown>
- </StackPanel>
- </ContentControl>
-
- <ContentControl>
- <StackPanel>
- <TextBlock>Dryer Zone1 Temp:</TextBlock>
- <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding DryerZone1Temp,Mode=TwoWay}"></mahapps:NumericUpDown>
- </StackPanel>
- </ContentControl>
-
- <ContentControl>
- <StackPanel>
- <TextBlock>Dryer Zone2 Temp:</TextBlock>
- <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding DryerZone2Temp,Mode=TwoWay}"></mahapps:NumericUpDown>
- </StackPanel>
- </ContentControl>
-
- <ContentControl>
- <StackPanel>
- <TextBlock>Dryer Zone3 Temp:</TextBlock>
- <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding DryerZone3Temp,Mode=TwoWay}"></mahapps:NumericUpDown>
- </StackPanel>
- </ContentControl>
-
-
- <ContentControl>
- <StackPanel>
- <TextBlock>Dryer Air Flow:</TextBlock>
- <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding DryerAirFlow,Mode=TwoWay}"></mahapps:NumericUpDown>
- </StackPanel>
- </ContentControl>
-
- <ContentControl>
- <StackPanel>
- <TextBlock>Winder Tension:</TextBlock>
- <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding WinderTension,Mode=TwoWay}"></mahapps:NumericUpDown>
- </StackPanel>
- </ContentControl>
+ <editors:ParameterizedEditor ParameterizedObject="{Binding}">
+ <editors:ParameterizedEditor.ItemsPanel>
+ <ItemsPanelTemplate>
+ <WrapPanel IsItemsHost="True" Orientation="Vertical" />
+ </ItemsPanelTemplate>
+ </editors:ParameterizedEditor.ItemsPanel>
+ <editors:ParameterizedEditor.DoubleTemplate>
+ <DataTemplate>
+ <ContentControl>
+ <StackPanel>
+ <TextBlock Text="{Binding Name}"></TextBlock>
+ <mahapps:NumericUpDown Minimum="0" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding Value,Mode=TwoWay}"></mahapps:NumericUpDown>
+ </StackPanel>
+ </ContentControl>
+ </DataTemplate>
+ </editors:ParameterizedEditor.DoubleTemplate>
+ </editors:ParameterizedEditor>
</WrapPanel>
</DockPanel>
</Border>
@@ -450,7 +362,7 @@
</StackPanel>
</Grid>
- <StackPanel Orientation="Horizontal" Margin="0 20 0 0" MaxWidth="800" HorizontalAlignment="Left">
+ <StackPanel Orientation="Horizontal" Margin="0 20 0 0" MaxWidth="940" HorizontalAlignment="Left">
<Border Style="{StaticResource JobFieldBorder}">
<StackPanel Margin="5" Width="140">
<StackPanel Orientation="Horizontal">
@@ -495,22 +407,23 @@
</DockPanel>
</StackPanel>
</Border>
- </StackPanel>
+ <StackPanel Width="180">
+ <StackPanel Orientation="Horizontal" Margin="10 0 0 0">
+ <Image Source="../Images/description.png" Width="32"></Image>
+ <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Description</TextBlock>
+ </StackPanel>
- <StackPanel Orientation="Horizontal" Margin="10 20 0 0">
- <Image Source="../Images/description.png" Width="32"></Image>
- <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Description</TextBlock>
+ <Border BorderThickness="1" BorderBrush="Silver" CornerRadius="5" Margin="0 0 5 5">
+ <TextBox Style="{x:Null}" BorderThickness="0" Margin="5" Height="40" Text="{Binding SelectedJob.Description}" VerticalAlignment="Stretch" materialDesign:HintAssist.Hint="Enter description" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"></TextBox>
+ </Border>
+ </StackPanel>
</StackPanel>
- <Border BorderThickness="1" BorderBrush="Silver" CornerRadius="5" Margin="0 0 5 5">
- <TextBox Style="{x:Null}" BorderThickness="0" Margin="5" Height="80" Text="{Binding SelectedJob.Description}" VerticalAlignment="Stretch" materialDesign:HintAssist.Hint="Enter description" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"></TextBox>
- </Border>
-
</StackPanel>
- <Grid Grid.Row="1" Margin="0 10 0 0">
+ <Grid Grid.Row="1" Margin="0 20 0 0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="200"/>
<ColumnDefinition Width="1*"/>
@@ -573,9 +486,9 @@
</Border>
</StackPanel>
- <Grid>
+ <Grid>
- </Grid>
+ </Grid>
</DockPanel>
</Grid>
</DockPanel>
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-19 23:55:36 +0000