luc/eDosStation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

voor instal LNK

Browse source
This commit is contained in:
Luc 2021-06-09 14:40:49 +02:00
parent 48335319c0
commit 4d18842708
5 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
EpdBase3/Epd3Base.cpp
View file

@ -1178,7 +1178,7 @@ int Epd3Base::Epd3U::IssueAndCheck(float gain)
{
int rv = 0;
if (isNG) {
int kx = (int)gain;
float kx = gain;
rv = ReadCal();
if (rv != 0 || K6 != 1310) { rv = 1; goto error; }
if (K3 != kx || K4 != kx)

43
eDosStation/EntryBadge.xaml
View file

@ -18,7 +18,7 @@
<Style x:Key="tblIssuedLabel" TargetType="TextBlock">
<Setter Property="Background" Value="{StaticResource sckbLB}" />
<Setter Property="Padding" Value="20,0,20,0" />
<Setter Property="TextAlignment" Value="Right"/>
</Style>
<Style x:Key="tblIssuedValue" TargetType="TextBlock">
<Setter Property="TextAlignment" Value="Right" />
@ -257,7 +257,7 @@
</StackPanel>
<Image Source="/Images/Mk2OnReader.jpg" Width="300" Margin="10,10,10,50"/>
</StackPanel>
<Grid Grid.Row="1" Name="panelDone" HorizontalAlignment="Center" Visibility="Collapsed" >
<Grid Grid.Row="1" Name="panelDone" HorizontalAlignment="Center" >
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
@ -268,45 +268,44 @@
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="Task :" Style="{StaticResource tblIssuedLabel}" />
<TextBlock Grid.Row="0" Grid.Column="0" Text="Task" Style="{StaticResource tblIssuedLabel}" />
<TextBlock Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2">
<Run Text="{Binding Task_Name,Mode=OneWay}" />
<Run Text=" (" />
<Run Text="{Binding ID_Task,Mode=OneWay}" />
<Run Text=")" />
</TextBlock>
</TextBlock>
<TextBlock Grid.Row="1" Grid.Column="0" Text="Margin:" Style="{StaticResource tblIssuedLabel}"/>
<TextBlock Grid.Row="1" Grid.Column="0" Text="Margin" Style="{StaticResource tblIssuedLabel}" TextAlignment="Right"/>
<TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding MinWorkerDosisMargin,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}" />
<TextBlock Grid.Row="2" Grid.Column="0" Text="Doses (µSv)" Style="{StaticResource tblIssuedLabel}"/>
<TextBlock Grid.Row="2" Grid.Column="1" Text="HP07" Style="{StaticResource tblIssuedValueTitle}" />
<TextBlock Grid.Row="2" Grid.Column="2" Text="HP10" Style="{StaticResource tblIssuedValueTitle}" />
<TextBlock Grid.Row="2" Grid.Column="1" Name="lbHP07" Text="HP07" Style="{DynamicResource sIssuedSubHeader}" />
<TextBlock Grid.Row="2" Grid.Column="2" Name="lbHP10" Text="HP10" Style="{DynamicResource sIssuedSubHeader}" />
<TextBlock Grid.Row="3" Grid.Column="0" Text="Low alarm" Style="{StaticResource tblIssuedLabel}"/>
<TextBlock Grid.Row="3" Grid.Column="2" Text="{Binding Hp10Dose1,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}" />
<TextBlock Grid.Row="3" Grid.ColumnSpan="2" Grid.Column="1" Text="Doses (µSv)" Style="{DynamicResource sIssuedSubHeader}" TextAlignment="Center"/>
<TextBlock Grid.Row="4" Grid.Column="0" Text="High alarm" Style="{StaticResource tblIssuedLabel}"/>
<TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Hp07Dose,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
<TextBlock Grid.Row="4" Grid.Column="2" Text="{Binding Hp10Dose2,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
<TextBlock Grid.Row="4" Grid.Column="0" Text="Low alarm" Style="{StaticResource tblIssuedLabel}"/>
<TextBlock Grid.Row="4" Grid.Column="2" Text="{Binding Hp10Dose1,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}" />
<TextBlock Grid.Row="5" Grid.Column="0" Text="Rates (µSv/h)" Style="{StaticResource tblIssuedLabel}"/>
<TextBlock Grid.Row="5" Grid.Column="1" Text="HP07" Style="{StaticResource tblIssuedValueTitle}" />
<TextBlock Grid.Row="5" Grid.Column="2" Text="HP10" Style="{StaticResource tblIssuedValueTitle}" />
<TextBlock Grid.Row="5" Grid.Column="0" Text="High alarm" Style="{StaticResource tblIssuedLabel}"/>
<TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding Hp07Dose,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
<TextBlock Grid.Row="5" Grid.Column="2" Text="{Binding Hp10Dose2,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
<TextBlock Grid.Row="6" Grid.Column="0" Text="Low alarm" Style="{StaticResource tblIssuedLabel}"/>
<TextBlock Grid.Row="6" Grid.Column="2" Text="{Binding HP10Rate1ON,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}" />
<TextBlock Grid.Row="6" Grid.ColumnSpan="2" Text="Rates (µSv/h)" Style="{DynamicResource sIssuedSubHeader}" Grid.Column="1" />
<TextBlock Grid.Row="7" Grid.Column="0" Text="Low alarm" Style="{StaticResource tblIssuedLabel}"/>
<TextBlock Grid.Row="7" Grid.Column="2" Text="{Binding HP10Rate1ON,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}" />
<TextBlock Grid.Row="7" Grid.Column="0" Text="High alarm" Style="{StaticResource tblIssuedLabel}"/>
<TextBlock Grid.Row="7" Grid.Column="1" Text="{Binding HP07RateON,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
<TextBlock Grid.Row="7" Grid.Column="2" Text="{Binding HP10Rate2ON,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
<TextBlock Grid.Row="8" Grid.Column="0" Text="High alarm" Style="{StaticResource tblIssuedLabel}"/>
<TextBlock Grid.Row="8" Grid.Column="1" Text="{Binding HP07RateON,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
<TextBlock Grid.Row="8" Grid.Column="2" Text="{Binding HP10Rate2ON,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
</Grid>

2
eDosStation/EntryBadge.xaml.cs
View file

@ -302,6 +302,8 @@ namespace eDosStation
}
dispatcherTimer.Start(); //restart timer
panelDone.Visibility = Visibility.Visible;
lbHP07.Text = ep.Hp07Name;
lbHP10.Text = ep.Hp10Name;
panelWait.Visibility = Visibility.Collapsed;
}
}

BIN
eDosStation/Reader3.dll
View file

Binary file not shown.

8
eDosStation/eDosDict.xaml
View file

@ -268,5 +268,13 @@
<Setter Property="Minimum" Value="1" />
<Setter Property="Margin" Value="100,5,100,5" />
</Style>
<Style x:Key="sIssuedSubHeader" TargetType="{x:Type TextBlock}">
<Setter Property="HorizontalAlignment" Value="Stretch"/>
<Setter Property="TextAlignment" Value="Center"/>
<Setter Property="Background" Value="{StaticResource sckbLB}" />
<Setter Property="Padding" Value="20,0,20,0" />
<Setter Property="FontWeight" Value="Bold"/>
</Style>
</ResourceDictionary>