Compare commits

...

5 Commits

8 changed files with 355 additions and 42 deletions

View File

@@ -50,6 +50,12 @@
Line Line
Area Area
Pie Pie
StackedBar
End Enum
Public Enum LabelTypeEnum
NoLabels
DefaultLabels
End Enum End Enum
End Namespace End Namespace

View File

@@ -7,6 +7,7 @@
Public Argument As String Public Argument As String
Public Value As String Public Value As String
Public SearchId As Integer Public SearchId As Integer
Public LabelType As Constants.LabelTypeEnum
Public Overrides Function ToString() As String Public Overrides Function ToString() As String
Return Title Return Title

View File

@@ -24,6 +24,7 @@ Partial Class frmMonitor
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container() Me.components = New System.ComponentModel.Container()
Dim PushTransition1 As DevExpress.Utils.Animation.PushTransition = New DevExpress.Utils.Animation.PushTransition() Dim PushTransition1 As DevExpress.Utils.Animation.PushTransition = New DevExpress.Utils.Animation.PushTransition()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMonitor))
Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
Me.ApplicationMenu1 = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components) Me.ApplicationMenu1 = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components)
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
@@ -85,6 +86,8 @@ Partial Class frmMonitor
Me.AdornerUIManager2 = New DevExpress.Utils.VisualEffects.AdornerUIManager(Me.components) Me.AdornerUIManager2 = New DevExpress.Utils.VisualEffects.AdornerUIManager(Me.components)
Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(Me.components) Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(Me.components)
Me.SplashScreenManager1 = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.DigitalData.GUIs.Monitor.frmLoading), True, True) Me.SplashScreenManager1 = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.DigitalData.GUIs.Monitor.frmLoading), True, True)
Me.btnExportChart2PDF = New DevExpress.XtraBars.BarButtonItem()
Me.btnExportChart2PNG = New DevExpress.XtraBars.BarButtonItem()
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.XtraTabControlFileHTML, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControlFileHTML, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -144,9 +147,9 @@ Partial Class frmMonitor
' '
Me.RibbonControl1.ApplicationButtonDropDownControl = Me.ApplicationMenu1 Me.RibbonControl1.ApplicationButtonDropDownControl = Me.ApplicationMenu1
Me.RibbonControl1.ExpandCollapseItem.Id = 0 Me.RibbonControl1.ExpandCollapseItem.Id = 0
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.buttonSearch, Me.BarButtonItem1, Me.btnExportDetails, Me.btnExportMain, Me.lbResultCount, Me.btnReloadSearches, Me.btnResetLayout, Me.BarButtonItem2, Me.lbVersion, Me.BarButtonItem3, Me.lbSearchTime}) Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.buttonSearch, Me.BarButtonItem1, Me.btnExportDetails, Me.btnExportMain, Me.lbResultCount, Me.btnReloadSearches, Me.btnResetLayout, Me.BarButtonItem2, Me.lbVersion, Me.BarButtonItem3, Me.lbSearchTime, Me.btnExportChart2PDF, Me.btnExportChart2PNG})
Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
Me.RibbonControl1.MaxItemId = 14 Me.RibbonControl1.MaxItemId = 16
Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
Me.RibbonControl1.ShowToolbarCustomizeItem = False Me.RibbonControl1.ShowToolbarCustomizeItem = False
@@ -241,7 +244,7 @@ Partial Class frmMonitor
' '
'lbSearchTime 'lbSearchTime
' '
Me.lbSearchTime.Caption = "BarStaticItem1" Me.lbSearchTime.Caption = "lbSearchTime"
Me.lbSearchTime.Id = 13 Me.lbSearchTime.Id = 13
Me.lbSearchTime.Name = "lbSearchTime" Me.lbSearchTime.Name = "lbSearchTime"
' '
@@ -270,6 +273,8 @@ Partial Class frmMonitor
Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
Me.RibbonPageGroup2.ItemLinks.Add(Me.btnExportMain) Me.RibbonPageGroup2.ItemLinks.Add(Me.btnExportMain)
Me.RibbonPageGroup2.ItemLinks.Add(Me.btnExportDetails) Me.RibbonPageGroup2.ItemLinks.Add(Me.btnExportDetails)
Me.RibbonPageGroup2.ItemLinks.Add(Me.btnExportChart2PDF)
Me.RibbonPageGroup2.ItemLinks.Add(Me.btnExportChart2PNG)
Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
Me.RibbonPageGroup2.Text = "Export" Me.RibbonPageGroup2.Text = "Export"
' '
@@ -686,6 +691,22 @@ Partial Class frmMonitor
' '
Me.SplashScreenManager1.ClosingDelay = 500 Me.SplashScreenManager1.ClosingDelay = 500
' '
'btnExportChart2PDF
'
Me.btnExportChart2PDF.Caption = "Export Charts als PDF"
Me.btnExportChart2PDF.Enabled = False
Me.btnExportChart2PDF.Id = 14
Me.btnExportChart2PDF.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.btnExportChart2PDF.Name = "btnExportChart2PDF"
'
'btnExportChart2PNG
'
Me.btnExportChart2PNG.Caption = "Export Charts als Bild"
Me.btnExportChart2PNG.Enabled = False
Me.btnExportChart2PNG.Id = 15
Me.btnExportChart2PNG.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem5.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.btnExportChart2PNG.Name = "btnExportChart2PNG"
'
'frmMonitor 'frmMonitor
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -820,4 +841,6 @@ Partial Class frmMonitor
Friend WithEvents lbVersion As DevExpress.XtraBars.BarStaticItem Friend WithEvents lbVersion As DevExpress.XtraBars.BarStaticItem
Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents lbSearchTime As DevExpress.XtraBars.BarStaticItem Friend WithEvents lbSearchTime As DevExpress.XtraBars.BarStaticItem
Friend WithEvents btnExportChart2PDF As DevExpress.XtraBars.BarButtonItem
Friend WithEvents btnExportChart2PNG As DevExpress.XtraBars.BarButtonItem
End Class End Class

View File

@@ -120,6 +120,64 @@
<metadata name="ApplicationMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ApplicationMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>362, 17</value> <value>362, 17</value>
</metadata> </metadata>
<assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="BarButtonItem4.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABoHAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
YWNre2ZpbGw6IzcyNzI3Mjt9Cgkuc3Qwe29wYWNpdHk6MC4yO30KPC9zdHlsZT4NCiAgPHBhdGggZD0i
TTgsNGgxOHY2aDJWM2MwLTAuNS0wLjUtMS0xLTFIN0M2LjUsMiw2LDIuNSw2LDN2N2gyVjR6IiBjbGFz
cz0iQmxhY2siIC8+DQogIDxwYXRoIGQ9Ik0yNiwyNkg4VjE2SDZ2MTFjMCwwLjUsMC41LDEsMSwxaDIw
YzAuNSwwLDEtMC41LDEtMVYxNmgtMlYyNnoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPHBhdGggZD0iTTEw
LjMsMTEuNkg5LjZWMTRoMC42YzAuOSwwLDEuMy0wLjQsMS4zLTEuMkMxMS41LDEyLDExLjEsMTEuNiwx
MC4zLDExLjZ6IiBjbGFzcz0iUmVkIiAvPg0KICA8cGF0aCBkPSJNMTYuNywxMS43aC0wLjh2NC45aDAu
OGMwLjcsMCwxLjMtMC4yLDEuNi0wLjdzMC42LTEuMSwwLjYtMS44YzAtMC43LTAuMi0xLjMtMC42LTEu
NyAgQzE4LDExLjksMTcuNCwxMS43LDE2LjcsMTEuN3oiIGNsYXNzPSJSZWQiIC8+DQogIDxwYXRoIGQ9
Ik0yOSw4SDVDNC40LDgsNCw4LjQsNCw5djEwYzAsMC42LDAuNCwxLDEsMWgyNGMwLjYsMCwxLTAuNCwx
LTFWOUMzMCw4LjQsMjkuNiw4LDI5LDh6IE0xMi41LDE0LjYgIGMtMC41LDAuNS0xLjIsMC43LTIuMSww
LjdIOS42VjE4SDh2LTcuN2gyLjVjMS44LDAsMi43LDAuOCwyLjcsMi41QzEzLjIsMTMuNSwxMywxNC4y
LDEyLjUsMTQuNnogTTE5LjYsMTYuOSAgQzE4LjksMTcuNiwxOCwxOCwxNi44LDE4aC0yLjV2LTcuN2gy
LjVjMi41LDAsMy44LDEuMywzLjgsMy44QzIwLjcsMTUuMywyMC4zLDE2LjIsMTkuNiwxNi45eiBNMjYs
MTEuN2gtMi41djEuOWgyLjNWMTVoLTIuM3YzICBoLTEuNnYtNy43SDI2VjExLjd6IiBjbGFzcz0iUmVk
IiAvPg0KICA8ZyBjbGFzcz0ic3QwIj4NCiAgICA8cGF0aCBkPSJNMTAuMywxMS42SDkuNlYxNGgwLjZj
MC45LDAsMS4zLTAuNCwxLjMtMS4yQzExLjUsMTIsMTEuMSwxMS42LDEwLjMsMTEuNnoiIGNsYXNzPSJC
bGFjayIgLz4NCiAgICA8cGF0aCBkPSJNMTYuNywxMS43aC0wLjh2NC45aDAuOGMwLjcsMCwxLjMtMC4y
LDEuNi0wLjdzMC42LTEuMSwwLjYtMS44YzAtMC43LTAuMi0xLjMtMC42LTEuNyAgIEMxOCwxMS45LDE3
LjQsMTEuNywxNi43LDExLjd6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBhdGggZD0iTTI5LDhINUM0
LjQsOCw0LDguNCw0LDl2MTBjMCwwLjYsMC40LDEsMSwxaDI0YzAuNiwwLDEtMC40LDEtMVY5QzMwLDgu
NCwyOS42LDgsMjksOHogTTEyLjUsMTQuNiAgIGMtMC41LDAuNS0xLjIsMC43LTIuMSwwLjdIOS42VjE4
SDh2LTcuN2gyLjVjMS44LDAsMi43LDAuOCwyLjcsMi41QzEzLjIsMTMuNSwxMywxNC4yLDEyLjUsMTQu
NnogTTE5LjYsMTYuOSAgIEMxOC45LDE3LjYsMTgsMTgsMTYuOCwxOGgtMi41di03LjdoMi41YzIuNSww
LDMuOCwxLjMsMy44LDMuOEMyMC43LDE1LjMsMjAuMywxNi4yLDE5LjYsMTYuOXogTTI2LDExLjdoLTIu
NXYxLjloMi4zVjE1aC0yLjN2MyAgIGgtMS42di03LjdIMjZWMTEuN3oiIGNsYXNzPSJCbGFjayIgLz4N
CiAgPC9nPg0KPC9zdmc+Cw==
</value>
</data>
<data name="BarButtonItem5.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANECAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
Y2U9InByZXNlcnZlIiBpZD0iUGljdHVyZSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
R3JlZW57ZmlsbDojMDM5QzIzO30KCS5ZZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5zdDB7b3BhY2l0eTow
LjU7fQo8L3N0eWxlPg0KICA8cGF0aCBkPSJNMjksNEgzQzIuNSw0LDIsNC41LDIsNXYyMmMwLDAuNSww
LjUsMSwxLDFoMjZjMC41LDAsMS0wLjUsMS0xVjVDMzAsNC41LDI5LjUsNCwyOSw0eiBNMjgsMjZINFY2
aDI0VjI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8Y2lyY2xlIGN4PSIyMSIgY3k9IjExIiByPSIzIiBj
bGFzcz0iWWVsbG93IiAvPg0KICA8cG9seWdvbiBwb2ludHM9IjIwLDI0IDEwLDE0IDYsMTggNiwyNCAi
IGNsYXNzPSJHcmVlbiIgLz4NCiAgPGcgY2xhc3M9InN0MCI+DQogICAgPHBvbHlnb24gcG9pbnRzPSIy
MiwyNCAxOCwyMCAyMCwxOCAyNiwyNCAgIiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
</data>
<metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>196, 17</value> <value>196, 17</value>
</metadata> </metadata>

View File

@@ -21,6 +21,9 @@ Imports DigitalData.Modules.Language.Utils
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Patterns Imports DigitalData.Modules.Patterns
Imports DevExpress.XtraEditors Imports DevExpress.XtraEditors
Imports System.Drawing.Imaging
Imports System.IO
Imports DevExpress.XtraBars
Public Class frmMonitor Public Class frmMonitor
@@ -50,7 +53,7 @@ Public Class frmMonitor
Private FileResultViewers As List(Of DocumentViewer) Private FileResultViewers As List(Of DocumentViewer)
Private FileResultTabs As List(Of XtraTabPage) Private FileResultTabs As List(Of XtraTabPage)
Private FileResultViewerIndex As Integer = 0 'Private FileResultViewerIndex As Integer = 0
Private HtmlResultViewers As List(Of RichEditControl) Private HtmlResultViewers As List(Of RichEditControl)
Private HtmlResultTabs As List(Of XtraTabPage) Private HtmlResultTabs As List(Of XtraTabPage)
@@ -84,6 +87,7 @@ Public Class frmMonitor
Private Validator As Validator Private Validator As Validator
Private GridLoader As GridLoader Private GridLoader As GridLoader
Private SelectedChart As ChartControl
Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Try Try
@@ -125,9 +129,12 @@ Public Class frmMonitor
Validator = New Validator(LogConfig, LayoutControl1, AdornerUIManager2, ControlHelper) Validator = New Validator(LogConfig, LayoutControl1, AdornerUIManager2, ControlHelper)
GridLoader = New GridLoader(LogConfig, SvgImageCollection1) GridLoader = New GridLoader(LogConfig, SvgImageCollection1)
AddHandler GridLoader.ChartControlClicked, AddressOf ChartControl_Click
InitGrid() InitGrid()
InitTreeList() InitTreeList()
InitChartContainer() InitChartContainer()
InitBarItems()
Dim oGrids As GridView() = New List(Of GridView) From {GridView1, GridView2, GridView3, GridView4}.ToArray Dim oGrids As GridView() = New List(Of GridView) From {GridView1, GridView2, GridView3, GridView4}.ToArray
GridBuilder.SetDefaults(oGrids) GridBuilder.SetDefaults(oGrids)
@@ -166,6 +173,7 @@ Public Class frmMonitor
SplitContainerFileHTML.Collapsed = True SplitContainerFileHTML.Collapsed = True
SetResultCount(0) SetResultCount(0)
SetSearchTimeValue("")
SetVersion() SetVersion()
Catch ex As Exception Catch ex As Exception
@@ -175,7 +183,7 @@ Public Class frmMonitor
Private Function LoadGDPicture() As String Private Function LoadGDPicture() As String
Dim oSQL = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'" Dim oSQL = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'"
Return Database.GetScalarValue(oSQL) Return CStr(Database.GetScalarValue(oSQL))
End Function End Function
@@ -194,7 +202,7 @@ Public Class frmMonitor
Return False Return False
End If End If
Dim oSearch As Search = cmbSearches.EditValue Dim oSearch As Search = CType(cmbSearches.EditValue, Search)
InvisibleMarkedColumns.Clear() InvisibleMarkedColumns.Clear()
VisibleMarkedColumns.Clear() VisibleMarkedColumns.Clear()
@@ -214,7 +222,7 @@ Public Class frmMonitor
Dim oControls As List(Of Control) = LayoutControl1.Controls.Cast(Of Control).ToList() Dim oControls As List(Of Control) = LayoutControl1.Controls.Cast(Of Control).ToList()
Dim oSQL As String Dim oSQL As String
Dim oTable As DataTable Dim oTable As DataTable = Nothing
If oSearch.SQLCommand.Length > 0 Then If oSearch.SQLCommand.Length > 0 Then
oSQL = Patterns.ReplaceControlValues(oSearch.SQLCommand, oControls) oSQL = Patterns.ReplaceControlValues(oSearch.SQLCommand, oControls)
@@ -234,8 +242,6 @@ Public Class frmMonitor
TreeListResults.DataSource = oTable TreeListResults.DataSource = oTable
lbResultCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
Dim oMaxLength = 0 Dim oMaxLength = 0
For Each oRow As DataRow In oTable.Rows For Each oRow As DataRow In oTable.Rows
Dim oProcess = oRow.Item("COLUMN1") Dim oProcess = oRow.Item("COLUMN1")
@@ -338,8 +344,6 @@ Public Class frmMonitor
GridViewResults.PopulateColumns() GridViewResults.PopulateColumns()
GridBuilder.SetDateTimeColumns(GridViewResults) GridBuilder.SetDateTimeColumns(GridViewResults)
lbResultCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
For Each oColumn As GridColumn In GridViewResults.Columns For Each oColumn As GridColumn In GridViewResults.Columns
If oColumn.ColumnType = GetType(Integer) Then If oColumn.ColumnType = GetType(Integer) Then
oColumn.AppearanceCell.TextOptions.HAlignment = HorzAlignment.Center oColumn.AppearanceCell.TextOptions.HAlignment = HorzAlignment.Center
@@ -402,7 +406,7 @@ Public Class frmMonitor
ActivateMenuBarButtons(oSearch.ReturnType) ActivateMenuBarButtons(oSearch.ReturnType)
Dim oTotalTime = Now.Subtract(oStartTime) Dim oTotalTime = Now.Subtract(oStartTime)
lbSearchTime.Caption = oTotalTime.ToString("mm':'ss") SetSearchTimeValue(oTotalTime.ToString("mm':'ss"))
Return True Return True
Catch ex As Exception Catch ex As Exception
@@ -437,13 +441,17 @@ Public Class frmMonitor
Case ChartTypeEnum.Area Case ChartTypeEnum.Area
oSerie = New Series(pChartParameters.Title, ViewType.Area) oSerie = New Series(pChartParameters.Title, ViewType.Area)
Case ChartTypeEnum.Pie Case ChartTypeEnum.Pie
oSerie = New Series(pChartParameters.Title, ViewType.Pie) oSerie = New Series(pChartParameters.Title, ViewType.Pie) With {
oSerie.Label.TextPattern = "{V}" .LegendTextPattern = "{A}"
oSerie.LegendTextPattern = "{A}" }
Case ChartTypeEnum.StackedBar
oSerie = New Series(pChartParameters.Title, ViewType.StackedBar)
Case Else Case Else
Return Nothing Return Nothing
End Select End Select
SetSerieLabels(oSerie, pChartParameters.ChartType, pChartParameters.LabelType)
Dim oSQL As String = Patterns.ReplaceControlValues(pChartParameters.SQLCommand, pControls) Dim oSQL As String = Patterns.ReplaceControlValues(pChartParameters.SQLCommand, pControls)
Logger.Debug($"SQL after replacing placeholder: [{0}]", oSQL) Logger.Debug($"SQL after replacing placeholder: [{0}]", oSQL)
Dim oTable As DataTable = Await Database.GetDatatableAsync(oSQL) Dim oTable As DataTable = Await Database.GetDatatableAsync(oSQL)
@@ -452,8 +460,8 @@ Public Class frmMonitor
Dim yAxisTitle As String = pChartParameters.Value Dim yAxisTitle As String = pChartParameters.Value
For Each oRow In oTable.Rows For Each oRow In oTable.Rows
Dim value1 As String = oRow.Item(xAxisTitle) Dim value1 As String = CStr(oRow.Item(xAxisTitle))
Dim value2 As String = oRow.Item(yAxisTitle) Dim value2 As String = CStr(oRow.Item(yAxisTitle))
oSerie.Points.Add(New SeriesPoint(value1, value2)) oSerie.Points.Add(New SeriesPoint(value1, value2))
Next Next
@@ -463,11 +471,53 @@ Public Class frmMonitor
End Function End Function
Private Sub SetSerieLabels(pSerie As Series, pChartType As ChartTypeEnum, pLabelType As LabelTypeEnum)
If (pLabelType = LabelTypeEnum.NoLabels) Then
pSerie.LabelsVisibility = DefaultBoolean.False
Exit Sub
End If
pSerie.LabelsVisibility = DefaultBoolean.True
pSerie.Label.TextPattern = "{V}"
Select Case pChartType
Case ChartTypeEnum.Bar
Dim barLabel As SideBySideBarSeriesLabel = TryCast(pSerie.Label, SideBySideBarSeriesLabel)
If barLabel IsNot Nothing Then
barLabel.Position = BarSeriesLabelPosition.Top
End If
Case ChartTypeEnum.Line
Dim lineLabel As PointSeriesLabel = TryCast(pSerie.Label, PointSeriesLabel)
If lineLabel IsNot Nothing Then
lineLabel.Position = PointLabelPosition.Outside
End If
Case ChartTypeEnum.Area
Dim areaLabel As PointSeriesLabel = TryCast(pSerie.Label, PointSeriesLabel)
If areaLabel IsNot Nothing Then
areaLabel.Position = PointLabelPosition.Outside
End If
Case ChartTypeEnum.Pie
Dim pieLabel As PieSeriesLabel = TryCast(pSerie.Label, PieSeriesLabel)
If pieLabel IsNot Nothing Then
pieLabel.Position = PieSeriesLabelPosition.Outside
End If
Case ChartTypeEnum.StackedBar
Dim stackedBarLabel As StackedBarSeriesLabel = TryCast(pSerie.Label, StackedBarSeriesLabel)
If stackedBarLabel IsNot Nothing Then
stackedBarLabel.Position = BarSeriesLabelPosition.Auto
End If
Case Else
End Select
End Sub
Private Sub SetChartTitle(pChartView As ChartControl, pTitle As String) Private Sub SetChartTitle(pChartView As ChartControl, pTitle As String)
' Wenn bereits ein Titel vorhanden ist, wird kein neuer ergänzt ' Wenn bereits ein Titel vorhanden ist, wird kein neuer ergänzt
' relevant bei mehrere Charts in einem ChartControl ' relevant bei mehrere Charts in einem ChartControl
If pChartView.Titles.Count = 0 Then If pChartView.Titles.Count = 0 Then
Dim oTitle As ChartTitle = New ChartTitle With { Dim oTitle As New ChartTitle With {
.Text = pTitle .Text = pTitle
} }
pChartView.Titles.Add(oTitle) pChartView.Titles.Add(oTitle)
@@ -524,7 +574,6 @@ Public Class frmMonitor
End Sub End Sub
Private Sub SetResultVisbility(pSearchMode As ReturnTypeEnum) Private Sub SetResultVisbility(pSearchMode As ReturnTypeEnum)
Select Case pSearchMode Select Case pSearchMode
Case ReturnTypeEnum.TreeView Case ReturnTypeEnum.TreeView
@@ -534,8 +583,13 @@ Public Class frmMonitor
TreeListResults.Dock = DockStyle.Fill TreeListResults.Dock = DockStyle.Fill
ChartViewResultContainer.Visible = False ChartViewResultContainer.Visible = False
ChartViewResultContainer.Dock = DockStyle.None ChartViewResultContainer.Dock = DockStyle.None
btnExportDetails.Enabled = True
btnExportMain.Enabled = True lbResultCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
EnableButtons(btnExportMain)
EnableButtons(btnExportDetails)
DisableButtons(btnExportChart2PDF)
DisableButtons(btnExportChart2PNG)
Case ReturnTypeEnum.ChartView Case ReturnTypeEnum.ChartView
GridControlResults.Visible = False GridControlResults.Visible = False
@@ -544,8 +598,13 @@ Public Class frmMonitor
TreeListResults.Dock = DockStyle.None TreeListResults.Dock = DockStyle.None
ChartViewResultContainer.Visible = True ChartViewResultContainer.Visible = True
ChartViewResultContainer.Dock = DockStyle.Fill ChartViewResultContainer.Dock = DockStyle.Fill
btnExportDetails.Enabled = False
btnExportMain.Enabled = False lbResultCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
DisableButtons(btnExportMain)
DisableButtons(btnExportDetails)
EnableButtons(btnExportChart2PDF)
EnableButtons(btnExportChart2PNG)
Case ReturnTypeEnum.Table Case ReturnTypeEnum.Table
GridControlResults.Visible = True GridControlResults.Visible = True
@@ -554,12 +613,40 @@ Public Class frmMonitor
TreeListResults.Dock = DockStyle.None TreeListResults.Dock = DockStyle.None
ChartViewResultContainer.Visible = False ChartViewResultContainer.Visible = False
ChartViewResultContainer.Dock = DockStyle.None ChartViewResultContainer.Dock = DockStyle.None
btnExportDetails.Enabled = True
btnExportMain.Enabled = True lbResultCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
EnableButtons(btnExportMain)
EnableButtons(btnExportDetails)
DisableButtons(btnExportChart2PDF)
DisableButtons(btnExportChart2PNG)
End Select End Select
End Sub End Sub
Private Sub DisableButtons(pBarButtonItem As BarButtonItem)
pBarButtonItem.Enabled = False
pBarButtonItem.Visibility = BarItemVisibility.Never
End Sub
Private Sub EnableButtons(pBarButtonItem As BarButtonItem)
pBarButtonItem.Enabled = True
pBarButtonItem.Visibility = BarItemVisibility.Always
End Sub
Private Sub InitBarItems()
btnExportMain.Visibility = BarItemVisibility.Always
btnExportMain.Enabled = False
btnExportDetails.Visibility = BarItemVisibility.Always
btnExportDetails.Enabled = False
DisableButtons(btnExportChart2PDF)
DisableButtons(btnExportChart2PNG)
lbResultCount.Visibility = BarItemVisibility.Never
lbSearchTime.Visibility = BarItemVisibility.Never
End Sub
''' <summary> ''' <summary>
''' Linklogik für Hyperlink-Spalten ''' Linklogik für Hyperlink-Spalten
''' </summary> ''' </summary>
@@ -577,7 +664,7 @@ Public Class frmMonitor
Return Return
Else Else
Dim oControl As Control = LayoutControl1.Controls.Find(oSearchParameter.PatternTitle, True).FirstOrDefault() Dim oControl As Control = LayoutControl1.Controls.Find(oSearchParameter.PatternTitle, True).FirstOrDefault()
oControl.Text = e.EditValue oControl.Text = CStr(e.EditValue)
End If End If
Await LoadData() Await LoadData()
@@ -621,11 +708,16 @@ Public Class frmMonitor
Exit Sub Exit Sub
End If End If
If CType(pRootNode.Item("PARENT_ID"), Int32) = 0 Then
' Auswertung für Parent-Knoten
ExpandCollapseNode(pRootNode)
End If
For Each oNode As TreeListNode In pRootNode.Nodes For Each oNode As TreeListNode In pRootNode.Nodes
Try Try
Dim oExpanded As TristateBoolean = NotNull(oNode.Item("EXPANDED"), TristateBoolean.Indeterminate) ExpandCollapseNode(oNode)
ExpandCollapseNode(oNode, oExpanded)
' Und rein in die Rekursion
SetExpandedForChildNodes(oNode, pDepth + 1) SetExpandedForChildNodes(oNode, pDepth + 1)
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) Logger.Error(ex)
@@ -662,6 +754,9 @@ Public Class frmMonitor
DisposeGrid() DisposeGrid()
InitGrid() InitGrid()
DisposeCharts()
InitChartContainer()
SplitContainerSQL.Collapsed = True SplitContainerSQL.Collapsed = True
SplitContainerFileHTML.Collapsed = True SplitContainerFileHTML.Collapsed = True
@@ -669,6 +764,7 @@ Public Class frmMonitor
btnExportDetails.Enabled = False btnExportDetails.Enabled = False
SetResultCount(0) SetResultCount(0)
InitBarItems()
LoadSearch() LoadSearch()
HideAllTabs() HideAllTabs()
@@ -687,6 +783,7 @@ Public Class frmMonitor
AdornerUIManager2.Hide() AdornerUIManager2.Hide()
AdornerUIManager2.Elements.Clear() AdornerUIManager2.Elements.Clear()
' TODO - Hier passt etwas noch nicht
Root.Clear(disposeItemAndControls:=False) Root.Clear(disposeItemAndControls:=False)
LayoutControl1.Clear(True, True) LayoutControl1.Clear(True, True)
@@ -717,6 +814,9 @@ Public Class frmMonitor
Dim oSQL = pParam.ItemString Dim oSQL = pParam.ItemString
Dim oTable = Database.GetDatatable(oSQL) Dim oTable = Database.GetDatatable(oSQL)
Return oTable Return oTable
Case Else
Return Nothing
End Select End Select
End Function End Function
@@ -860,8 +960,9 @@ Public Class frmMonitor
End If End If
End Sub End Sub
Private Sub ExpandCollapseNode(pNode As TreeListNode, pState As TristateBoolean) Private Sub ExpandCollapseNode(pNode As TreeListNode)
Select Case pState Dim oExpanded As TristateBoolean = NotNull(pNode.Item("EXPANDED"), TristateBoolean.Indeterminate)
Select Case oExpanded
Case TristateBoolean.False Case TristateBoolean.False
pNode.Collapse() pNode.Collapse()
Case TristateBoolean.True Case TristateBoolean.True
@@ -1144,7 +1245,7 @@ Public Class frmMonitor
End Sub End Sub
Private Sub GridViewResults_ColumnFilterChanged(sender As Object, e As EventArgs) Private Sub GridViewResults_ColumnFilterChanged(sender As Object, e As EventArgs)
Dim oView As GridView = sender Dim oView As GridView = CType(sender, GridView)
SetResultCount(oView.DataRowCount) SetResultCount(oView.DataRowCount)
End Sub End Sub
@@ -1170,10 +1271,14 @@ Public Class frmMonitor
DisposeGrid() DisposeGrid()
InitGrid() InitGrid()
DisposeCharts()
InitChartContainer()
HideAllTabs() HideAllTabs()
Await LoadData() Await LoadData()
SetResultCount(0) SetResultCount(0)
InitBarItems()
End If End If
End Sub End Sub
@@ -1184,12 +1289,25 @@ Public Class frmMonitor
GridControlResults = Nothing GridControlResults = Nothing
End Sub End Sub
Private Sub DisposeCharts()
ChartViewResultContainer.Dispose()
ChartViewResultContainer = Nothing
End Sub
Private Sub SetResultCount(pResults As Integer) Private Sub SetResultCount(pResults As Integer)
lbResultCount.Caption = String.Format(lbResultCount.Tag, pResults) lbResultCount.Caption = String.Format(CStr(lbResultCount.Tag), pResults)
End Sub
Private Sub SetSearchTimeValue(pValue As String)
If pValue.Equals("00:00") Then
lbSearchTime.Caption = ""
Else
lbSearchTime.Caption = pValue
End If
End Sub End Sub
Private Sub SetVersion() Private Sub SetVersion()
lbVersion.Caption = String.Format(lbVersion.Tag, System.Reflection.Assembly.GetEntryAssembly().GetName().Version) lbVersion.Caption = String.Format(CStr(lbVersion.Tag), System.Reflection.Assembly.GetEntryAssembly().GetName().Version)
End Sub End Sub
Private Sub InitGrid() Private Sub InitGrid()
@@ -1219,8 +1337,8 @@ Public Class frmMonitor
Private Sub InitChartContainer() Private Sub InitChartContainer()
ChartViewResultContainer = GridLoader.InitChartViewResultContainer() ChartViewResultContainer = GridLoader.InitChartViewResultContainer()
SplitContainerSQL.Panel1.Controls.Add(ChartViewResultContainer) SplitContainerSQL.Panel1.Controls.Add(ChartViewResultContainer)
SelectedChart = Nothing
End Sub End Sub
Private Sub ResizeCharContainer() Private Sub ResizeCharContainer()
@@ -1250,5 +1368,87 @@ Public Class frmMonitor
End Try End Try
End Sub End Sub
Private Sub ChartControl_Click(sender As Object, e As EventArgs)
SelectedChart = CType(sender, ChartControl)
End Sub
Private Sub btnExportChart2PDF_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnExportChart2PDF.ItemClick
Try
If Not IsNothing(SelectedChart) Then
XtraSaveFileDialog1.Filter = "PDF Files (*.pdf*)|*.pdf"
XtraSaveFileDialog1.FileName = SelectedChart.Titles(0).ToString()
If XtraSaveFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then
ExportChart2Pdf(SelectedChart, XtraSaveFileDialog1.FileName)
End If
Else
FormHelper.ShowInfoMessage("Bitte einen Chart auswählen", "Chart Export per PDF")
End If
Catch ex As Exception
FormHelper.ShowErrorMessage(ex, "Chart Export nach PDF")
End Try
End Sub
Private Sub btnExportChart2PNG_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnExportChart2PNG.ItemClick
Try
If Not IsNothing(SelectedChart) Then
XtraSaveFileDialog1.Filter = "PNG Files (*.png*)|*.png"
XtraSaveFileDialog1.FileName = SelectedChart.Titles(0).ToString()
If XtraSaveFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then
ExportChartToImage(SelectedChart, XtraSaveFileDialog1.FileName)
End If
Else
FormHelper.ShowInfoMessage("Bitte einen Chart auswählen", "Chart Export per PNG")
End If
Catch ex As Exception
FormHelper.ShowErrorMessage(ex, "Chart Export nach PNG")
End Try
End Sub
Sub ExportChart2Pdf(pMyChart As ChartControl, pFilePath As String)
Try
pMyChart.OptionsPrint.ImageFormat = DevExpress.XtraCharts.Printing.PrintImageFormat.Metafile
pMyChart.ExportToPdf(pFilePath, New DevExpress.XtraPrinting.PdfExportOptions With {
.ConvertImagesToJpeg = False
})
' Exports to a stream as PDF.
Dim pdfStream As FileStream = New FileStream(pFilePath, FileMode.Create)
pMyChart.ExportToPdf(pdfStream)
' ...
pdfStream.Close()
Catch ex As Exception
Logger.Error(ex)
End Try
End Sub
Sub ExportChartToImage(pMyChart As ChartControl, pFilePath As String)
Try
SaveChartImageToFile(pMyChart, ImageFormat.Png, pFilePath)
Dim image As Image = GetChartImage(pMyChart, ImageFormat.Png)
image.Save(pFilePath)
Catch ex As Exception
Logger.Error(ex)
End Try
End Sub
Private Sub SaveChartImageToFile(ByVal chart As ChartControl, ByVal format As ImageFormat, ByVal fileName As String)
' Create an image in the specified format from the chart
' and save it to the specified path.
chart.ExportToImage(fileName, format)
End Sub
Private Function GetChartImage(ByVal chart As ChartControl, ByVal format As ImageFormat) As Image
' Create an image.
Dim image As Image = Nothing
' Create an image of the chart.
Using s As New MemoryStream()
chart.ExportToImage(s, format)
image = System.Drawing.Image.FromStream(s)
End Using
' Return the image.
Return image
End Function
End Class End Class

View File

@@ -23,6 +23,8 @@ Public Class GridLoader
Public ReadOnly Property SvgImageCollection As SvgImageCollection Public ReadOnly Property SvgImageCollection As SvgImageCollection
Public ReadOnly Property GridBuilder As GridBuilder Public ReadOnly Property GridBuilder As GridBuilder
Public Event ChartControlClicked As EventHandler
Private ReadOnly StateIcons As New Dictionary(Of String, NodeImage) From { Private ReadOnly StateIcons As New Dictionary(Of String, NodeImage) From {
{STATE_SUCCESS, NodeImage.Success}, {STATE_SUCCESS, NodeImage.Success},
{STATE_FAILURE, NodeImage.Failure} {STATE_FAILURE, NodeImage.Failure}
@@ -114,23 +116,28 @@ Public Class GridLoader
oChartViewResultContainer.Panel1.AddControl(oSplitContainerTop) oChartViewResultContainer.Panel1.AddControl(oSplitContainerTop)
oChartViewResultContainer.Panel2.AddControl(oSplitContainerBottom) oChartViewResultContainer.Panel2.AddControl(oSplitContainerBottom)
Dim oChartControlTopLeft As ChartControl = New ChartControl With { Dim oChartControlTopLeft As New ChartControl With {
.Name = "ChartControlTopLeft", .Name = "ChartControlTopLeft",
.Dock = DockStyle.Fill .Dock = DockStyle.Fill
} }
Dim oChartControlTopRight As ChartControl = New ChartControl With { Dim oChartControlTopRight As New ChartControl With {
.Name = "ChartControlTopRight", .Name = "ChartControlTopRight",
.Dock = DockStyle.Fill .Dock = DockStyle.Fill
} }
Dim oChartControlBottomLeft As ChartControl = New ChartControl With { Dim oChartControlBottomLeft As New ChartControl With {
.Name = "ChartControlBottomLeft", .Name = "ChartControlBottomLeft",
.Dock = DockStyle.Fill .Dock = DockStyle.Fill
} }
Dim oChartControlBottomRight As ChartControl = New ChartControl With { Dim oChartControlBottomRight As New ChartControl With {
.Name = "ChartControlBottomRight", .Name = "ChartControlBottomRight",
.Dock = DockStyle.Fill .Dock = DockStyle.Fill
} }
AddHandler oChartControlTopLeft.Click, AddressOf ChartControl_Click
AddHandler oChartControlTopRight.Click, AddressOf ChartControl_Click
AddHandler oChartControlBottomLeft.Click, AddressOf ChartControl_Click
AddHandler oChartControlBottomRight.Click, AddressOf ChartControl_Click
oSplitContainerTop.Panel1.AddControl(oChartControlTopLeft) oSplitContainerTop.Panel1.AddControl(oChartControlTopLeft)
oSplitContainerTop.Panel2.AddControl(oChartControlTopRight) oSplitContainerTop.Panel2.AddControl(oChartControlTopRight)
oSplitContainerBottom.Panel1.AddControl(oChartControlBottomLeft) oSplitContainerBottom.Panel1.AddControl(oChartControlBottomLeft)
@@ -139,6 +146,10 @@ Public Class GridLoader
Return oChartViewResultContainer Return oChartViewResultContainer
End Function End Function
Private Sub ChartControl_Click(sender As Object, e As EventArgs)
RaiseEvent ChartControlClicked(sender, Nothing)
End Sub
Public Sub InitTreeListColumns(pTreeList As TreeList, pMaxLength As Integer) Public Sub InitTreeListColumns(pTreeList As TreeList, pMaxLength As Integer)
Dim oColumn1 = pTreeList.Columns.Item("COLUMN1") Dim oColumn1 = pTreeList.Columns.Item("COLUMN1")
Dim oColumn2 = pTreeList.Columns.Item("COLUMN2") Dim oColumn2 = pTreeList.Columns.Item("COLUMN2")

View File

@@ -93,7 +93,7 @@ Public Class SearchLoader
End Sub End Sub
Public Sub LoadChartParameters() Public Sub LoadChartParameters()
Dim oSQL As String = $"SELECT * FROM TBMON_CHARTS" Dim oSQL As String = $"SELECT * FROM TBMON_CHARTS WHERE ACTIVE = 1"
Dim oTable As DataTable = Database.GetDatatable(oSQL) Dim oTable As DataTable = Database.GetDatatable(oSQL)
Dim oParameters As New List(Of ChartParameter) Dim oParameters As New List(Of ChartParameter)
@@ -106,7 +106,8 @@ Public Class SearchLoader
.SQLCommand = oRow.ItemEx("SQL_COMMAND", String.Empty), .SQLCommand = oRow.ItemEx("SQL_COMMAND", String.Empty),
.ChartType = GetChartType(oRow.ItemEx("CHART_TYPE", String.Empty)), .ChartType = GetChartType(oRow.ItemEx("CHART_TYPE", String.Empty)),
.Argument = oRow.ItemEx("ARGUMENT", String.Empty), .Argument = oRow.ItemEx("ARGUMENT", String.Empty),
.Value = oRow.ItemEx("VALUE", String.Empty) .Value = oRow.ItemEx("VALUE", String.Empty),
.LabelType = GetLabelType(oRow.ItemEx("LABEL_TYPE", String.Empty))
}) })
Next Next
@@ -162,11 +163,24 @@ Public Class SearchLoader
Return ChartTypeEnum.Line Return ChartTypeEnum.Line
Case "PIE" Case "PIE"
Return ChartTypeEnum.Pie Return ChartTypeEnum.Pie
Case "STACKEDBAR"
Return ChartTypeEnum.StackedBar
Case Else Case Else
Return ChartTypeEnum.Undefined Return ChartTypeEnum.Undefined
End Select End Select
End Function End Function
Private Function GetLabelType(pTypeString As String) As LabelTypeEnum
Select Case pTypeString.ToUpper
Case "NOLABELS"
Return LabelTypeEnum.NoLabels
Case "DEFAULT"
Return LabelTypeEnum.DefaultLabels
Case Else
Return LabelTypeEnum.NoLabels
End Select
End Function
Private Function GetChartPosType(pPosTypeId As Integer) As ChartPosEnum Private Function GetChartPosType(pPosTypeId As Integer) As ChartPosEnum
Select Case pPosTypeId Select Case pPosTypeId
Case 1 Case 1

View File

@@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")> <Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("Monitor")> <Assembly: AssemblyProduct("Monitor")>
<Assembly: AssemblyCopyright("Copyright © 2023")> <Assembly: AssemblyCopyright("Copyright © 2023")>
<Assembly: AssemblyTrademark("1.6.2.0")> <Assembly: AssemblyTrademark("1.6.4.0")>
<Assembly: AssemblyCulture("")> <Assembly: AssemblyCulture("")>
' Setting ComVisible to false makes the types in this assembly not visible ' Setting ComVisible to false makes the types in this assembly not visible
@@ -32,5 +32,5 @@ Imports System.Runtime.InteropServices
' You can specify all the values or you can default the Build and Revision Numbers ' You can specify all the values or you can default the Build and Revision Numbers
' by using the '*' as shown below: ' by using the '*' as shown below:
' [assembly: AssemblyVersion("1.0.*")] ' [assembly: AssemblyVersion("1.0.*")]
<Assembly: AssemblyVersion("1.6.2.0")> <Assembly: AssemblyVersion("1.6.3.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>