aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-07-10 15:24:06 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-07-10 15:24:06 +0300
commit5d795170b304199383ac967583830acaf313ff05 (patch)
treef8888b3ae72410a02a4b7361c235540138950ac8 /Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation
parent9244c34a40d572f071cdf1c00ad6428132e1ab5c (diff)
downloadTango-5d795170b304199383ac967583830acaf313ff05.tar.gz
Tango-5d795170b304199383ac967583830acaf313ff05.zip
Some work on PPC.
Implemented retrieval of column description for auto generated observables & pmr's.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation')
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs2
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationResultProvider.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs
index dd2872fd5..2dba3a60b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs
@@ -72,7 +72,7 @@ namespace Tango.PPC.Common.Navigation
/// The view must be of type INavigationResultProvider<TResult>.
/// </summary>
/// <param name="fullPath">The full path.</param>
- Task<TResult> NavigateForResult<TModule, TView, TResult, TObject>(TObject obj, bool pushToHistory = true)
+ Task<TResult> NavigateForResult<TModule, TView, TResult, TPass>(TPass obj, bool pushToHistory = true)
where TModule : IPPCModule;
}
}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationResultProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationResultProvider.cs
index 71bdc01e0..ddac80620 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationResultProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationResultProvider.cs
@@ -6,10 +6,10 @@ using System.Threading.Tasks;
namespace Tango.PPC.Common.Navigation
{
- public interface INavigationResultProvider<TResult, TObject>
+ public interface INavigationResultProvider<TResult, TPass>
{
TResult GetNavigationResult();
- void OnNavigationObjectReceived(TObject obj);
+ void OnNavigationObjectReceived(TPass obj);
}
}