v1.8.4

- IP Pinger felület fejlesztése

v1.8.4
- IP Pinger felület fejlesztése
Schwirg László
1 parent 7e23fb05
Showing 4 changed files with 105 additions and 23 deletions Show diff stats
Vrh.Log4Pro.MaintenanceConsole/ConsoleFunction - ColorConsole.cs
Vrh.Log4Pro.MaintenanceConsole/Manager - MaintenanceToolManager.cs
Vrh.Log4Pro.MaintenanceConsole/Program.cs
Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
@@ -116,7 +116,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ColorConsoleNS
 		{
 			int currentLineCursor = Console.CursorTop;
 			int currentColCursor = Console.CursorLeft;
-			if (height == 0) { height = Console.WindowHeight; }
+			if (height == 0) { height = Console.WindowHeight- Console.CursorTop; }
 			for (var i=0;i<height;i++) 
 			{
 				ClearLine(width, fillchar);
@@ -113,6 +113,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.MaintenanceToolManagerNS
 			var suppresserroneousipaddresses = false;
 			while (true)
 			{
+				DisplayPingerScreenTitle();
 				DisplayPingerParameters(pingerconfigxml);
 				var cc = ColorConsole.CursorLeft;
 				var cr = ColorConsole.CursorTop;
@@ -120,7 +121,6 @@ namespace Vrh.Log4Pro.MaintenanceConsole.MaintenanceToolManagerNS
 				DisplayAllPingerStatus(pingerconfigxml, iplist, firstrun, suppresserroneousipaddresses);
 				if (!firstrun) 
 				{
-
 					DisplayPingerCommands();  
 				}
@@ -177,32 +177,78 @@ namespace Vrh.Log4Pro.MaintenanceConsole.MaintenanceToolManagerNS
 			ColorConsole.WriteLine($"Set [ip address] to 'ALL' or '*' for action to all ip addresses.", ConsoleColor.Yellow);
 		}
-		private static void DisplayPingerParameters(XElement pingerconfigxml)
+		private static string MARKQ1 = new string((char)9608, 1);
+		private static string MARKQ2 = new string((char)9619, 1);
+		private static string MARKQ3 = new string((char)9618, 1);
+		private static string MARKQ4 = new string((char)9617, 1);
+		private static ConsoleColor CEXCELLENT = ConsoleColor.DarkGreen;
+		private static ConsoleColor CGOOD = ConsoleColor.Green;
+		private static ConsoleColor CACCEPTABLE = ConsoleColor.DarkYellow;
+		private static ConsoleColor CBAD = ConsoleColor.Yellow;
+		private static ConsoleColor CFATAL = ConsoleColor.Red;
+		private static void DisplayPingerScreenTitle()
 		{
 			ColorConsole.Clear();
 			var pingertitle = "IP Pinger";
 			ColorConsole.WriteLine(ColorConsole.WideString(pingertitle), ConsoleColor.Yellow);
-			ColorConsole.WriteLine(new string('-', 2*pingertitle.Length), ConsoleColor.Yellow);
+			ColorConsole.WriteLine(new string('-', 2 * pingertitle.Length), ConsoleColor.Yellow);
+		}
+		private static void DisplayPingerParameters(XElement pingerconfigxml)
+		{
 			ColorConsole.WriteLine();
 			ColorConsole.WriteLine($"Pinger configuration parameters:", ConsoleColor.Yellow);
 			var pconfig = new Pinger("127.0.0.1", pingerconfigxml).Configuration;
-			ColorConsole.WriteLine(pconfig.pingtimeout.ToString(), ConsoleColor.Yellow, prefix: "   pingtimeout    :", suffix: "ms");
-			ColorConsole.WriteLine(pconfig.pingcyclenumofpackages.ToString(), ConsoleColor.Yellow, prefix: "   pings per cycle:", suffix: "pings");
-			ColorConsole.WriteLine((pconfig.pingcyclefrequency / 1000).ToString(), ConsoleColor.Yellow, prefix: "   cycle frequency:", suffix: "sec");
-			ColorConsole.WriteLine((pconfig.pingeractivlength / 60000).ToString(), ConsoleColor.Yellow, prefix: "   pinger liftime :", suffix: "min");
-			ColorConsole.WriteLine((pconfig.pingerhistorylength / 60000).ToString(), ConsoleColor.Yellow, prefix: "   history length :", suffix: "min");
-			ColorConsole.WriteLine((pconfig.optimizehistorylength).ToString(), ConsoleColor.Yellow, prefix: "   optimize history length :", suffix: "");
+			ColorConsole.WriteLine(pconfig.pingtimeout.ToString(), ConsoleColor.Yellow, prefix: "   pingtimeout    :", suffix: " ms");
+			ColorConsole.WriteLine(pconfig.pingcyclenumofpackages.ToString(), ConsoleColor.Yellow, prefix: "   pings per cycle:", suffix: " pings");
+			ColorConsole.WriteLine((pconfig.pingcyclefrequency / 1000).ToString(), ConsoleColor.Yellow, prefix: "   cycle frequency:", suffix: " sec");
+			ColorConsole.WriteLine((pconfig.pingeractivlength / 60000).ToString(), ConsoleColor.Yellow, prefix: "   pinger liftime :", suffix: " min");
+			
+			ColorConsole.Write((pconfig.pingerhistorylength / 60000).ToString(), ConsoleColor.Yellow, prefix: "   history length :", suffix: " min");
+			ColorConsole.Write((pconfig.optimizehistorylength).ToString(), ConsoleColor.Yellow, prefix: "   (optimized: ", suffix: ")");
+			ColorConsole.WriteLine();
+			
+			DisplayRoundTripTimeIntervalLimitsAndCategories(pconfig);
+
+			ColorConsole.WriteLine();
+			ColorConsole.WriteLine($"Pinger history color codes for roundtrip time categories and lost package categories:", ConsoleColor.Yellow);
+			ColorConsole.WriteLine(new string((char)9608, 1), CFATAL,prefix:	"   TimeOut/no answer/all packages lost      :");
+			ColorConsole.WriteLine(												"                   Roundtrip time categories:Q1 Q2 Q3 Q4", ConsoleColor.Yellow);
+			DisplayHistoryMarksForOneLostPackageCategory(pconfig, CEXCELLENT,	"   Excellent  (lost packages below 10%)     :");
+			DisplayHistoryMarksForOneLostPackageCategory(pconfig, CGOOD,		"   Good       (lost packages between 10-20%):");
+			DisplayHistoryMarksForOneLostPackageCategory(pconfig, CACCEPTABLE,	"   Acceptable (lost packages between 20-30%):");
+			DisplayHistoryMarksForOneLostPackageCategory(pconfig, CBAD,			"   Bad        (lost packages over  30%)     :");
+		}
+		private static void DisplayRoundTripTimeIntervalLimitsAndCategories(Pinger.PingerConfig pconfig)
+		{
 			var rttlstring = (string.Join(",", pconfig.RoundTripTimeLimits)).ToString();
-			ColorConsole.WriteLine(rttlstring.Substring(0, rttlstring.Length>20?20: rttlstring.Length) + (rttlstring.Length > 20 ? "..." : ""), ConsoleColor.Yellow, prefix: "   roundtrip time limit values :", suffix: "ms");
-			ColorConsole.WriteLine((string.Join(",", pconfig.RoundTripTimeyCategoryLimits)).ToString(), ConsoleColor.Yellow, prefix: "   roundtrip time category limit values:", suffix: "ms");
+			ColorConsole.WriteLine(rttlstring.Substring(0, rttlstring.Length > 40 ? 40 : rttlstring.Length) + (rttlstring.Length > 40 ? "..." : ""), ConsoleColor.Yellow, prefix: "   roundtrip time interval limit values:", suffix: " ms");
+			ColorConsole.Write("", ConsoleColor.Yellow, prefix: "   roundtrip time category limit values:");
+			ColorConsole.Write(pconfig.RoundTripTimeyCategoryLimits.ElementAt(0).ToString(), ConsoleColor.Yellow, suffix: "ms <= ");
+			ColorConsole.Write("Q1", ConsoleColor.Yellow, suffix: " < ");
+			ColorConsole.Write(pconfig.RoundTripTimeyCategoryLimits.ElementAt(1).ToString(), ConsoleColor.Yellow, suffix: "ms <= ");
+			ColorConsole.Write("Q2", ConsoleColor.Yellow, suffix: " < ");
+			ColorConsole.Write(pconfig.RoundTripTimeyCategoryLimits.ElementAt(2).ToString(), ConsoleColor.Yellow, suffix: "ms <= ");
+			ColorConsole.Write("Q3", ConsoleColor.Yellow, suffix: " < ");
+			ColorConsole.Write(pconfig.RoundTripTimeyCategoryLimits.ElementAt(3).ToString(), ConsoleColor.Yellow, suffix: "ms <= ");
+			ColorConsole.Write("Q4", ConsoleColor.Yellow, suffix: "");
+			ColorConsole.WriteLine();
+		}
+		private static void DisplayHistoryMarksForOneLostPackageCategory(Pinger.PingerConfig pconfig, ConsoleColor c, string text)
+		{
+			ColorConsole.Write("", ConsoleColor.Yellow, prefix: text);
+			ColorConsole.Write(MARKQ1, c, suffix: "  ");
+			ColorConsole.Write(MARKQ2, c, suffix: "  ");
+			ColorConsole.Write(MARKQ3, c, suffix: "  ");
+			ColorConsole.Write(MARKQ4, c, suffix: "  ");
+			ColorConsole.WriteLine();
 		}
 		private static void DisplayPingerHistory(List<Pinger> selectedpingers,int firstrow,int cc)
 		{
 			if (selectedpingers == null || !selectedpingers.Any()) { return; }
 			ColorConsole.SetCursorPosition(cc, firstrow);
-
-			ColorConsole.ClearLine();ColorConsole.WriteLine();
-			ColorConsole.ClearLine();ColorConsole.WriteLine($"Pinger History:", ConsoleColor.Yellow);
+			ColorConsole.ClearArea(0, selectedpingers.Count+ 10);
+			ColorConsole.WriteLine();
+			ColorConsole.WriteLine($"Pinger History:", ConsoleColor.Yellow);
 			var cursorleftposition = ColorConsole.CursorLeft;
 			var cursortopposition = ColorConsole.CursorTop;
 			while (true)
@@ -213,8 +259,8 @@ namespace Vrh.Log4Pro.MaintenanceConsole.MaintenanceToolManagerNS
 				foreach (var pinger in selectedpingers) { pingcyclefrequency=DisplayOnePingerHistory(pinger); if (ColorConsole.KeyAvailable) { goto finishdisplayhistory; };}
 				var elapsed = DateTime.Now.Subtract(monitorcyclestart).TotalMilliseconds;
 				if (elapsed < pingcyclefrequency) { Thread.Sleep((int)((double)pingcyclefrequency - elapsed)); }
-				ColorConsole.ClearLine(); ColorConsole.WriteLine();
-				ColorConsole.ClearLine(); ColorConsole.WriteLine($"Press any key to exit from monitoring...", ConsoleColor.Yellow);
+				ColorConsole.WriteLine();
+				ColorConsole.WriteLine($"Press any key to exit from monitoring...", ConsoleColor.Yellow);
 			}
 		finishdisplayhistory:;
 		}
@@ -249,10 +295,14 @@ namespace Vrh.Log4Pro.MaintenanceConsole.MaintenanceToolManagerNS
 			return h.PingCycleFrequency;
 		}
 		private static string GetPingCycleDisplayCharacter(Pinger.PingCycle he) 
-		{ 
-			return he.StatusCategory != Pinger.PingCycle.IPStatusCategory.Success 
-				? "9" 
-				: he.RoundtripTimeCategory.ToString().Substring(1); 
+		{
+			return he.StatusCategory != Pinger.PingCycle.IPStatusCategory.Success
+				? MARKQ1 //"9" 
+				: he.RoundtripTimeCategory == Pinger.PingCycle.RoundTripTimeCategory.Q1 ? MARKQ1
+				: he.RoundtripTimeCategory == Pinger.PingCycle.RoundTripTimeCategory.Q2 ? MARKQ2
+				: he.RoundtripTimeCategory == Pinger.PingCycle.RoundTripTimeCategory.Q3 ? MARKQ3
+				: he.RoundtripTimeCategory == Pinger.PingCycle.RoundTripTimeCategory.Q4 ? MARKQ4
+				: "";
 		}
 		private static ConsoleColor GetPingCycleDisplayColor(Pinger.PingCycle pingcycle)
 		{
@@ -35,6 +35,38 @@ namespace Vrh.Log4Pro.MaintenanceConsole
 	{
 		static void Main(string[] args)
 		{
+			//while (true)
+			//{
+			//	Console.Clear();
+			//	Console.Write("Enter string:"); var cp1 = Console.ReadLine();
+			//	Console.WriteLine();
+			//	Console.ForegroundColor = ConsoleColor.Red;
+			//	Console.Write(cp1); foreach (char c in cp1) { Console.Write(c); Console.Write(" => "); var i = (int)c; Console.Write(i); Console.Write(" => "); Console.Write((char)i); Console.WriteLine(); }
+			//	Console.ForegroundColor = ConsoleColor.DarkGreen;
+			//	Console.Write(cp1); foreach (char c in cp1) { Console.Write(c); Console.Write(" => "); var i = (int)c; Console.Write(i); Console.Write(" => "); Console.Write((char)i); Console.WriteLine(); }
+			//	Console.ForegroundColor = ConsoleColor.Green;
+			//	Console.Write(cp1); foreach (char c in cp1) { Console.Write(c); Console.Write(" => "); var i = (int)c; Console.Write(i); Console.Write(" => "); Console.Write((char)i); Console.WriteLine(); }
+			//	Console.ForegroundColor = ConsoleColor.DarkYellow;
+			//	Console.Write(cp1); foreach (char c in cp1) { Console.Write(c); Console.Write(" => "); var i = (int)c; Console.Write(i); Console.Write(" => "); Console.Write((char)i); Console.WriteLine(); }
+			//	Console.ForegroundColor = ConsoleColor.Yellow;
+			//	Console.Write(cp1); foreach (char c in cp1) { Console.Write(c); Console.Write(" => "); var i = (int)c; Console.Write(i); Console.Write(" => "); Console.Write((char)i); Console.WriteLine(); }
+			//	Console.ReadKey();
+			//	Console.Clear();
+			//	Console.Write("Enter Code page:"); var cp = Console.ReadLine();
+			//	try
+			//	{
+			//		Console.OutputEncoding = System.Text.Encoding.GetEncoding(int.Parse(cp));
+			//		for (int i = 0; i < 256; i++)
+			//		{
+			//			Console.Write((i).ToString().PadLeft(3) + "=> [" + (char)(i) + "]     ");
+			//			if (i % 6 == 5) { Console.WriteLine(); }
+			//			//Console.Write((char)(i*j));
+			//		}
+			//	}
+			//	catch { Console.WriteLine("Code page is not supported!"); }
+			//	Console.ReadKey();
+			//}
+
 			var forcedmodulekey = CommandLine.GetCommandLineArgument(args, CLP.CMD_MODULE);
 			var commandmode = !string.IsNullOrEmpty(forcedmodulekey);
 			var silentmode = commandmode && !string.IsNullOrEmpty(CommandLine.GetCommandLineArgument(args, CLP.CMD_SILENT, switchtype: true));
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.8.3.0")]
-[assembly: AssemblyFileVersion("1.8.3.0")]
+[assembly: AssemblyVersion("1.8.4.0")]
+[assembly: AssemblyFileVersion("1.8.4.0")]