From 7332bc2a716d1485ab82e5d0040518507177721b Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 21 Jul 2017 16:40:25 +0300 Subject: [PATCH] RRoute displayed in the status bar, ver. 2.14.617 --- .../BenchControl/Elde/ControlComWrap.cs | 13 ++++++++++++- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs index 45dce8206..c93a14868 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs @@ -348,7 +348,18 @@ namespace TBF.BenchControl.Elde UInt128 bufferedRoute = route; if (lastRoute != bufferedRoute) { - string routeStr = bufferedRoute.ToString("x24"); + UInt128 rRoute = RRoute; + string routeStr = string.Format("{0}-{1}-{2}-{3}-{4} ({5}-{6}-{7}-{8}-{9})", + ((bufferedRoute >> 64) & 0xFFFF).ToString("X4"), + ((bufferedRoute >> 48) & 0xFFFF).ToString("X4"), + ((bufferedRoute >> 32) & 0xFFFF).ToString("X4"), + ((bufferedRoute >> 16) & 0xFFFF).ToString("X4"), + (bufferedRoute & 0xFFFF).ToString("X4"), + ((rRoute >> 64) & 0xFFFF).ToString("X4"), + ((rRoute >> 48) & 0xFFFF).ToString("X4"), + ((rRoute >> 32) & 0xFFFF).ToString("X4"), + ((rRoute >> 16) & 0xFFFF).ToString("X4"), + (rRoute & 0xFFFF).ToString("X4")); log.InfoFormat("DoSendCommand() Route = {0}", routeStr); Program.MainWnd.UpdateRoute(routeStr); lastRoute = bufferedRoute; diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index e2380e9a5..4e6967a34 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.14.616.1")] -[assembly: AssemblyFileVersion("2.14.616.1")] +[assembly: AssemblyVersion("2.14.617.1")] +[assembly: AssemblyFileVersion("2.14.617.1")]