Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs =================================================================== diff -u -r2699 -r2701 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs (.../SensorLocation.cs) (revision 2699) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs (.../SensorLocation.cs) (revision 2701) @@ -43,7 +43,7 @@ /// Association class for sensor data and a location /// [Serializable] - public class SensorLocation: IDomain + public class SensorLocation : IDomain { #region Business Rules @@ -118,14 +118,7 @@ /// [Specification(typeof(NotNullSpecification))] [PropertyOrder(1, 5)] - public Group Group - { - get { return sensorGroup; } - set - { - sensorGroup = value; - } - } + public Group Group { get; set; } /// /// Gets the group ID. @@ -279,14 +272,10 @@ } [PropertyOrder(1, 3)] - public string Alias { get; set; } // ToDo Tom/Kin Sun Waarvoor nodig? Wordt nergens gebruikt. Kan gewoon weg!? + public string Alias { get; set; } [Browsable(false)] - public string Profile - { - get; //{ return SoilProfile2D } ; - set; - } + public string Profile { get; set; } /// /// Gets the PiezometricHead type sensors sorted by relative location along profile. @@ -469,13 +458,13 @@ private bool IsLocationDataAsDataSourceUsed() { if (SourceTypePl1WaterLevelAtRiver == DataSourceTypeSensors.LocationData || - SourceTypePl1WaterLevelAtPolder == DataSourceTypeSensors.LocationData || + SourceTypePl1WaterLevelAtPolder == DataSourceTypeSensors.LocationData || SourceTypePl3 == DataSourceTypeSensors.LocationData || - SourceTypePl4 == DataSourceTypeSensors.LocationData|| - SourceTypePl1PlLineOffsetBelowDikeToeAtPolder == DataSourceTypeSensors.LocationData|| - SourceTypePl1PlLineOffsetBelowDikeTopAtPolder == DataSourceTypeSensors.LocationData|| - SourceTypePl1PlLineOffsetBelowDikeTopAtRiver == DataSourceTypeSensors.LocationData|| - SourceTypePl1PlLineOffsetBelowShoulderBaseInside == DataSourceTypeSensors.LocationData) + SourceTypePl4 == DataSourceTypeSensors.LocationData || + SourceTypePl1PlLineOffsetBelowDikeToeAtPolder == DataSourceTypeSensors.LocationData || + SourceTypePl1PlLineOffsetBelowDikeTopAtPolder == DataSourceTypeSensors.LocationData || + SourceTypePl1PlLineOffsetBelowDikeTopAtRiver == DataSourceTypeSensors.LocationData || + SourceTypePl1PlLineOffsetBelowShoulderBaseInside == DataSourceTypeSensors.LocationData) { return true; }