Index: dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
===================================================================
diff -u -r337 -r343
--- dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 337)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 343)
@@ -156,6 +156,7 @@
+
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/InterfaceException.cs
===================================================================
diff -u -r312 -r343
--- dam engine/trunk/src/Deltares.DamEngine.Interface/InterfaceException.cs (.../InterfaceException.cs) (revision 312)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/InterfaceException.cs (.../InterfaceException.cs) (revision 343)
@@ -1,13 +1,17 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Deltares.DamEngine.Interface
{
+ ///
+ /// Excpetion class for the Interface
+ ///
+ ///
public class InterfaceException: Exception
{
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The message that describes the error.
public InterfaceException(string message) : base(message) { }
}
}
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/Interface.cs
===================================================================
diff -u -r312 -r343
--- dam engine/trunk/src/Deltares.DamEngine.Interface/Interface.cs (.../Interface.cs) (revision 312)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/Interface.cs (.../Interface.cs) (revision 343)
@@ -1,13 +1,13 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Deltares.DamEngine.Data.Standard;
namespace Deltares.DamEngine.Interface
{
public class Interface
{
+ private ProgressDelegate progressDelegate;
+ private SendMessageDelegate sendMessageDelegate;
+ private UserAbortDelegate userAbortDelegate;
///
/// Initializes a new instance of the class.
///
@@ -20,6 +20,42 @@
}
}
+ private ProgressDelegate ProgressDelegate
+ {
+ get
+ {
+ return progressDelegate;
+ }
+ set
+ {
+ progressDelegate = value;
+ }
+ }
+
+ private SendMessageDelegate SendMessageDelegate
+ {
+ get
+ {
+ return sendMessageDelegate;
+ }
+ set
+ {
+ sendMessageDelegate = value;
+ }
+ }
+
+ private UserAbortDelegate UserAbortDelegate
+ {
+ get
+ {
+ return userAbortDelegate;
+ }
+ set
+ {
+ userAbortDelegate = value;
+ }
+ }
+
///
/// Validates the model.
///
@@ -37,5 +73,36 @@
{
return null;
}
+
+ ///
+ /// Registers the progress delegate.
+ ///
+ /// The progress delegate.
+ ///
+ public Boolean RegisterProgress(ProgressDelegate progressDelegate)
+ {
+ ProgressDelegate = progressDelegate;
+ return true;
+ }
+ ///
+ /// Registers the send message delegate (for log messages).
+ ///
+ /// The send message delegate.
+ ///
+ public Boolean RegisterSendMessage(SendMessageDelegate sendMessageDelegate)
+ {
+ SendMessageDelegate = sendMessageDelegate;
+ return true;
+ }
+ ///
+ /// Registers the user abort delegate.
+ ///
+ /// The user abort delegate.
+ ///
+ public Boolean RegisterUserAbort(UserAbortDelegate userAbortDelegate)
+ {
+ UserAbortDelegate = userAbortDelegate;
+ return true;
+ }
}
}
Index: dam engine/trunk/src/Deltares.DamEngine.Data/Standard/Delegates.cs
===================================================================
diff -u
--- dam engine/trunk/src/Deltares.DamEngine.Data/Standard/Delegates.cs (revision 0)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/Standard/Delegates.cs (revision 343)
@@ -0,0 +1,22 @@
+using Deltares.DamEngine.Data.Standard.Logging;
+
+namespace Deltares.DamEngine.Data.Standard
+{
+ ///
+ /// Sends the current progress status
+ ///
+ /// The progress; this is a number between 0 and 1.
+ public delegate void ProgressDelegate(double progress);
+
+ ///
+ /// Sends log message
+ ///
+ /// The log message.
+ public delegate void SendMessageDelegate(LogMessage logMessage);
+
+ ///
+ /// Check if an user abort is requeste
+ ///
+ /// true if user requested an abort; else false
+ public delegate bool UserAbortDelegate();
+}
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/Deltares.DamEngine.Interface.csproj
===================================================================
diff -u -r312 -r343
--- dam engine/trunk/src/Deltares.DamEngine.Interface/Deltares.DamEngine.Interface.csproj (.../Deltares.DamEngine.Interface.csproj) (revision 312)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/Deltares.DamEngine.Interface.csproj (.../Deltares.DamEngine.Interface.csproj) (revision 343)
@@ -51,12 +51,6 @@
-
-
-
-
-
-
@@ -69,6 +63,12 @@
+
+
+ {b7a49c1a-1c91-4d72-aba9-9fbac2509d8e}
+ Deltares.DamEngine.Data
+
+
"$(ProjectDir)..\..\utils\svn_insert_version.cmd" "$(ProjectDir)Properties"