CommServer.DA.Server - create installation package - working on ProtocolHub.MonitorInterface - refactoring

- changed namespaces to meet common rules
- changed version - updated log files
Issue #: 4862

Author: Mariusz

ProtocolHub.Communication/Properties/AssemblyInfo.cs

@@ -28,8 +28,8 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("11b3c9ce-9001-4aaa-bab1-407e3d74dc50")]
-[assembly: AssemblyVersion("4.00.24.*")]
-[assembly: AssemblyFileVersion("4.00.24")]
+[assembly: AssemblyVersion("4.01.0.*")]
+[assembly: AssemblyFileVersion("4.01.0")]
 [assembly: CAS.Lib.CodeProtect.AssemblyKey( "2D0C30B3-ED45-4292-8CB3-ADB0E739E03E" )]
 [assembly: NeutralResourcesLanguageAttribute( "en-US" )]
 [assembly: CAS.Lib.CodeProtect.AssemblyHelper

ProtocolHub.Communication/ProtocolHub.Communication.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>CAS.CommServer.ProtocolHub.Communication</id>
-    <version>4.00.24</version>
+    <version>4.01.0</version>
     <title>Redundant, multi-protocol, multi-channel communication hub for large scale distributed systems.</title>
     <authors>CAS</authors>
     <owners>commsvr.com</owners>

ProtocolHub.CommunicationUnitTests/Properties/AssemblyInfo.cs

@@ -27,6 +27,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid( "4bdff8b4-038c-44e4-a1c2-6191ba0c591d" )]
-[assembly: AssemblyVersion("4.00.24.*")]
-[assembly: AssemblyFileVersion("4.00.24")]
+[assembly: AssemblyVersion("4.01.0.*")]
+[assembly: AssemblyFileVersion("4.01.0")]
 

ProtocolHub.GraphGUI/Properties/AssemblyInfo.cs

@@ -27,6 +27,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: Guid("18d193f3-7b85-4c46-8571-d607882cf969")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("4.00.24.*")]
-[assembly: AssemblyFileVersion("4.00.24")]
+[assembly: AssemblyVersion("4.01.0.*")]
+[assembly: AssemblyFileVersion("4.01.0")]
 

ProtocolHub.Monitor/Properties/AssemblyInfo.cs

@@ -27,6 +27,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid( "f185cedf-d0b6-4762-9d27-385764dff679" )]
-[assembly: AssemblyVersion("4.00.24.*")]
-[assembly: AssemblyFileVersion("4.00.24")]
+[assembly: AssemblyVersion("4.01.0.*")]
+[assembly: AssemblyFileVersion("4.01.0")]
 

ProtocolHub.MonitorInterface/BaseStation/Management/Statistics.InterfaceStatistics.cs

@@ -13,11 +13,10 @@
 //  http://www.cas.eu
 //_______________________________________________________________
 
-using CAS.Lib.CommServerConsoleInterface;
 using CAS.Lib.RTLib.Management;
 using System;
 
-namespace BaseStation.Management
+namespace CAS.CommServer.ProtocolHub.MonitorInterface
 {
   /// <summary>
   /// Communication statistics management class
@@ -428,22 +427,22 @@ public InterfaceStatistics(string name, ulong interfaceNumber, IInterface2Segmen
       /// <summary>
       /// variable resposible for row color changing
       /// </summary>
-      private static bool changecolor = true;
+      private static bool changeColor = true;
       /// <summary>
       /// returns row color class
       /// </summary>
       private string RowClass
       {
         get
         {
-          changecolor = !changecolor;
-          if (changecolor)
+          changeColor = !changeColor;
+          if (changeColor)
             return "k41";
           return "k4";
         }
       }
       /// <summary>
-      /// this function is for retreiving description fot this object in the HTML
+      /// this function is for retrieving description fot this object in the HTML
       /// </summary>
       /// <returns>string with HTML output</returns>
       public string GetHtmlTableRowDescription()
@@ -476,7 +475,7 @@ public string ToHtmlTableRow()
         return ret;
       }
       /// <summary>
-      /// this function is for retreiving data that represens that object (data + description)
+      /// this function is for retrieving data that represents that object (data + description)
       /// </summary>
       /// <returns>string with HTML data</returns>
       public string ToHtml()

ProtocolHub.MonitorInterface/BaseStation/Management/Statistics.SegmentStatistics.cs

@@ -13,15 +13,16 @@
 //  http://www.cas.eu
 //_______________________________________________________________
 
-using CAS.Lib.CommServerConsoleInterface;
-using CAS.Lib.CommServerConsoleInterface.Properties;
+using CAS.CommServer.ProtocolHub.MonitorInterface.Properties;
 using CAS.Lib.RTLib.Management;
+using CAS.Lib.RTLib.Processes;
 using CAS.Lib.RTLib.Utils;
 using System;
+using System.Collections;
 using System.Text;
 using CommunicationDSC = CAS.NetworkConfigLib.ComunicationNet;
 
-namespace BaseStation.Management
+namespace CAS.CommServer.ProtocolHub.MonitorInterface
 {
 
   /// <summary>
@@ -39,16 +40,16 @@ public abstract class SegmentStatistics: Metronom.RefreshAble, IHtmlOutput, ISeg
 
       #region PRIVATE
       private readonly DateTime startTime = DateTime.Now;
-      private System.Collections.ArrayList interfaceList = new System.Collections.ArrayList();
+      private ArrayList interfaceList = new ArrayList();
       private ChannelStatistics myChannel;
-      private CAS.Lib.RTLib.Processes.Stopwatch SW_WriteDelay = new CAS.Lib.RTLib.Processes.Stopwatch();
-      private CAS.Lib.RTLib.Processes.Stopwatch SW_ReadDelay = new CAS.Lib.RTLib.Processes.Stopwatch();
-      private CAS.Lib.RTLib.Processes.Stopwatch SW_ConnectTime = new CAS.Lib.RTLib.Processes.Stopwatch();
+      private Stopwatch SW_WriteDelay = new Stopwatch();
+      private Stopwatch SW_ReadDelay = new Stopwatch();
+      private Stopwatch SW_ConnectTime = new Stopwatch();
       //this region is used for updating OPC tags
       /// <summary>
       /// connect time
       /// </summary>
-      private CAS.Lib.RTLib.Processes.Stopwatch connectTime = new CAS.Lib.RTLib.Processes.Stopwatch();
+      private Stopwatch connectTime = new Stopwatch();
       /// <summary>
       /// MinMaxAvr Read Delay
       /// </summary>
@@ -143,8 +144,8 @@ public States NewStateUpdateStatistics
               myStat.ConnMadeCount++;
               voidV = SW_ReadDelay.Stop;
               voidV = SW_WriteDelay.Stop;
-              mmaReadDelay.Add = (long)CAS.Lib.RTLib.Processes.Stopwatch.ConvertTo_ms( SW_ReadDelay.Reset );
-              mmaWriteDelay.Add = (long)CAS.Lib.RTLib.Processes.Stopwatch.ConvertTo_ms( SW_WriteDelay.Reset );
+              mmaReadDelay.Add = (long)Stopwatch.ConvertTo_ms( SW_ReadDelay.Reset );
+              mmaWriteDelay.Add = (long)Stopwatch.ConvertTo_ms( SW_WriteDelay.Reset );
               voidV = connectTime.Start;
               SW_ConnectTime.StartReset();
               break;
@@ -507,10 +508,10 @@ void IInterface2SegmentLink.GetProtocolStatistics( ref uint[] counters, out bool
       /// <summary>
       /// Adds the interface.
       /// </summary>
-      /// <param name="intr">The intr.</param>
-      void IInterface2SegmentLink.AddInterface( InterfaceStatistics intr )
+      /// <param name="interfaceStatistics">An object encapsulating interface statistic.</param>
+      void IInterface2SegmentLink.AddInterface( InterfaceStatistics interfaceStatistics)
       {
-        interfaceList.Add( intr );
+        interfaceList.Add(interfaceStatistics);
       }
       /// <summary>
       /// Gets the get OPC prefix.
@@ -520,7 +521,7 @@ void IInterface2SegmentLink.AddInterface( InterfaceStatistics intr )
       #endregion
       #region HMI
       /// <summary>
-      /// Dalegate that is used when state is changed
+      /// Delegate that is used when state is changed
       /// </summary>
       public delegate void StateChanged( States currState );
       /// <summary>
@@ -535,7 +536,7 @@ public ulong ConnectTime
       {
         get
         {
-          myStat.ConnectTime = CAS.Lib.RTLib.Processes.Stopwatch.ConvertTo_s( connectTime.Read );
+          myStat.ConnectTime = Stopwatch.ConvertTo_s( connectTime.Read );
           return myStat.ConnectTime;
         }
       }
@@ -585,9 +586,9 @@ public bool Connected
         get { return myStat.Connected; }
       }
       /// <summary>
-      /// Gets the get made (successfull connections) count.
+      /// Gets the get made (successful connections) count.
       /// </summary>
-      /// <value>The get made(successfull connections)  count.</value>
+      /// <value>The get made(successful connections)  count.</value>
       public string GetMadeCount
       {
         get { return myStat.GetMadeCount; }
@@ -611,6 +612,7 @@ public string GetOvertimeCoefficient
           return myStat.GetOvertimeCoefficient;
         }
       }
+
       #region MinMaxAvgReaders
       //WriteDelay
       /// <summary>
@@ -736,6 +738,7 @@ void ISegmentStatistics.SetOvertimeCoefficient( long min, long max, long avr )
         myStat.SetOvertimeCoefficient( min, max, avr );
       }
       #endregion
+
       #region creator
       /// <summary>
       /// Initializes a new instance of the <see cref="SegmentStatistics"/> class.
@@ -765,6 +768,7 @@ public SegmentStatistics( CommunicationDSC.SegmentsRow currDsc, ChannelStatistic
       }
 
       #endregion
+      
       #endregion PUBLIC
 
       #region IHtmlOutput Members

ProtocolHub.MonitorInterface/BaseStation/Management/Statistics.cs

@@ -17,9 +17,10 @@
 using CAS.Lib.RTLib.Management;
 using CAS.Lib.RTLib.Processes;
 using System;
+using System.Threading;
 using CommunicationDSC = CAS.NetworkConfigLib.ComunicationNet;
 
-namespace BaseStation.Management
+namespace CAS.CommServer.ProtocolHub.MonitorInterface
 {
   /// <summary>
   /// class that allows logging from statistics related classes - source "CAS.BaseStation.Management.Statistics"
@@ -105,7 +106,7 @@ static Metronom()
         new System.Threading.ThreadStart( MonitoringMet ),
         "Metronom",
         true,
-        System.Threading.ThreadPriority.Normal
+        ThreadPriority.Normal
         );
     }
     #endregion

ProtocolHub.MonitorInterface/IInterface2SegmentLink.cs

@@ -7,37 +7,39 @@
 //  $LastChangedBy$
 //  $URL$
 //  $Id$
-//  History :
-//    MPostol: created
+
 //
 //  Copyright (C)2006, CAS LODZ POLAND.
 //  TEL: +48 (42) 686 25 47
 //  mailto:techsupp@cas.com.pl
 //  http:\\www.cas.eu
 //</summary>
-using System;
-namespace CAS.Lib.CommServerConsoleInterface
+
+namespace CAS.CommServer.ProtocolHub.MonitorInterface
 {
+
   /// <summary>
   /// Interlink between the Interface and Segment statistic object
   /// </summary>
   public interface IInterface2SegmentLink
   {
+
     /// <summary>
     /// Adds the interface.
     /// </summary>
-    /// <param name="iNtrerface">The intrerface.</param>
-    void AddInterface( BaseStation.Management.Statistics.InterfaceStatistics iNtrerface );
+    /// <param name="interfaceStatistics">The interface statistics.</param>
+    void AddInterface(Statistics.InterfaceStatistics interfaceStatistics);
     /// <summary>
     /// Gets the protocol statistics.
     /// </summary>
     /// <param name="counters">The counters.</param>
     /// <param name="isAnySuccess">if set to <c>true</c> means any success.</param>
-    void GetProtocolStatistics( ref uint[] counters, out bool isAnySuccess );
+    void GetProtocolStatistics(ref uint[] counters, out bool isAnySuccess);
     /// <summary>
     /// Gets the get OPC prefix.
     /// </summary>
     /// <value>The get OPC prefix.</value>
-    string GetOPCPrefix { get;}
+    string GetOPCPrefix { get; }
+
   }
 }

ProtocolHub.MonitorInterface/ISegmentStatistics.cs

@@ -1,27 +1,27 @@
-//<summary>
-//  Title   : Interface of the Segment Statistics
-//  System  : Microsoft Visual C# .NET 2005
+//_______________________________________________________________
+//  Title   : ISegmentStatistics
+//  System  : Microsoft VisualStudio 2015 / C#
 //  $LastChangedDate$
 //  $Rev$
 //  $LastChangedBy$
 //  $URL$
 //  $Id$
-//  History :
-//    MPostol creatyed 
 //
-//  Copyright (C)2006, CAS LODZ POLAND.
-//  TEL: +48 (42) 686 25 47
-//  mailto:techsupp@cas.com.pl
-//  http:\\www.cas.eu
-//</summary>
-using System;
-namespace CAS.Lib.CommServerConsoleInterface
+//  Copyright (C) 2017, CAS LODZ POLAND.
+//  TEL: +48 608 61 98 99 
+//  mailto://techsupp@cas.eu
+//  http://www.cas.eu
+//_______________________________________________________________
+
+namespace CAS.CommServer.ProtocolHub.MonitorInterface
 {
+
   /// <summary>
   /// Interface of the Segment Statistics
   /// </summary>
   public interface ISegmentStatistics: IInterface2SegmentLink
   {
+    
     /// <summary>
     /// Marks the Segment connection failure.
     /// </summary>
@@ -30,13 +30,14 @@ public interface ISegmentStatistics: IInterface2SegmentLink
     /// Sets the new state.
     /// </summary>
     /// <value>The new state.</value>
-    BaseStation.Management.Statistics.SegmentStatistics.States NewState { set; }
+    Statistics.SegmentStatistics.States NewState { set; }
     /// <summary>
     /// Sets the overtime coefficients.
     /// </summary>
     /// <param name="min">The min. value</param>
     /// <param name="max">The max. value</param>
     /// <param name="avr">The average value</param>
     void SetOvertimeCoefficient( long min, long max, long avr );
+
   }
 }