Index: DamEngine/branches/DamEngine 18.1/src/Deltares.DamEngine.Data/General/DamProjectData.cs =================================================================== diff -u -r1748 -r1750 --- DamEngine/branches/DamEngine 18.1/src/Deltares.DamEngine.Data/General/DamProjectData.cs (.../DamEngine 18.1 Obsolete/src/Deltares.DamEngine.Data/General/DamProjectData.cs) (revision 1748) +++ DamEngine/branches/DamEngine 18.1/src/Deltares.DamEngine.Data/General/DamProjectData.cs (.../DamEngine 18.1/src/Deltares.DamEngine.Data/General/DamProjectData.cs) (revision 1750) @@ -23,6 +23,7 @@ using System.Collections.Generic; using Deltares.DamEngine.Data.General.Results; using Deltares.DamEngine.Data.General.Sensors; +using Deltares.DamEngine.Data.General.TimeSeries; using Deltares.DamEngine.Data.RegionalAssessmentResults; using Deltares.DamEngine.Data.Standard.Language; using Deltares.DamEngine.Data.Standard.Logging; @@ -39,6 +40,7 @@ private DamProjectType damProjectType = DamProjectType.Operational; private List jobs = new List(); private List designCalculations; + private TimeSerieCollection outputTimeSerieCollection = null; private SensorData sensorData; private string calculationMap = ""; private string projectPath = ""; @@ -51,9 +53,27 @@ /// The calculation messages. /// public List CalculationMessages { get; set; } = null; - + /// + /// Gets or sets the output time serie collection. + /// + /// + /// Output time series for operational use + /// + public TimeSerieCollection OutputTimeSerieCollection + { + get + { + return outputTimeSerieCollection; + } + set + { + outputTimeSerieCollection = value; + } + } + + /// /// Constructor /// public DamProjectData() @@ -99,7 +119,7 @@ { get { - return dike; + return dike; } set { @@ -118,7 +138,7 @@ set { damProjectCalculationSpecification = value; } } - + public virtual DamJob DikeJob { get @@ -159,8 +179,8 @@ if (modified) { - LocationJob.DamProjectType = damProjectType; - } + LocationJob.DamProjectType = damProjectType; + } } } @@ -197,7 +217,7 @@ foreach (LocationJob locationJob in dikeJob.Jobs) { jobs.Add(locationJob); - } + } } return jobs; } @@ -229,7 +249,7 @@ public string CalculationMap { get { return calculationMap; } - set { calculationMap = value?? ""; } + set { calculationMap = value ?? ""; } } /// @@ -238,7 +258,8 @@ /// /// The maximum calculation cores. /// - public int MaxCalculationCores { + public int MaxCalculationCores + { get { return maxCalculationCores; @@ -285,44 +306,5 @@ { return Name; } - - - /// - /// Fills the overall sensor data. - /// - public void FillOverallSensorData() - { - if (sensorData != null) - { - sensorData.Sensors.Clear(); - sensorData.SensorGroups.Clear(); - sensorData.SensorLocations.Clear(); - } - else - { - sensorData = new SensorData(); - } - foreach (var location in dike.Locations) - { - var sd = location.SensorData; - - foreach (var sensor in sd.Sensors ) - { - if (sensorData.GetSensorById(sensor.ID) == null) - { - sensorData.Sensors.Add(sensor); - } - } - if (sensorData.GetGroupById(sd.Group.ID) == null && sd.Group.ID >= 0) - { - sd.Group.PickSensors = sensorData.Sensors; - sensorData.SensorGroups.Add(sd.Group); - } - if (sensorData.GetSensorLocationByLocationName(sd.LocationName) == null) - { - sensorData.SensorLocations.Add(sd); - } - } - } } }