diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-08 14:27:21 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-08 14:27:21 +0200 |
| commit | e2bf9f578c3ed53d869744f94b020048ca806c6e (patch) | |
| tree | 11b99612235ca541c029f45bac612706108de2df /Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers | |
| parent | e111c33bc87acf40202f9e5423e21b087a366f07 (diff) | |
| download | Tango-e2bf9f578c3ed53d869744f94b020048ca806c6e.tar.gz Tango-e2bf9f578c3ed53d869744f94b020048ca806c6e.zip | |
Refactored catalogs to per RML.
Dropped MEDIA_COLOR.
Added RML White Point LAB.
Added additional dispenser parameters in MS module.
Attempt to optimize PPC color catalog view performance.
Removed "Color Catalog Code" from brush stop.
Implemented PPC color catalog selection per RML.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers')
2 files changed, 17 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml index d4b3b0655..0b295b620 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml @@ -54,7 +54,19 @@ <ComboBox ItemsSource="{Binding DispenserTypes}" SelectedItem="{Binding ActiveDispenser.DispenserType}" DisplayMemberPath="Name"></ComboBox> <TextBlock FontWeight="SemiBold">Nanoliter / Pulse:</TextBlock> - <mahapps:NumericUpDown HasDecimals="True" BorderThickness="0 0 0 1" Background="Transparent" Minimum="0" Maximum="5" Value="{Binding ActiveDispenser.NlPerPulse}"></mahapps:NumericUpDown> + <mahapps:NumericUpDown HorizontalContentAlignment="Left" HasDecimals="True" BorderThickness="0 0 0 1" Background="Transparent" Minimum="0" Maximum="5" Value="{Binding ActiveDispenser.NlPerPulse}"></mahapps:NumericUpDown> + + <TextBlock FontWeight="SemiBold">Part Number:</TextBlock> + <TextBox Text="{Binding ActiveDispenser.PartNumber}"></TextBox> + + <TextBlock FontWeight="SemiBold">PCB Serial:</TextBlock> + <TextBox Text="{Binding ActiveDispenser.PcbSerial}"></TextBox> + + <TextBlock FontWeight="SemiBold">PCB Version:</TextBlock> + <TextBox Text="{Binding ActiveDispenser.PcbVersion}"></TextBox> + + <TextBlock FontWeight="SemiBold">Production Date:</TextBlock> + <DatePicker SelectedDate="{Binding ActiveDispenser.ProductionDate}"></DatePicker> <TextBlock FontWeight="SemiBold">Installed On Machine:</TextBlock> <TextBox IsEnabled="False" Text="{Binding ActiveDispenser.Machine.SerialNumber,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}" IsReadOnly="True"></TextBox> diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml index a7a57d801..a1d080380 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml @@ -66,6 +66,10 @@ <DataGridTextColumn Header="SERIAL NUMBER" Binding="{Binding SerialNumber}" Width="Auto" /> <DataGridTextColumn Header="TYPE" Binding="{Binding DispenserType.Name}" Width="Auto" /> <DataGridTextColumn Header="NANOLITER / PULSE" Binding="{Binding NlPerPulse}" Width="Auto" /> + <DataGridTextColumn Header="PART NUMBER" Binding="{Binding PartNumber}" Width="Auto" /> + <DataGridTextColumn Header="PCB SERIAL" Binding="{Binding PcbSerial}" Width="Auto" /> + <DataGridTextColumn Header="PCB VERSION" Binding="{Binding PcbVersion}" Width="Auto" /> + <DataGridTextColumn Header="PRODUCTION DATE" Binding="{Binding ProductionDate,StringFormat='d'}" Width="Auto" /> <DataGridTextColumn Header="INSTALLED" Binding="{Binding IsInstalled}" Width="Auto" /> <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="1*" /> </DataGrid.Columns> |