diff --git a/GUIs.Monitor/Monitor.vbproj b/GUIs.Monitor/Monitor.vbproj index ad5ffddf..c37dc41b 100644 --- a/GUIs.Monitor/Monitor.vbproj +++ b/GUIs.Monitor/Monitor.vbproj @@ -50,7 +50,9 @@ + + ..\packages\NLog.4.7.5\lib\net45\NLog.dll diff --git a/GUIs.Monitor/My Project/licenses.licx b/GUIs.Monitor/My Project/licenses.licx index fe84aa59..7e6b1ada 100644 --- a/GUIs.Monitor/My Project/licenses.licx +++ b/GUIs.Monitor/My Project/licenses.licx @@ -1,6 +1,7 @@ -DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.Monitor/frmStart.Designer.vb b/GUIs.Monitor/frmStart.Designer.vb index 90a87087..5b64e996 100644 --- a/GUIs.Monitor/frmStart.Designer.vb +++ b/GUIs.Monitor/frmStart.Designer.vb @@ -38,16 +38,16 @@ Partial Class frmStart Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() + Me.TextEdit2 = New DevExpress.XtraEditors.ComboBoxEdit() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() - Me.TextEdit2 = New DevExpress.XtraEditors.ComboBoxEdit() Me.DockPanel2 = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.TreeList1 = New DevExpress.XtraTreeList.TreeList() - Me.DockPanel3 = New DevExpress.XtraBars.Docking.DockPanel() - Me.DockPanel3_Container = New DevExpress.XtraBars.Docking.ControlContainer() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit() Me.DockPanel1.SuspendLayout() @@ -56,14 +56,16 @@ Partial Class frmStart Me.LayoutControl1.SuspendLayout() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.DockPanel2.SuspendLayout() + Me.DockPanel2_Container.SuspendLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TreeList1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.DockPanel3.SuspendLayout() Me.SuspendLayout() ' 'RibbonControl1 @@ -74,7 +76,7 @@ Partial Class frmStart Me.RibbonControl1.MaxItemId = 2 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl1.Size = New System.Drawing.Size(1085, 159) + Me.RibbonControl1.Size = New System.Drawing.Size(1085, 158) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonItem1 @@ -98,10 +100,10 @@ Partial Class frmStart ' 'RibbonStatusBar1 ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 654) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 652) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1085, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1085, 24) ' 'RibbonPage2 ' @@ -111,8 +113,7 @@ Partial Class frmStart 'DockManager1 ' Me.DockManager1.Form = Me - Me.DockManager1.HiddenPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanel1}) - Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanel2, Me.DockPanel3}) + Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanel1, Me.DockPanel2}) Me.DockManager1.TopZIndexControls.AddRange(New String() {"DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.StatusBar", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"}) ' 'DockPanel1 @@ -120,21 +121,20 @@ Partial Class frmStart Me.DockPanel1.Controls.Add(Me.DockPanel1_Container) Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left Me.DockPanel1.ID = New System.Guid("52706dba-4c71-4145-b8a3-5f5423d32fce") - Me.DockPanel1.Location = New System.Drawing.Point(0, 159) + Me.DockPanel1.Location = New System.Drawing.Point(0, 158) Me.DockPanel1.Name = "DockPanel1" + Me.DockPanel1.Options.ShowCloseButton = False + Me.DockPanel1.Options.ShowMaximizeButton = False Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel1.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Left - Me.DockPanel1.SavedIndex = 0 - Me.DockPanel1.Size = New System.Drawing.Size(200, 495) + Me.DockPanel1.Size = New System.Drawing.Size(200, 494) Me.DockPanel1.Text = "Suche" - Me.DockPanel1.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden ' 'DockPanel1_Container ' Me.DockPanel1_Container.Controls.Add(Me.LayoutControl1) - Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 46) + Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 26) Me.DockPanel1_Container.Name = "DockPanel1_Container" - Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 446) + Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 465) Me.DockPanel1_Container.TabIndex = 0 ' 'LayoutControl1 @@ -146,7 +146,7 @@ Partial Class frmStart Me.LayoutControl1.Location = New System.Drawing.Point(0, 0) Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root - Me.LayoutControl1.Size = New System.Drawing.Size(193, 446) + Me.LayoutControl1.Size = New System.Drawing.Size(193, 465) Me.LayoutControl1.TabIndex = 0 Me.LayoutControl1.Text = "LayoutControl1" ' @@ -169,48 +169,6 @@ Partial Class frmStart Me.ComboBoxEdit1.StyleController = Me.LayoutControl1 Me.ComboBoxEdit1.TabIndex = 5 ' - 'Root - ' - Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] - Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3}) - Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(193, 446) - Me.Root.TextVisible = False - ' - 'LayoutControlItem1 - ' - Me.LayoutControlItem1.Control = Me.TextEdit1 - Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 92) - Me.LayoutControlItem1.Name = "LayoutControlItem1" - Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem1.Size = New System.Drawing.Size(173, 334) - Me.LayoutControlItem1.Text = "Suchwert" - Me.LayoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(63, 13) - ' - 'LayoutControlItem2 - ' - Me.LayoutControlItem2.Control = Me.ComboBoxEdit1 - Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem2.Size = New System.Drawing.Size(173, 46) - Me.LayoutControlItem2.Text = "Attribut" - Me.LayoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(63, 13) - ' - 'LayoutControlItem3 - ' - Me.LayoutControlItem3.Control = Me.TextEdit2 - Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 46) - Me.LayoutControlItem3.Name = "LayoutControlItem3" - Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem3.Size = New System.Drawing.Size(173, 46) - Me.LayoutControlItem3.Text = "Auswertung" - Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(63, 13) - ' 'TextEdit2 ' Me.TextEdit2.Location = New System.Drawing.Point(15, 77) @@ -221,59 +179,102 @@ Partial Class frmStart Me.TextEdit2.StyleController = Me.LayoutControl1 Me.TextEdit2.TabIndex = 6 ' + 'Root + ' + Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.Root.GroupBordersVisible = False + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3}) + Me.Root.Name = "Root" + Me.Root.Size = New System.Drawing.Size(193, 465) + Me.Root.TextVisible = False + ' + 'LayoutControlItem1 + ' + Me.LayoutControlItem1.Control = Me.TextEdit1 + Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 92) + Me.LayoutControlItem1.Name = "LayoutControlItem1" + Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem1.Size = New System.Drawing.Size(173, 353) + Me.LayoutControlItem1.Text = "Suchwert" + Me.LayoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(58, 13) + ' + 'LayoutControlItem2 + ' + Me.LayoutControlItem2.Control = Me.ComboBoxEdit1 + Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem2.Name = "LayoutControlItem2" + Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem2.Size = New System.Drawing.Size(173, 46) + Me.LayoutControlItem2.Text = "Attribut" + Me.LayoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(58, 13) + ' + 'LayoutControlItem3 + ' + Me.LayoutControlItem3.Control = Me.TextEdit2 + Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 46) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem3.Size = New System.Drawing.Size(173, 46) + Me.LayoutControlItem3.Text = "Auswertung" + Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(58, 13) + ' 'DockPanel2 ' Me.DockPanel2.Controls.Add(Me.DockPanel2_Container) Me.DockPanel2.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right Me.DockPanel2.ID = New System.Guid("157c74a2-d255-4e6b-b789-bde43010b2af") - Me.DockPanel2.Location = New System.Drawing.Point(885, 159) + Me.DockPanel2.Location = New System.Drawing.Point(885, 158) Me.DockPanel2.Name = "DockPanel2" + Me.DockPanel2.Options.ShowCloseButton = False + Me.DockPanel2.Options.ShowMaximizeButton = False Me.DockPanel2.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel2.Size = New System.Drawing.Size(200, 495) + Me.DockPanel2.Size = New System.Drawing.Size(200, 494) Me.DockPanel2.Text = "Details" ' 'DockPanel2_Container ' - Me.DockPanel2_Container.Location = New System.Drawing.Point(4, 46) + Me.DockPanel2_Container.Controls.Add(Me.GridControl1) + Me.DockPanel2_Container.Location = New System.Drawing.Point(4, 26) Me.DockPanel2_Container.Name = "DockPanel2_Container" - Me.DockPanel2_Container.Size = New System.Drawing.Size(193, 446) + Me.DockPanel2_Container.Size = New System.Drawing.Size(193, 465) Me.DockPanel2_Container.TabIndex = 0 ' + 'GridControl1 + ' + Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControl1.Location = New System.Drawing.Point(0, 0) + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.MenuManager = Me.RibbonControl1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(193, 465) + Me.GridControl1.TabIndex = 0 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + ' 'TreeList1 ' Me.TreeList1.Dock = System.Windows.Forms.DockStyle.Fill - Me.TreeList1.Location = New System.Drawing.Point(200, 159) + Me.TreeList1.Location = New System.Drawing.Point(200, 158) Me.TreeList1.MenuManager = Me.RibbonControl1 Me.TreeList1.Name = "TreeList1" - Me.TreeList1.Size = New System.Drawing.Size(685, 495) + Me.TreeList1.Size = New System.Drawing.Size(685, 494) Me.TreeList1.TabIndex = 4 ' - 'DockPanel3 - ' - Me.DockPanel3.Controls.Add(Me.DockPanel3_Container) - Me.DockPanel3.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left - Me.DockPanel3.ID = New System.Guid("d2ef8b04-1b9f-49ee-8a72-31210e059dbe") - Me.DockPanel3.Location = New System.Drawing.Point(0, 159) - Me.DockPanel3.Name = "DockPanel3" - Me.DockPanel3.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel3.Size = New System.Drawing.Size(200, 495) - Me.DockPanel3.Text = "DockPanel3" - ' - 'DockPanel3_Container - ' - Me.DockPanel3_Container.Location = New System.Drawing.Point(3, 46) - Me.DockPanel3_Container.Name = "DockPanel3_Container" - Me.DockPanel3_Container.Size = New System.Drawing.Size(193, 446) - Me.DockPanel3_Container.TabIndex = 0 - ' 'frmStart ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1085, 676) Me.Controls.Add(Me.TreeList1) - Me.Controls.Add(Me.DockPanel3) Me.Controls.Add(Me.DockPanel2) + Me.Controls.Add(Me.DockPanel1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.IconOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.charttype_line @@ -289,14 +290,16 @@ Partial Class frmStart Me.LayoutControl1.ResumeLayout(False) CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.DockPanel2.ResumeLayout(False) + Me.DockPanel2_Container.ResumeLayout(False) + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TreeList1, System.ComponentModel.ISupportInitialize).EndInit() - Me.DockPanel3.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -322,6 +325,6 @@ Partial Class frmStart Friend WithEvents DockPanel2 As DevExpress.XtraBars.Docking.DockPanel Friend WithEvents DockPanel2_Container As DevExpress.XtraBars.Docking.ControlContainer Friend WithEvents TreeList1 As DevExpress.XtraTreeList.TreeList - Friend WithEvents DockPanel3 As DevExpress.XtraBars.Docking.DockPanel - Friend WithEvents DockPanel3_Container As DevExpress.XtraBars.Docking.ControlContainer + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView End Class