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

images

Browse source
This commit is contained in:
Luc 2021-05-12 11:10:09 +02:00
parent 613691c087
commit 344efe500d
11 changed files with 127 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
MK3/MK3.vcxproj
View file

@ -160,6 +160,9 @@
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
</CopyFileToFolders>
</ItemGroup>
<ItemGroup>
<Text Include="mk2to3.txt" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

3
MK3/MK3.vcxproj.filters
View file

@ -78,4 +78,7 @@
<Filter>Resource Files</Filter>
</CopyFileToFolders>
</ItemGroup>
<ItemGroup>
<Text Include="mk2to3.txt" />
</ItemGroup>
</Project>

24
MK3/mk2to3.txt Normal file
View file

@ -0,0 +1,24 @@
Old SensitivityID
K1 HGSens10 0
K2 SGSens10 2
K3 HGSens07 5
K4 SGSens07 3
K5 FBSens07
K6 BCSens07
SensitivityId {
SensitivityId::Hg1Sens10G = 0, SensitivityId::Hg2Sens10G = 1, SensitivityId::Sg1Sens10G = 2, SensitivityId::Sg2Sens10G = 3,
SensitivityId::Sg3Sens10G = 4, SensitivityId::Hg1Sens07G = 5, SensitivityId::Hg2Sens07G = 6, SensitivityId::Sg1Sens07G = 7,
SensitivityId::Sg2Sens07G = 8, SensitivityId::Sg3Sens07G = 9, SensitivityId::Fb1Sens07B = 10, SensitivityId::Fb2Sens07B = 11,
SensitivityId::Sg2Sens07B = 12, SensitivityId::Sg3Sens07B = 13, SensitivityId::MaxSensitivity
Counter
SG Detector threshold for Soft Gamma 2
BC Detector threshold for Beta Compensating 3
FB Detector threshold for Full Beta 5
HG Detector threshold for Hard Gamma 0
CounterType : uint16_t {
CounterType::Counter_Hg1 = 0, CounterType::Counter_Hg2 = 1, CounterType::Counter_Sg1 = 2, CounterType::Counter_Sg2 = 3,
CounterType::Counter_Sg3 = 4, CounterType::Counter_Fb1 = 5, CounterType::Counter_Fb2 = 6, CounterType::Counter_An1 = 7,
CounterType::Counter_Fn2 = 8

48
eDosStation/EntryBadge.xaml
View file

@ -6,16 +6,15 @@
xmlns:local="clr-namespace:eDosStation"
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation" x:Class="eDosStation.EntryBadge"
mc:Ignorable="d"
Title="EntryBadge" Height="980" Width="1820"
FontFamily="Segoe UI" FontSize="36"
Loaded="Window_Loaded"
ResizeMode="NoResize" WindowStartupLocation="CenterScreen" WindowState="Maximized" Closing="Window_Closing" >
Title="EntryBadge"
Height="980" Width="1820" ResizeMode="NoResize"
FontFamily="Segoe UI" FontSize="36"
Loaded="Window_Loaded"
WindowStartupLocation="CenterScreen" WindowState="Maximized" Closing="Window_Closing" >
<Window.Resources>
<local:DataSet1 x:Key="dataSet1"/>
<CollectionViewSource x:Key="getTaskListViewSource" Source="{Binding GetTaskInfo, Source={StaticResource dataSet1}}"/>
<local:Converters x:Key="BConverter"/>
<BitmapImage x:Key="iBG" UriSource="Images/EPD-MK2.png" />
<BitmapImage x:Key="iNG" UriSource="Images/EPD-N2.png" />
</Window.Resources>
<DockPanel VerticalAlignment="Top">
<StackPanel DockPanel.Dock="Top" HorizontalAlignment="Left">
@ -26,7 +25,7 @@
</StackPanel>
<TabControl Name="tb" TabStripPlacement="Top" SelectionChanged="tb_SelectionChanged" VerticalAlignment="Center" >
<TabItem Name="tbEntry" VerticalAlignment="Center" >
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,100,10,10">
<Border Background="{Binding Mode=OneWay, Source={StaticResource sckbLB}}" TextBlock.FontSize="24" TextBlock.LineHeight="30px" Padding="20,20,20,20" CornerRadius="10" BorderThickness="2" BorderBrush="Blue" >
<StackPanel HorizontalAlignment="Center" >
<TextBlock TextAlignment="Center" Padding="10,10,10,10" >
@ -225,20 +224,23 @@
<TabItem Name="tbEPD" FontSize="25" >
<Grid DataContext="{Binding Mode=OneWay, Source={StaticResource getTaskListViewSource}}" >
<Grid.RowDefinitions>
<RowDefinition Height="100" />
<RowDefinition Height="100" />
<RowDefinition Height="100" />
<RowDefinition Height="auto" />
<RowDefinition Height="50" />
<RowDefinition Height="100" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" FontSize="25" Name="epdWait" Text="waiting" HorizontalAlignment="Center" TextAlignment="Center" />
<TextBlock Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" FontSize="25" >
<Run Text="Issuing EPD:" />
<Run Name="statusEPD" Text="" /><LineBreak/>
</TextBlock>
<Image Grid.Row="2" Source="{StaticResource iBG}"/>
<Grid Grid.Row="3" HorizontalAlignment="Center" >
<StackPanel Grid.Row="0" Name="panelWait" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" >
<StackPanel Orientation="Horizontal">
<Image Source="/Images/Mannetje.png" Width="87" HorizontalAlignment="Left"/>
<TextBlock Text="Waiting for EPD" Margin="10,100,10,100" FontWeight="Bold" >
<TextBlock.Foreground>
<SolidColorBrush Color="{DynamicResource sckcP}"/>
</TextBlock.Foreground>
</TextBlock>
</StackPanel>
<Image Source="/Images/Mk2OnReader.jpg" Width="300" Margin="10,10,10,50"/>
</StackPanel>
<Grid Grid.Row="1" Name="panelDone" HorizontalAlignment="Center" Visibility="Collapsed" >
<TextBlock HorizontalAlignment="Center" TextAlignment="Center" FontSize="15" Margin="5,10,5,10">
<Run FontWeight="Bold" Text="Task: "/>
<Run Text="{Binding ID_Task,Mode=OneWay}" /><LineBreak/>
@ -252,7 +254,11 @@
<Run Text="{Binding MinWorkerDosisMargin,StringFormat={}{0:0.00}}" />
</TextBlock>
</Grid>
<telerik:RadButton Grid.Row="4" HorizontalAlignment="Center" VerticalAlignment="Center" Background="LawnGreen" Padding="10,10,10,10" Content="OK" Name="bEpdDone" Visibility="Hidden" Click="bClose_Click" Style="{DynamicResource OkCancelButton}" />
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center">
<telerik:RadButton Name="bEpdDone" VerticalAlignment="Center" Content="Cancel" Click="bClose_Click" Style="{DynamicResource OkCancelButton}" Margin="100,10,200,10" />
<telerik:RadButton Name="bEpdCancel" Background="LawnGreen" Content="OK" Click="bClose_Click" Style="{DynamicResource OkCancelButton}" Margin="100,10,200,10" />
</StackPanel>
<TextBlock Grid.Row="4" FontSize="25" Name="statusEPD" Text="waiting" HorizontalAlignment="Center" TextAlignment="Center" />
</Grid>
</TabItem>
<TabItem Name="tbNotAllowed">

44
eDosStation/EntryBadge.xaml.cs
View file

@ -219,7 +219,8 @@ namespace eDosStation
{
MessageBox.Show($"SetIssued error {ep.SetIssuedError}");
}
bEpdDone.Visibility = Visibility.Visible;
panelDone.Visibility= bEpdDone.Visibility = Visibility.Visible;
panelWait.Visibility = Visibility.Collapsed;
}
else
ep.Close();
@ -227,12 +228,17 @@ namespace eDosStation
}
private void GetEPD()
{
EpdFound = false;
if (_User == null || CurTaskRow == null) return;
int ok = ep.Connect(false);
if (ok != 1) System.Diagnostics.Debug.WriteLine($"GetEpd {ok} ConnectError: {ep.ConnectError}");
if (ok != 1)
{
statusEPD.Text= $"GetEpd {ok} ConnectError: {ep.ConnectError}";
}
if (ep.DeviceCount == 1 && ep.b.CurrentDeviceID > 0)
{
epdWait.Text = string.Empty;
statusEPD.Text = string.Empty;
EpdFound = true;
DoEPD();
}
@ -353,7 +359,7 @@ namespace eDosStation
Username.Text = string.Concat(_User.FirstName, " ", _User.LastName);
pUserSeconds.Maximum = UserSeconds; pUserSeconds.Value = UserSeconds;
tReasonNoAccess.Text = ReasonNoAccess;
dispatcherTimer = new DispatcherTimer(DispatcherPriority.Normal);
dispatcherTimer = new DispatcherTimer(DispatcherPriority.Background);
dispatcherTimer.Interval = TimeSpan.FromSeconds(1);
dispatcherTimer.Tick += SwitchToTask;
dispatcherTimer.Start();
@ -400,11 +406,15 @@ namespace eDosStation
}
public void endPage()
{
if (dfReader != null)
try
{
dfReader.WaitEnd();
dfReader.Dispose();
if (dfReader != null)
{
dfReader.WaitEnd();
dfReader.Dispose();
}
}
catch { }
this.Close();
}
@ -413,6 +423,7 @@ namespace eDosStation
dfReader?.Dispose(); dfReader = null;
this.Close();
}
private void BClear_Click(object sender, RoutedEventArgs e)
{
CSN.Text = string.Empty;
@ -451,14 +462,14 @@ namespace eDosStation
else
{
tb.SelectedItem = tbEPD;
bEpdDone.Visibility = Visibility.Hidden;//1
epdWait.Text = "Waiting for EPD (max 10 seconds)";
panelDone.Visibility = bEpdDone.Visibility = Visibility.Collapsed;//1
panelWait.Visibility = Visibility.Visible;
statusEPD.Text = "Waiting for EPD (max 10 seconds)";
Dispatcher.InvokeAsync(new Action(() => { GetEPD(); }),DispatcherPriority.Background);
}
}
}
private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (taskLoading) return;
@ -569,13 +580,15 @@ namespace eDosStation
}
sp.Visibility = Visibility.Visible;
}
private void Window_Loaded(object sender, RoutedEventArgs e)
{
// dataInterface.checkCon();
EpdFound = false;
initialising = true;
tbEntry.IsSelected = true;
bEpdDone.Visibility = Visibility.Hidden;
panelDone.Visibility= bEpdDone.Visibility = Visibility.Collapsed;
panelWait.Visibility = Visibility.Visible;
cbAlara.IsChecked = false;
cbInst1.Content = thisStation.Inst_Name1;
@ -644,16 +657,21 @@ namespace eDosStation
}
}
private void bEpdDone_Click(object sender, RoutedEventArgs e)
{
}
private void DfReader_BadgeTO(LSWDesfirePublic.CCard Sender, EventArgs e)
{
this.Dispatcher.InvokeAsync(new Action(() => endPage()));
this.Dispatcher.InvokeAsync(new Action(() => endPage()),DispatcherPriority.Normal);
}
private void DFReader_Badged(LSWDesfirePublic.CCard Sender, LSWDesfirePublic.BadgeEventArgs e)
{
if (e.PersID > 0)
{
this.Dispatcher.Invoke(new Action(() => showBadge(e.PersID, e.UID)));
this.Dispatcher.InvokeAsync(new Action(() => showBadge(e.PersID, e.UID)),DispatcherPriority.Background);
}
}
}

36
eDosStation/EpdExit.xaml
View file

@ -7,7 +7,8 @@
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
mc:Ignorable="d"
Title="Exit"
Height="500" Width="1500" SizeToContent="WidthAndHeight" VerticalAlignment="Center"
Height="980" Width="1820" ResizeMode="NoResize"
VerticalAlignment="Center"
FontFamily="Segoe UI" FontSize="36"
Loaded="Window_Loaded" WindowStartupLocation="CenterScreen" Closing="Window_Closing">
<DockPanel>
@ -17,22 +18,27 @@
<TabControl>
<TabItem Name="Wait" HorizontalAlignment="Center" VerticalAlignment="Center" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" >
<TextBlock Text="Waiting for EPD" Margin="10,100,10,100" FontWeight="Bold" >
<StackPanel Orientation="Horizontal">
<Image Source="/Images/Mannetje.png" Width="87" HorizontalAlignment="Left"/>
<TextBlock Text="Waiting for EPD" FontWeight="Bold" VerticalAlignment="Center" >
<TextBlock.Foreground>
<SolidColorBrush Color="{DynamicResource sckcP}"/>
</TextBlock.Foreground>
</TextBlock>
</StackPanel>
<Image Source="/Images/Mk2OnReader.jpg" Width="300" Margin="10,10,10,50"/>
<telerik:RadButton Name="bCancel" Content="Cancel" Style="{DynamicResource OkCancelButton}" />
</StackPanel>
</TabItem>
<TabItem Name="ok" VerticalAlignment="Center" >
<Grid TextBlock.FontSize="40" >
<TabItem Name="ok" VerticalAlignment="Center" HorizontalContentAlignment="Center" >
<Grid TextBlock.FontSize="40" HorizontalAlignment="Center" Margin="0,100,0,50" >
<Grid.RowDefinitions >
<RowDefinition Height="auto" />
<RowDefinition/>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
@ -40,22 +46,22 @@
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Grid.ColumnSpan="4" Text="EPD returned" FontSize="50" Foreground="{DynamicResource sckbP}" FontWeight="Bold" TextAlignment="Center" Background="{DynamicResource sckbLB}" />
<TextBlock Grid.Row="0" Grid.ColumnSpan="4" Text="Visit registered" FontSize="50" Foreground="{DynamicResource sckbP}" FontWeight="Bold" TextAlignment="Center" Background="{DynamicResource sckbLB}" />
<TextBlock Grid.Row="1" Grid.Column="0" Text="Pers ID:" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,5,20,5" Foreground="{DynamicResource sckbP}" FontWeight="Bold" />
<TextBlock Grid.Row="1" Grid.Column="1" Name="Wearer" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="50,5,20,5" Text="12345" Foreground="{DynamicResource sckbP}" />
<TextBlock Grid.Row="1" Grid.Column="2" Text="Visit:" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,5,20,5" Foreground="{DynamicResource sckbP}" FontWeight="Bold" />
<TextBlock Grid.Row="1" Grid.Column="3" Name= "EpdVisit" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5,5,20,5" Text="12345545" Foreground="{DynamicResource sckbP}" />
<TextBlock Grid.Row="2" Grid.Column="0" Text="Dose" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,5,20,5" Foreground="{DynamicResource sckbP}" FontWeight="Bold" />
<TextBlock Grid.Row="2" Grid.Column="0" Text="Dose:" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,5,20,5" Foreground="{DynamicResource sckbP}" FontWeight="Bold" />
<StackPanel Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Vertical" VerticalAlignment="Center" Name="DosePanel" >
<TextBlock Name="HpDose07" Text="1234" HorizontalAlignment="Left" Margin="50,0,0,0" Foreground="{DynamicResource sckbP}" />
<TextBlock Name="HpDose10" Text="1223" HorizontalAlignment="Left" Margin="50,0,0,0" Foreground="{DynamicResource sckbP}" />
</StackPanel>
<telerik:RadButton Grid.Row="3" Grid.Column="1" Name="bCloseExit" Click="BCloseExit_Click" Content="OK" Width="190" Style="{StaticResource OkCancelButton}" Margin="0,50,0,0" Grid.ColumnSpan="2" />
<telerik:RadButton Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="4" Name="bCloseExit" Click="BCloseExit_Click" Content="OK" Width="190" Style="{StaticResource OkCancelButton}" Margin="0,50,0,50" VerticalAlignment="Center" />
</Grid>
</TabItem>
<TabItem Name="Alarm" Height="23" VerticalAlignment="Center">
<StackPanel>
<Border Background="LightYellow" TextBlock.FontSize="22" TextBlock.LineHeight="30px" Padding="20,20,20,20" >
<TabItem Name="Alarm" VerticalAlignment="Center" >
<StackPanel Margin="50,50,50,50" VerticalAlignment="Center">
<Border Style="{StaticResource styleAlarmBorder}" >
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" >
<LineBreak/>
<Run>Your dose and/or doserate has been above the alarmlevel</Run>
@ -68,12 +74,12 @@
<LineBreak/>
</TextBlock>
</Border>
<telerik:RadButton Name="bConfirmAlarm" Click="BConfirmAlarm_Click" Content="OK" Width="190" Height="50" CornerRadius="10" TextBlock.FontSize="25" />
<telerik:RadButton Name="bConfirmAlarm" Click="BConfirmAlarm_Click" Content="OK" Width="190" Style="{StaticResource OkCancelButton}" Margin="50,50,50,50" />
</StackPanel>
</TabItem>
<TabItem Name="OtherAlarm" >
<StackPanel>
<Border Background="LightYellow" TextBlock.FontSize="24" TextBlock.LineHeight="30px" Padding="20,20,20,20" >
<StackPanel VerticalAlignment="Center">
<Border Style="{StaticResource styleAlarmBorder}" >
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" >
<LineBreak/>
<Run>Your EPD has encountered a problem.</Run>
@ -84,7 +90,7 @@
<Run> He needs to investigate the alarm.</Run>
</TextBlock>
</Border>
<telerik:RadButton Name="bConfirmAlarm2" Click="BConfirmAlarm_Click" Content="OK" Width="190" Height="50" CornerRadius="10" TextBlock.FontSize="25" />
<telerik:RadButton Name="bConfirmAlarm2" Click="BConfirmAlarm_Click" Content="OK" Width="190" Height="50" Style="{StaticResource OkCancelButton}" Margin="50,50,50,50" />
</StackPanel>
</TabItem>
</TabControl>

3
eDosStation/EpdExit.xaml.cs
View file

@ -176,7 +176,8 @@ namespace eDosStation
statusEPD.Content = $"StartScan : EPD: {ep.b.CurrentDeviceID}";
LoadDoses();
}
if (!EpdFound)
if (!EpdFound & rv==0) //do loop ?
{
statusEPD.Content = $"EPD: Wait ";
Search = 100;

BIN
eDosStation/Images/Mannetje.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
eDosStation/Images/Mk2OnReader.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 34 KiB

14
eDosStation/eDosDict.xaml
View file

@ -2,6 +2,11 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
xmlns:local="clr-namespace:eDosStation">
<BitmapImage x:Key="iBG" UriSource="Images/EPD-MK2.png" />
<BitmapImage x:Key="iNG" UriSource="Images/EPD-N2.png" />
<BitmapImage x:Key="iRD" UriSource="Images/Mk2OnReader.jpg" />
<Style x:Key="ScrollBarPageButton"
TargetType="{x:Type RepeatButton}">
<Setter Property="SnapsToDevicePixels"
@ -240,4 +245,13 @@
</DataTrigger>
</Style.Triggers>
</Style>
<Style x:Key="styleAlarmBorder" TargetType="Border">
<Setter Property="Background" Value="LightYellow" />
<Setter Property="TextBlock.FontSize" Value="30" />
<Setter Property="TextBlock.FontWeight" Value="Bold" />
<Setter Property="TextBlock.LineHeight" Value="30px" />
<Setter Property="Padding" Value="20,20,20,20" />
</Style>
</ResourceDictionary>

2
eDosStation/eDosStation.csproj
View file

@ -286,6 +286,8 @@
<Resource Include="Images\logo500.png" />
<Resource Include="Images\logoh120.png" />
<Resource Include="Images\logoh60.png" />
<Resource Include="Images\Mannetje.png" />
<Resource Include="Images\Mk2OnReader.jpg" />
<Content Include="IR_READER_MS_DLL.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>