Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs =================================================================== diff -u -r1646 -r1669 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 1646) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 1669) @@ -296,6 +296,7 @@ } [Browsable(false)] + [XmlOldName("SensorData")] public virtual SensorLocation SensorLocation { get Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs =================================================================== diff -u -r1604 -r1669 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs (.../SensorLocation.cs) (revision 1604) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs (.../SensorLocation.cs) (revision 1669) @@ -144,7 +144,7 @@ public string LocationName { get { return (Location != null) ? Location.Name : string.Empty; } - } + } /// /// Gets or sets the sensor group. @@ -153,7 +153,7 @@ /// The group. /// [Specification(typeof(NotNullSpecification))] - [PropertyOrder(1, 5)] + [PropertyOrder(1, 5)] public Group Group { get { return sensorGroup; } @@ -205,84 +205,85 @@ } /// - /// Gets or sets the PL3 data source type. + /// Gets or sets the source type PL3. /// /// - /// The PL3. + /// The source type PL3. /// [Specification(typeof(SensorOrLocationData))] [PropertyOrder(1, 12)] + [XmlOldName("PL3")] public DataSourceTypeSensors SourceTypePl3 { get; set; } /// - /// Gets or sets the PL4 data source type. + /// Gets or sets the source type PL4. /// /// - /// The PL4. + /// The source type PL4. /// [Specification(typeof(SensorOrLocationData))] [PropertyOrder(1, 13)] + [XmlOldName("PL4")] public DataSourceTypeSensors SourceTypePl4 { get; set; } /// - /// Gets or sets the outer water level data source type. + /// Gets or sets the source type PL1 water level at river. /// /// - /// The outer water level. + /// The source type PL1 water level at river. /// [Specification(typeof(SensorOrLocationData))] [PropertyOrder(1, 6)] + [XmlOldName("PL1WaterLevelAtRiver")] public DataSourceTypeSensors SourceTypePl1WaterLevelAtRiver { get; set; } /// - /// Gets or sets the PL1 PL line offset below dike top at river data source type. + /// Gets or sets the source type PL1 pl line offset below dike top at river. /// /// - /// Data source type for PL1 PLLine offset below dike top at river. + /// The source type PL1 pl line offset below dike top at river. /// [Specification(typeof(IgnoreOrLocationData))] [PropertyOrder(1, 7)] + [XmlOldName("PL1PLLineOffsetBelowDikeTopAtRiver")] public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeTopAtRiver { get; set; } /// - /// Gets or sets the PL1 PL line offset below dike top at polder data source type + /// Gets or sets the source type PL1 pl line offset below dike top at polder. /// /// - /// The PL1 PL line offset below dike top at polder. + /// The source type PL1 pl line offset below dike top at polder. /// [Specification(typeof(IgnoreOrLocationData))] [PropertyOrder(1, 8)] + [XmlOldName("PL1PLLineOffsetBelowDikeTopAtPolder")] public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeTopAtPolder { get; set; } - /// - /// Gets or sets the PL1 PL line offset below shoulder base inside data source type - /// - /// - /// The PL1 PL line offset below shoulder base inside. - /// [Specification(typeof(IgnoreOrLocationData))] [PropertyOrder(1, 9)] public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowShoulderBaseInside { get; set; } /// - /// Gets or sets the PL1 PL line offset below dike toe at polder data source type. + /// Gets or sets the source type PL1 pl line offset below dike toe at polder. /// /// - /// The PL1 PL line offset below dike toe at polder. + /// The source type PL1 pl line offset below dike toe at polder. /// [Specification(typeof(IgnoreOrLocationData))] [PropertyOrder(1, 10)] + [XmlOldName("PL1PLLineOffsetBelowDikeToeAtPolder")] public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeToeAtPolder { get; set; } /// - /// Gets or sets the PL1 polder level data source type. + /// Gets or sets the source type PL1 water level at polder. /// /// - /// The PL1 polder level. + /// The source type PL1 water level at polder. /// [Specification(typeof(SensorOrLocationData))] [PropertyOrder(1, 11)] + [XmlOldName("PL1WaterLevelAtPolder")] public DataSourceTypeSensors SourceTypePl1WaterLevelAtPolder { get; set; } /// @@ -331,14 +332,14 @@ public string Alias { get; set; } // ToDo Tom/Kin Sun Waarvoor nodig? Wordt nergens gebruikt. Kan gewoon weg!? [Browsable(false)] - public string Profile + public string Profile { get; //{ return SoilProfile2D } ; set; } [Browsable(false)] - public string MStabFile + public string MStabFile { get; //{ return SoilProfile2D } ; set; @@ -360,10 +361,10 @@ Sensors.GetBySpecification(new PiezometricHeadSensorSpecification()); foreach (var sensor in candidateSensors) - { + { if (sensor.PLLineMappings.Contains(plLineType)) { - double relativeLocation = sensor.RelativeLocationSpecified ? + double relativeLocation = sensor.RelativeLocationSpecified ? sensor.RelativeLocation : calculatedRelativeLocations[sensor]; if (table.ContainsKey(relativeLocation)) @@ -392,7 +393,7 @@ var dict = new Dictionary(); foreach (Sensor sensor in Sensors) - { + { double relativeLocation = startPoint + (Location.XRdDikeLine - sensor.XRd); dict.Add(sensor, relativeLocation); } @@ -411,7 +412,7 @@ internal static readonly string PL4 = StaticReflection.GetMemberName(x => x.SourceTypePl4); } - public double? GetValue(Expression> expression, IDictionary sensorValues, Sensor sensor) + public double? GetValue(Expression> expression, IDictionary sensorValues, Sensor sensor) { if (sensorValues == null) throw new ArgumentNullException("sensorValues"); if (sensor == null) throw new ArgumentNullException("sensor"); @@ -550,7 +551,7 @@ return GetGroupsDomain(); default: return null; - } + } } } }