Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r1620 -r1632
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 1620)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 1632)
@@ -139,6 +139,7 @@
var sensor1 = new Sensor()
{
ID = 1,
+ Name = "Sensor 1",
RelativeLocation = 12.2,
SensorType = SensorType.WaterLevel,
PlLineMappings = new[] { PlLineType.Pl1 }
@@ -147,6 +148,7 @@
var sensor2 = new Sensor()
{
ID = 2,
+ Name = "Sensor 2",
RelativeLocation = 24.2,
SensorType = SensorType.PolderLevel,
PlLineMappings = new [] { PlLineType .Pl1}
@@ -177,6 +179,7 @@
var sensor3 = new Sensor()
{
ID = 3,
+ Name = "Sensor 3",
RelativeLocation = 8.8,
SensorType = SensorType.PiezometricHead,
PlLineMappings = new [] { PlLineType.Pl3, PlLineType.Pl4}
Index: DamEngine/trunk/xsd/DamSensor.xsd
===================================================================
diff -u -r1620 -r1632
--- DamEngine/trunk/xsd/DamSensor.xsd (.../DamSensor.xsd) (revision 1620)
+++ DamEngine/trunk/xsd/DamSensor.xsd (.../DamSensor.xsd) (revision 1632)
@@ -35,5 +35,6 @@
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r1628 -r1632
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1628)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1632)
@@ -113,6 +113,7 @@
sensorData.Sensors.Add(new Data.General.Sensors.Sensor()
{
ID = inputSensor.Id,
+ Name = inputSensor.Name,
RelativeLocation = inputSensor.RelativeLocation,
SensorType = ConversionHelper.ConvertToSensorType(inputSensor.SensorType),
PlLineMappings = plLineMappings
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r1620 -r1632
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 1620)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 1632)
@@ -829,6 +829,8 @@
private uint sensorTypeField;
+ private string nameField;
+
///
[System.Xml.Serialization.XmlElementAttribute("PlLineMapping")]
public SensorPlLineMapping[] PlLineMapping {
@@ -872,6 +874,17 @@
this.sensorTypeField = value;
}
}
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public string Name {
+ get {
+ return this.nameField;
+ }
+ set {
+ this.nameField = value;
+ }
+ }
}
///
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r1620 -r1632
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 1620)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 1632)
@@ -143,6 +143,7 @@
{
var inputSensor = new Io.XmlInput.Sensor();
inputSensor.Id = sensor.ID;
+ inputSensor.Name = sensor.Name;
inputSensor.RelativeLocation = sensor.RelativeLocation;
inputSensor.SensorType = ConversionHelper.ConvertToInputSensorType(sensor.SensorType);
inputSensor.PlLineMapping = new SensorPlLineMapping[sensor.PlLineMappings.Length];
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/EngineInterface.cs
===================================================================
diff -u -r1576 -r1632
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/EngineInterface.cs (.../EngineInterface.cs) (revision 1576)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/EngineInterface.cs (.../EngineInterface.cs) (revision 1632)
@@ -24,7 +24,6 @@
using Deltares.DamEngine.Calculators.DikesAssessmentRegional;
using Deltares.DamEngine.Calculators.DikesDesign;
using Deltares.DamEngine.Data.General;
-using Deltares.DamEngine.Data.Standard;
using Deltares.DamEngine.Data.Standard.Calculation;
using Deltares.DamEngine.Data.Standard.Logging;
using Deltares.DamEngine.Interface.Properties;