diff --git a/CentralMonitorGUI/Properties/AssemblyInfo.cs b/CentralMonitorGUI/Properties/AssemblyInfo.cs
index 982045c..d16f307 100644
--- a/CentralMonitorGUI/Properties/AssemblyInfo.cs
+++ b/CentralMonitorGUI/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
diff --git a/CentralMonitorGUI/ViewModels/VitalSignViewModel.cs b/CentralMonitorGUI/ViewModels/VitalSignViewModel.cs
index 8c42522..65da8a1 100644
--- a/CentralMonitorGUI/ViewModels/VitalSignViewModel.cs
+++ b/CentralMonitorGUI/ViewModels/VitalSignViewModel.cs
@@ -30,6 +30,12 @@ private void UpdateTimer_Elapsed(object sender, ElapsedEventArgs e)
var spO2Value = Monitor.VitalSignValues.FirstOrDefault(
x => x.VitalSignType == VitalSignType.SpO2);
SpO2 = spO2Value?.Value.ToString() ?? "X";
+
+ var systolicBloodPressure = Monitor.VitalSignValues.FirstOrDefault(
+ x => x.VitalSignType == VitalSignType.SystolicBloodPressure);
+ var diastolicBloodPressure = Monitor.VitalSignValues.FirstOrDefault(
+ x => x.VitalSignType == VitalSignType.DiastolicBloodPressure);
+ NiBP = $"{systolicBloodPressure?.Value.ToString() ?? "X"} / {diastolicBloodPressure?.Value.ToString() ?? "X"}";
}
private string heartRate = "X";
@@ -65,5 +71,15 @@ public string SpO2
OnPropertyChanged();
}
}
+ private string niBp = "X / X";
+ public string NiBP
+ {
+ get => niBp;
+ set
+ {
+ niBp = value;
+ OnPropertyChanged();
+ }
+ }
}
}
\ No newline at end of file
diff --git a/CentralMonitorGUI/Views/VitalSignView.xaml b/CentralMonitorGUI/Views/VitalSignView.xaml
index f11b96a..9d2aef3 100644
--- a/CentralMonitorGUI/Views/VitalSignView.xaml
+++ b/CentralMonitorGUI/Views/VitalSignView.xaml
@@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
- d:DesignHeight="80" d:DesignWidth="140"
+ d:DesignHeight="100" d:DesignWidth="140"
Name="Self">
@@ -22,6 +22,11 @@
HorizontalAlignment="Right" Margin="0 57 45 0"/>
+
+
+
diff --git a/NetworkCommunication/Informations.cs b/NetworkCommunication/Informations.cs
index 2f6baa9..95cc895 100644
--- a/NetworkCommunication/Informations.cs
+++ b/NetworkCommunication/Informations.cs
@@ -107,9 +107,9 @@ public static IList VitalSignTypesForSensor(SensorType sensorType
case SensorType.BloodPressure:
return new List
{
- VitalSignType.DiastolicBloodPressure,
+ VitalSignType.MeanArterialPressure,
VitalSignType.SystolicBloodPressure,
- VitalSignType.MeanArterialPressure
+ VitalSignType.DiastolicBloodPressure
};
case SensorType.SpO2:
return new[] {VitalSignType.SpO2, VitalSignType.HeartRate};