Merge pull request #42 from experdb/development

[#32,#33,#34,#35,#36,#37,#38,#39,#40,#41]

eXperDB_Monitoring_Client/iDast.Controls/Raider/Raider.vb

@@ -32,6 +32,23 @@ Public Class Raider
     End Property
 #End Region
 
+#Region "DisplayID"
+    Private _DisplayID As Integer = 0
+
+    <Category("DisplayID")> _
+    Property DisplayID As Integer
+        Get
+            Return _DisplayID
+        End Get
+        Set(value As Integer)
+            If Not _DisplayID.Equals(value) Then
+                _DisplayID = value
+                Me.Invalidate()
+            End If
+        End Set
+    End Property
+#End Region
+
 #Region "Initialize"
 
     Public Sub New()
@@ -482,13 +499,14 @@ Public Class Raider
 
             'Dim txtPt As New Point(BaseRect.Left + BaseRect.Width / 2, BaseRect.Top + BaseRect.Height * 1 / 5)
             'Dim txtPt As New Point(BaseRect.Left + BaseRect.Width / 2, BaseRect.Top + BaseRect.Height * 1 / 9)
+            Dim imgPt As New Point(BaseRect.Left + BaseRect.Width / 2, BaseRect.Top + BaseRect.Height / 24)
             Dim txtPt As Point
             If i = 0 Then
-                txtPt = New Point(BaseRect.Left + BaseRect.Width / 2, BaseRect.Top + BaseRect.Height * 1 / 24)
+                txtPt = New Point(BaseRect.Left + BaseRect.Width / 3, BaseRect.Top + BaseRect.Height * 1 / 24)
             ElseIf i = (RaiderItems.Count / 2 - 1) Then
-                txtPt = New Point(BaseRect.Left + BaseRect.Width / 2, BaseRect.Top + BaseRect.Height * 1 / 8)
+                txtPt = New Point(BaseRect.Left + BaseRect.Width / 3, BaseRect.Top + BaseRect.Height * 1 / 8)
             Else
-                txtPt = New Point(BaseRect.Left + BaseRect.Width / 2, BaseRect.Top + BaseRect.Height * 1 / 12)
+                txtPt = New Point(BaseRect.Left + BaseRect.Width / 3, BaseRect.Top + BaseRect.Height * 1 / 12)
             End If
             Dim CentPt As New Point(BaseRect.Left + BaseRect.Width / 2, BaseRect.Top + BaseRect.Height / 2)
             pGr.DrawRectangle(New Pen(Brushes.Green), New Rectangle(CentPt.X, CentPt.Y, 2, 2))
@@ -497,8 +515,19 @@ Public Class Raider
             txtPt = New Point(dblCos * (txtPt.X - CentPt.X) - dblSin * (txtPt.Y - CentPt.Y) + CentPt.X, _
                                     dblSin * (txtPt.X - CentPt.X) + dblCos * (txtPt.Y - CentPt.Y) + CentPt.Y)
             txtPt.Offset(-1 * (pGr.MeasureString(ptItm.Text, MyBase.Font).Width) / 2, 0)
+            imgPt = New Point(dblCos * (imgPt.X - CentPt.X) - dblSin * (imgPt.Y - CentPt.Y) + CentPt.X - ptItm.Image.Width / 2, _
+                                    dblSin * (imgPt.X - CentPt.X) + dblCos * (imgPt.Y - CentPt.Y) + CentPt.Y - ptItm.Image.Height / 2)
 
-            pGr.DrawString(ptItm.Text, MyBase.Font, New SolidBrush(MyBase.ForeColor), txtPt)
+            'pGr.DrawString(ptItm.Text, MyBase.Font, New SolidBrush(MyBase.ForeColor), txtPt)
+            If DisplayID Then
+                If ptItm.Image IsNot Nothing Then
+                    pGr.DrawImage(ptItm.Image, imgPt)
+                Else
+                    pGr.DrawString(ptItm.Text, MyBase.Font, New SolidBrush(MyBase.ForeColor), txtPt)
+                End If
+            Else
+                pGr.DrawString(ptItm.Text, MyBase.Font, New SolidBrush(MyBase.ForeColor), txtPt)
+            End If
         Next
     End Sub
 

eXperDB_Monitoring_Client/iDast.Controls/Raider/Raideritem.vb

@@ -131,6 +131,20 @@ Public Class RaiderItem
         End Set
     End Property
 
+    Private _Image As Image = Nothing
+    Property Image As Image
+        Get
+            Return _Image
+        End Get
+        Set(value As Image)
+            If _Image Is Nothing Then
+                _Image = value
+                If Me._parent IsNot Nothing Then Me._parent.Invalidate()
+            End If
+
+        End Set
+    End Property
+
     Private _Name As String = Nothing
 
     Property Name As String

eXperDB_Monitoring_Client/iDast.Controls/Raider/itemsCollection.vb

@@ -35,6 +35,17 @@
         Return NewRaideritem
     End Function
 
+    Public Function Add(ByVal Name As String, ByVal Text As String, ByVal Image As Image) As RaiderItem
+        Dim NewRaideritem As New RaiderItem
+        NewRaideritem.Name = Name
+        NewRaideritem.Text = Text
+        NewRaideritem.Image = Image
+        SyncLock Me.List.SyncRoot
+            Me.List.Add(NewRaideritem)
+        End SyncLock
+        Return NewRaideritem
+    End Function
+
     Public Sub AddRange(ByVal items() As RaiderItem)
         If items IsNot Nothing Then
             SyncLock Me.List.SyncRoot

eXperDB_Monitoring_Client/iDast.MonPostgres/AlertConfig.resx

@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="ttChart.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="coldgvHostName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="coldgvAliasNm.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="coldgvIP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="coldgvHARole.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="coldgvHAHost.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dbmsImgLst.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>114, 19</value>
+  </metadata>
+  <data name="dbmsImgLst.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACo
+        DAAAAk1TRnQBSQFMAgEBAgEAAXABAQFwAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABEAMAAQEBAAEgBgABECEAAQEDCAELAw8BFAMQARYDEAEWAxABFgMQARYDEAEWAw0BEQMEAQUYAAMG
+        AQgDJgE5AysBQwMrAUMDKwFCAxYBHgMAAQEDFgEfAysBQwMrAUMDKwFDAyUBNwMGAQiIAAMOARMDKQE+
+        AVEBUgFRAacBVQFcAVUB6gEAAYYBFgH/AQABhgEVAf8BAAGFARQB/wEAAYYBFQH/AQABhwEWAf8BVwFc
+        AVcB3wM/AW0DHgErAwMBBAgAAwgBCwMXASADNQFYAZcBlQGUAf8BtwG1AbMB/wG6AbgBtgH/AZUBkwGQ
+        Af8BHAEaARkB/wMqAUABHQEbARkB/wGVAZMBkQH/AbkBtwG1Af8BuAG2AbQB/wGYAZYBlQH/AzIBUYgA
+        AVYBWAFWAcEBIwHMAagB/wE5AdkBtgH/AUQB3gG5Af8BTwHjAb4B/wGKAeoBxAH/AZUB7gHIAf8BiAHo
+        AcMB/wFPAeIBvQH/AUQB3QG6Af8BPAHbAbkB/wEAAZcBLQH/AxABFQQAAwoBDQNTAagBogGcAZIB/wEr
+        ASkBKgH/AYICgAH/Ad4B1AHMAf8BSAFEAUIB/wEnASUBJAH/AScBJQEkAf8BJwElASQB/wEnASUBJAH/
+        ASgBJgElAf8CXAFXAd8DBwEJAYcBhQGEAf8BMwExATAB/4kAAYkBGAH/AScBzwGsAf8BMgHUAbAB/wE/
+        AdsBtQH/AUwB4QG7Af8BhwHoAcEB/wGSAewBxgH/AYUB5gHAAf8BSwHgAboB/wE+AdoBtQH/ATMB1AGw
+        Af8BLwHVAbQB/wMQARYEAAMQARYByAHBAbcB/wHPAccBvgH/ATYCNQH/AZQBkwGSAf8B5gHcAdMB/wGL
+        AYkBhgH/AUQBQgFAAf8BQwFBAT4B/wFDAUEBPwH/AUMBQQE+Af8BRAFCAUAB/wGBAVEBTQH/Ay0BRgGZ
+        AZcBlgH/AUECPgH/iQABiAEXAf8BIAHNAakB/wGSAekBzgH/AbsB/AHoAf8B1AH/AfcB/wHRAf8B9gH/
+        AdAB/wH1Af8B0gH/AfYB/wHUAf8B9wH/AbMB+AHjAf8BRAHdAbsB/wErAdMBsgH/AxABFgQAAxABFgHJ
+        AcEBuAH/Ac0BxAG7Af8BxQG+AbYB/wHLAcoByQH/AfQC8wH/AvUB9AH/AvMB8gH/AYABUQFPAf8B3QHU
+        AcsB/wFMAUsBSQH/AvMB8gH/AfYC9QH/AfYB9QH0Af8BzwHOAc0B/wMcASeJAAGIARgB/wEBAawBSQH/
+        AQABqgFJAf8BHwHFAZgB/wE7AdQBqwH/AY4B7QHHAf8BmgHxAcwB/wGMAeoBxgH/ATkB1AGrAf8BHAHD
+        AZYB/wEAAakBRQH/AaYB7wHVAf8DDAEQBAADDwEUAdMBzAHDAf8B7wHpAeMB/wHLAcMBuwH/AbsBsQGn
+        Af8BvwG1AasB/wHDAbkBrwH/AcIBtgGtAf8BuQGuAaUB/wG8AbQBqwH/Ad0B1wHPAf8B+wH0Ae0B/wGc
+        AZcBigH/lAABVgFXAVYBuAEpAdEBrwH/ATQB1QGxAf8BQAHbAbYB/wFNAeEBvAH/AYgB6AHCAf8BkwHs
+        AcYB/wGGAeYBwQH/AUwB4AG7Af8BPwHaAbUB/wE0AdUBsQH/ARwBxgGfAf8DDwEUBAADDAEQAbUBrAGk
+        Af8ByQHBAbgB/wHWAc0BxAH/Ad0B0wHLAf8B4wHZAdEB/wHqAd8B2AH/AecB3QHWAf8B4AHXAc8B/wHZ
+        AdEByQH/AdMBywHCAf8BwAG4Aa8B/wNVAbWVAAGJARgB/wElAc8BqwH/AS8B0gGuAf8BOwHZAbMB/wFI
+        Ad8BuQH/AYQB5wHAAf8BkAHsAcQB/wGCAeUBvwH/AUcB3gG4Af8BOwHYAbMB/wExAdMBrwH/AS4B1AGz
+        Af8DEAEWBAADEAEWAcoBwgG5Af8BzQHFAbwB/wHUAcsBwgH/AdsB0QHJAf8B4gHYAdAB/wHpAd4B1wH/
+        AeYB3AHVAf8B3wHWAc4B/wHYAc8BxwH/AdEByQHAAf8BywHDAboB/wGgAZkBjwH/lQABiAEXAf8BugH5
+        AeUB/wFJAdEBrQH/AQgBsAFPAf8BAAGmAUEB/wEAAagBQgH/AQABqQFDAf8BAAGoAUEB/wEAAagBQwH/
+        ASoBwgGVAf8BogHqAc4B/wFDAd8BwQH/Aw8BFAQAAxABFgHIAcABtwH/AdQBzQHEAf8B8gHtAeUC/wH8
+        AfUC/wH7AfQB/wH9AfoB8wH/Af4B+gHzAv8B+wH0Af8B9gHwAeoB/wHkAd4B1QH/AcgBwAG3Af8BoAGa
+        AY8B/5QAA1UBtQEHAbkBjAH/ATcB1wG1Af8BQwHdAbkB/wFPAeMBvgH/AYoB6QHDAf8BlAHtAcgB/wGI
+        AecBwwH/AU8B4gG9Af8BQgHcAbgB/wE2AdcBtAH/AQgBsQGAAf8DDAEQBAADDAEQAfEB6wHkAf8BpQGc
+        AZEB/wG7AbIBqQH/AdEByAG/Af8B4QHXAc8B/wHsAeEB2gH/AekB3wHYAf8B2QHOAccB/wHPAcUBvQH/
+        AbQBqwGiAf8BtwGuAaUB/wGoAaEBlgH/lQABiQEYAf8BJwHQAawB/wEyAdQBsAH/AT8B2wG1Af8BTAHh
+        AbsB/wGHAegBwQH/AZIB7AHGAf8BhQHmAcAB/wFLAeABugH/AT4B2gG1Af8BMwHUAbAB/wEvAdUBtAH/
+        AxABFgQAAw8BFAG2Aa4BpAH/Ac4BxgG9Af8B1AHLAcIB/wHbAdEByQH/AeIB2AHQAf8B6QHeAdcB/wHm
+        AdwB1QH/Ad8B1gHOAf8B2AHPAccB/wHRAckBwAH/AcwBxAG7Af8DVwG4lQABiAEXAf8BHQHLAacB/wGM
+        AeYByQH/AbUB+AHiAf8BzwH/AfIB/wHNAf8B8QH/Ac0B/wHxAf8BzgH/AfEB/wHPAf8B8gH/Aa4B9QHd
+        Af8BQAHaAbcB/wEqAdMBsQH/AxABFgQAAxABFgHIAcABuAH/AcwBwwG6Af8B0gHIAb8B/wHZAc4BxgH/
+        AeAB1gHOAf8B6AHdAdYB/wHlAdoB0wH/Ad0B1AHMAf8B1gHMAcQB/wHPAccBvgH/AcoBwgG5Af8BpgGf
+        AZQB/5UAAYYBFAH/AZwB7gHVAf8BJgHPAakB/wEpAdABrAH/ASsB0QGsAf8BKwHRAawB/wErAdEBrAH/
+        ASsB0QGsAf8BKwHRAawB/wEoAdABqgH/ATUB1AGxAf8B1gH/AfoB/wMQARYEAAMQARYBzwHIAb8C/wH6
+        AfQB/wHpAeIB2gH/AdcBzwHGAf8B1AHLAcIB/wHUAcsBwgH/AdQBywHCAf8B1AHLAcIB/wHjAdoB0wH/
+        AfgB8gHrAf8B9AHwAegB/wGmAZ8BkwH/lQABiAEYAf8BTwHkAcAB/wFLAeABuwH/AUkB3wG6Af8BSQHf
+        AboB/wFJAd8BugH/AUkB3wG6Af8BSQHfAboB/wFJAd8BugH/AUoB4AG7Af8BSwHhAbwB/wFPAeMBwAH/
+        AwoBDQQAAxABFQHsAeUB3QH/AdUBzAHCAf8B1wHOAcMB/wHXAc4BxAH/AdcBzgHEAf8B1wHOAcQB/wHX
+        Ac4BxAH/AdcBzgHEAf8B1wHOAcQB/wHWAc0BwwH/AdUBzAHCAf8BpgGfAZMB/5QAAwIBAwEAAYgBFwH/
+        AQ4BtQGBAf8BRAHYAa0B/wGgAfYB0gH/AaAB9QHSAf8BoAH1AdIB/wGgAfUB0gH/AaEB9wHUAf8BOwHS
+        AaUB/wEAAZsBMAH/AUkBSgFJAYkIAAMDAQQBtQGtAaEB/wHpAeEB1wH/AeYB3gHUAf8B5QHdAdMB/wHk
+        AdwB0gH/AeQB3AHSAf8B5AHcAdIB/wHkAdwB0gH/AeUB3QHTAf8B5wHfAdUB/wHiAdoB0AH/A1UBstQA
+        AyUBNwNdAdIBqgGiAZYB/wGqAaIBlgH/AaoBogGWAf8BqgGiAZYB/wGqAaIBlgH/A2EB4gNIAYUDAAEB
+        kAABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/wEAAeABBwHgBQABwAEBAYAFAAHA
+        AQEGAAHAAQEGAAHAAQEGAAHAAQEBAAEHBAABwAEBAQABBwQAAcABAQEAAQcEAAHAAQEBAAEHBAABwAEB
+        AQABBwQAAcABAQEAAQcEAAHAAQEBAAEHBAABwAEBAQABBwQAAcABAQEAAQcEAAHAAQMBAAEHBAAC/wHA
+        AQ8EAAs=
+</value>
+  </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>48</value>
+  </metadata>
+</root>