From 162485e3f010a01c324153f6fe6fa4cde6360a73 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 22 Apr 2020 11:07:21 +0200 Subject: [PATCH] EDMIBenchmark: add logging --- GUIs.Test.EDMIBenchmark/Form1.Designer.vb | 43 ++++++++++++++--------- GUIs.Test.EDMIBenchmark/Form1.resx | 6 ++-- GUIs.Test.EDMIBenchmark/Form1.vb | 13 +++++-- 3 files changed, 40 insertions(+), 22 deletions(-) diff --git a/GUIs.Test.EDMIBenchmark/Form1.Designer.vb b/GUIs.Test.EDMIBenchmark/Form1.Designer.vb index b5a6d6f6..5f10168d 100644 --- a/GUIs.Test.EDMIBenchmark/Form1.Designer.vb +++ b/GUIs.Test.EDMIBenchmark/Form1.Designer.vb @@ -24,7 +24,7 @@ Partial Class Form1 Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Form1)) - Dim DockingContainer3 As DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer = New DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer() + Dim DockingContainer1 As DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer = New DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer() Me.DocumentGroup1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.DocumentGroup(Me.components) Me.Document1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.Document(Me.components) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() @@ -38,6 +38,8 @@ Partial Class Form1 Me.BarListItem1 = New DevExpress.XtraBars.BarListItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarToggleSwitchItem1 = New DevExpress.XtraBars.BarToggleSwitchItem() + Me.BarDockingMenuItem1 = New DevExpress.XtraBars.BarDockingMenuItem() + Me.BarMdiChildrenListItem1 = New DevExpress.XtraBars.BarMdiChildrenListItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -66,8 +68,7 @@ Partial Class Form1 Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.Timer1 = New System.Windows.Forms.Timer(Me.components) - Me.BarDockingMenuItem1 = New DevExpress.XtraBars.BarDockingMenuItem() - Me.BarMdiChildrenListItem1 = New DevExpress.XtraBars.BarMdiChildrenListItem() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() CType(Me.DocumentGroup1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Document1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -109,9 +110,9 @@ Partial Class Form1 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.ButtonSelectFiles, Me.ButtonImportFiles, Me.buttonClearLog, Me.buttonClearFiles, Me.TextboxObejctId, Me.ButtonLoadFile, Me.BarListItem1, Me.BarButtonItem2, Me.BarToggleSwitchItem1, Me.BarDockingMenuItem1, Me.BarMdiChildrenListItem1}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.ButtonSelectFiles, Me.ButtonImportFiles, Me.buttonClearLog, Me.buttonClearFiles, Me.TextboxObejctId, Me.ButtonLoadFile, Me.BarListItem1, Me.BarButtonItem2, Me.BarToggleSwitchItem1, Me.BarDockingMenuItem1, Me.BarMdiChildrenListItem1, Me.BarButtonItem1}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 13 + Me.RibbonControl1.MaxItemId = 14 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.PageHeaderItemLinks.Add(Me.BarDockingMenuItem1) Me.RibbonControl1.PageHeaderItemLinks.Add(Me.BarMdiChildrenListItem1) @@ -190,6 +191,18 @@ Partial Class Form1 Me.BarToggleSwitchItem1.Id = 10 Me.BarToggleSwitchItem1.Name = "BarToggleSwitchItem1" ' + 'BarDockingMenuItem1 + ' + Me.BarDockingMenuItem1.Caption = "BarDockingMenuItem1" + Me.BarDockingMenuItem1.Id = 11 + Me.BarDockingMenuItem1.Name = "BarDockingMenuItem1" + ' + 'BarMdiChildrenListItem1 + ' + Me.BarMdiChildrenListItem1.Caption = "BarMdiChildrenListItem1" + Me.BarMdiChildrenListItem1.Id = 12 + Me.BarMdiChildrenListItem1.Name = "BarMdiChildrenListItem1" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup4, Me.RibbonPageGroup3}) @@ -216,6 +229,7 @@ Partial Class Form1 ' Me.RibbonPageGroup3.ItemLinks.Add(Me.buttonClearLog, True) Me.RibbonPageGroup3.ItemLinks.Add(Me.buttonClearFiles) + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup3.Name = "RibbonPageGroup3" Me.RibbonPageGroup3.Text = "Utils" ' @@ -242,8 +256,8 @@ Partial Class Form1 ' Me.TabbedView1.DocumentGroups.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.DocumentGroup() {Me.DocumentGroup1}) Me.TabbedView1.Documents.AddRange(New DevExpress.XtraBars.Docking2010.Views.BaseDocument() {Me.Document1}) - DockingContainer3.Element = Me.DocumentGroup1 - Me.TabbedView1.RootContainer.Nodes.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer() {DockingContainer3}) + DockingContainer1.Element = Me.DocumentGroup1 + Me.TabbedView1.RootContainer.Nodes.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer() {DockingContainer1}) ' 'DockManager1 ' @@ -429,17 +443,11 @@ Partial Class Form1 ' Me.Timer1.Interval = 3000 ' - 'BarDockingMenuItem1 + 'BarButtonItem1 ' - Me.BarDockingMenuItem1.Caption = "BarDockingMenuItem1" - Me.BarDockingMenuItem1.Id = 11 - Me.BarDockingMenuItem1.Name = "BarDockingMenuItem1" - ' - 'BarMdiChildrenListItem1 - ' - Me.BarMdiChildrenListItem1.Caption = "BarMdiChildrenListItem1" - Me.BarMdiChildrenListItem1.Id = 12 - Me.BarMdiChildrenListItem1.Name = "BarMdiChildrenListItem1" + Me.BarButtonItem1.Caption = "Open Log Directory" + Me.BarButtonItem1.Id = 13 + Me.BarButtonItem1.Name = "BarButtonItem1" ' 'Form1 ' @@ -523,4 +531,5 @@ Partial Class Form1 Friend WithEvents Timer1 As Timer Friend WithEvents BarDockingMenuItem1 As DevExpress.XtraBars.BarDockingMenuItem Friend WithEvents BarMdiChildrenListItem1 As DevExpress.XtraBars.BarMdiChildrenListItem + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.Test.EDMIBenchmark/Form1.resx b/GUIs.Test.EDMIBenchmark/Form1.resx index 3d74ebd0..bc8018dc 100644 --- a/GUIs.Test.EDMIBenchmark/Form1.resx +++ b/GUIs.Test.EDMIBenchmark/Form1.resx @@ -289,12 +289,12 @@ 17, 17 - - 181, 17 - 316, 17 + + 181, 17 + 453, 17 diff --git a/GUIs.Test.EDMIBenchmark/Form1.vb b/GUIs.Test.EDMIBenchmark/Form1.vb index 460d4294..4dfc542d 100644 --- a/GUIs.Test.EDMIBenchmark/Form1.vb +++ b/GUIs.Test.EDMIBenchmark/Form1.vb @@ -7,19 +7,24 @@ Imports System.IO Public Class Form1 Private _Channel As EDMIServiceReference.IEDMIServiceChannel + Private _LogConfig As LogConfig + Private _Logger As Logger Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load - Dim oLogConfig As New LogConfig(LogConfig.PathType.Temp) + _LogConfig = New LogConfig(LogConfig.PathType.Temp, Nothing, "EDMIBenschmark") + _Logger = _LogConfig.GetLogger() + Dim oChannelFactory As New ChannelFactory(Of EDMIServiceReference.IEDMIServiceChannel)( Channel.GetBinding(TcpClientCredentialType.Windows), "net.tcp://172.24.12.39:9000/DigitalData/Services/Main") _Channel = oChannelFactory.CreateChannel() _Channel.Open() - DocumentViewer1.Init(oLogConfig, "21182889975216572111813147150675976632") + DocumentViewer1.Init(_LogConfig, "21182889975216572111813147150675976632") End Sub Private Sub AddLogMessage(Message As String) + _Logger.Info(Message) listboxLog.Items.Add(Message) listboxLog.MakeItemVisible(listboxLog.Items.Count - 1) End Sub @@ -216,4 +221,8 @@ Public Class Form1 AddLogMessage("Timer Stopped!") End If End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Process.Start(_LogConfig.LogDirectory) + End Sub End Class