Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs
===================================================================
diff -u -r6778 -r6793
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 6778)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 6793)
@@ -326,7 +326,7 @@
///
/// Updates the design calculations.
///
- public void UpdateDesignCalculations()
+ private void UpdateDesignCalculations()
{
if (designCalculations == null)
{
@@ -348,38 +348,7 @@
DataEventPublisher.DataListModified(designCalculations);
}
-
- public CalculationResult Validate()
- {
- try
- {
- //Todo validation has to extended, handling the actual messages instead of just CalculationResult too.
- foreach (Dike dike in WaterBoard.Dikes)
- {
- dike.Validate();
- }
-
- return CalculationResult.Succeeded;
- }
- catch
- {
- return CalculationResult.InvalidInputData;
- }
- }
-
- public LocationJob GetLocationJob(Location location)
- {
- foreach (LocationJob locationJob in LocationJobs)
- {
- if (locationJob.Location == location)
- {
- return locationJob;
- }
- }
-
- return null;
- }
-
+
public LocationJob GetFirstLocationJobWithDesignResults()
{
foreach (LocationJob locationJob in LocationJobs)
@@ -431,7 +400,7 @@
jobs.Clear();
}
- // Delete calculationresults in scenarios
+ // Delete calculation results in scenarios
List scenarios = CreateScenarioListForDeletion();
foreach (Scenario scenario in scenarios)
{
@@ -534,8 +503,6 @@
switch (property)
{
case "SensorData": return damProjectType == DamProjectType.DamLiveConfiguration;
- case "SchematizationFactors": return false;
- //Bka: for now (release 1.4.1), do not show SchematizationFactors return this.HasResults() && this.DamProjectType == Data.DamProjectType.Assessment;
case "DesignCalculations": return HasResults() && DamProjectType == DamProjectType.Design;
case "DamProjectCalculationSpecification":
return DamProjectCalculationSpecification.DamCalculationSpecifications.Count > 0;