diff --git a/MK3/MK3.vcxproj b/MK3/MK3.vcxproj
index 817694a..a37eb41 100644
--- a/MK3/MK3.vcxproj
+++ b/MK3/MK3.vcxproj
@@ -160,6 +160,9 @@
true
+
+
+
diff --git a/MK3/MK3.vcxproj.filters b/MK3/MK3.vcxproj.filters
index 49931cc..201433b 100644
--- a/MK3/MK3.vcxproj.filters
+++ b/MK3/MK3.vcxproj.filters
@@ -78,4 +78,7 @@
Resource Files
+
+
+
\ No newline at end of file
diff --git a/MK3/mk2to3.txt b/MK3/mk2to3.txt
new file mode 100644
index 0000000..333fa72
--- /dev/null
+++ b/MK3/mk2to3.txt
@@ -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
\ No newline at end of file
diff --git a/eDosStation/EntryBadge.xaml b/eDosStation/EntryBadge.xaml
index ac26936..0f4c323 100644
--- a/eDosStation/EntryBadge.xaml
+++ b/eDosStation/EntryBadge.xaml
@@ -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" >
-
-
-
@@ -26,7 +25,7 @@
-
+
@@ -225,20 +224,23 @@
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -252,7 +254,11 @@
-
+
+
+
+
+
diff --git a/eDosStation/EntryBadge.xaml.cs b/eDosStation/EntryBadge.xaml.cs
index 8854abc..e1760d1 100644
--- a/eDosStation/EntryBadge.xaml.cs
+++ b/eDosStation/EntryBadge.xaml.cs
@@ -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);
}
}
}
diff --git a/eDosStation/EpdExit.xaml b/eDosStation/EpdExit.xaml
index 462ab7a..12ed820 100644
--- a/eDosStation/EpdExit.xaml
+++ b/eDosStation/EpdExit.xaml
@@ -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">
@@ -17,22 +18,27 @@
-
+
+
+
+
+
+
-
-
+
+
-
+
@@ -40,22 +46,22 @@
-
+
-
+
-
+
-
-
-
+
+
+
Your dose and/or doserate has been above the alarmlevel
@@ -68,12 +74,12 @@
-
+
-
-
+
+
Your EPD has encountered a problem.
@@ -84,7 +90,7 @@
He needs to investigate the alarm.
-
+
diff --git a/eDosStation/EpdExit.xaml.cs b/eDosStation/EpdExit.xaml.cs
index a32a4cb..5a1cb67 100644
--- a/eDosStation/EpdExit.xaml.cs
+++ b/eDosStation/EpdExit.xaml.cs
@@ -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;
diff --git a/eDosStation/Images/Mannetje.png b/eDosStation/Images/Mannetje.png
new file mode 100644
index 0000000..87caa24
Binary files /dev/null and b/eDosStation/Images/Mannetje.png differ
diff --git a/eDosStation/Images/Mk2OnReader.jpg b/eDosStation/Images/Mk2OnReader.jpg
new file mode 100644
index 0000000..56a44c8
Binary files /dev/null and b/eDosStation/Images/Mk2OnReader.jpg differ
diff --git a/eDosStation/eDosDict.xaml b/eDosStation/eDosDict.xaml
index 8334a98..1b81c7d 100644
--- a/eDosStation/eDosDict.xaml
+++ b/eDosStation/eDosDict.xaml
@@ -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">
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/eDosStation/eDosStation.csproj b/eDosStation/eDosStation.csproj
index fed2ceb..0c75216 100644
--- a/eDosStation/eDosStation.csproj
+++ b/eDosStation/eDosStation.csproj
@@ -286,6 +286,8 @@
+
+
Always