Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/Validator.cs
===================================================================
diff -u -r2089 -r2292
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/Validator.cs (.../Validator.cs) (revision 2089)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/Validator.cs (.../Validator.cs) (revision 2292)
@@ -20,6 +20,7 @@
// All rights reserved.
using System.Collections.Generic;
+using Deltares.Dam.Data.Specifications;
using Deltares.Standard.Specifications.Extensions;
namespace Deltares.Standard.Specifications
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs
===================================================================
diff -u -r2271 -r2292
--- DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs (.../DamContext.cs) (revision 2271)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs (.../DamContext.cs) (revision 2292)
@@ -20,12 +20,16 @@
// All rights reserved.
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Deltares.Dam.Data;
+using Deltares.DamEngine.Data.Standard.Validation;
using Deltares.Geotechnics;
using Deltares.Geotechnics.Soils;
using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Standard;
+using Deltares.Standard.Forms;
using Deltares.Standard.Forms.DExpress;
using Deltares.Standard.Reflection;
@@ -122,6 +126,14 @@
return null;
}
+ ///
+ /// Method indicating a visibility override value for a given instance object.
+ ///
+ /// Object being evaluated.
+ /// Name of the member which is part of .
+ ///
+ /// True if visible; False if hidden; Null if no override.
+ ///
public override bool? IsVisible(object source, string member)
{
var locationScenariosControl = source as LocationScenariosControl;
@@ -159,9 +171,24 @@
return false;
}
}
+
+ if (source is VisualValidationResult)
+ {
+ // Make sure that for DAM, all repairers are not used.
+ var vr = (VisualValidationResult) source;
+ vr.Repairer = null;
+ }
return base.IsVisible(source, member);
}
+ ///
+ /// Method indicating if the enabled override value for a given instance object.
+ ///
+ /// Object being evaluated.
+ /// Name of the member which is part of .
+ ///
+ /// True if enabled; False if disabled; Null if no override.
+ ///
public override bool? IsEnabled(object source, string member)
{
// Make sure CharacteristicPoints can not be edited for now.
@@ -181,6 +208,44 @@
return false;
}
return base.IsEnabled(source, member);
- }
+ }
+
+ ///
+ /// Returns a collection of allowed values for a property as part of the IDomain interface.
+ /// This is used for populating drop down values in a drop down list.
+ /// Note that this isn’t necessary when the property is defined as an enumeration.
+ /// All enumeration values are used by default.
+ ///
+ /// The name of the property for which to return the possible values.
+ ///
+ /// A containing the possible values for the given property.
+ ///
+ public override ICollection GetDomain(string property)
+ {
+ if (property == "CharacteristicPointType")
+ {
+ return new List
+ {
+ CharacteristicPointType.SurfaceLevelOutside,
+ CharacteristicPointType.DikeToeAtRiver,
+ CharacteristicPointType.ShoulderTopOutside,
+ CharacteristicPointType.ShoulderBaseOutside,
+ CharacteristicPointType.DikeTopAtRiver,
+ CharacteristicPointType.TrafficLoadOutside,
+ CharacteristicPointType.TrafficLoadInside,
+ CharacteristicPointType.DikeTopAtPolder,
+ CharacteristicPointType.ShoulderBaseInside,
+ CharacteristicPointType.ShoulderTopInside,
+ CharacteristicPointType.DikeToeAtPolder,
+ CharacteristicPointType.DitchDikeSide,
+ CharacteristicPointType.BottomDitchDikeSide,
+ CharacteristicPointType.BottomDitchPolderSide,
+ CharacteristicPointType.DitchPolderSide,
+ CharacteristicPointType.SurfaceLevelInside,
+ CharacteristicPointType.None,
+ };
+ }
+ return base.GetDomain(property);
+ }
}
}
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Group.cs
===================================================================
diff -u -r2089 -r2292
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Group.cs (.../Group.cs) (revision 2089)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Group.cs (.../Group.cs) (revision 2292)
@@ -27,7 +27,7 @@
using Deltares.Standard.Attributes;
using Deltares.Standard.EventPublisher;
using Deltares.Standard.IO.Xml;
-using ValidationResult = Deltares.Standard.Specifications.ValidationResult;
+using ValidationResult = Deltares.Dam.Data.Specifications.ValidationResult;
using Validator = Deltares.Standard.Specifications.Validator;
using XmlSerializer = Deltares.Standard.IO.Xml.XmlSerializer;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/Extensions/SpecificationExtensions.cs
===================================================================
diff -u -r2089 -r2292
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/Extensions/SpecificationExtensions.cs (.../SpecificationExtensions.cs) (revision 2089)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/Extensions/SpecificationExtensions.cs (.../SpecificationExtensions.cs) (revision 2292)
@@ -24,6 +24,7 @@
using System.Linq;
using System.Reflection;
using Deltares.Standard.Validation;
+using ValidationResult = Deltares.Dam.Data.Specifications.ValidationResult;
namespace Deltares.Standard.Specifications.Extensions
{
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ValidationResult.cs
===================================================================
diff -u -r2089 -r2292
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ValidationResult.cs (.../ValidationResult.cs) (revision 2089)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ValidationResult.cs (.../ValidationResult.cs) (revision 2292)
@@ -25,7 +25,7 @@
using Deltares.Standard.EventPublisher;
using Deltares.Standard.Validation;
-namespace Deltares.Standard.Specifications
+namespace Deltares.Dam.Data.Specifications
{
public class ValidationResult : IValidationResult
{
@@ -45,8 +45,12 @@
public object Subject { get; set; }
public List ID { get { return new List(); } }
- public IRepairer Repairer { get; private set; }
+ public IRepairer Repairer
+ {
+ get; set;
+ }
+
public void Select()
{
DataEventPublisher.SelectionChanged(Subject);