diff --git a/GUIs.Monitor/Forms/frmMonitor.vb b/GUIs.Monitor/Forms/frmMonitor.vb index 4ec6a46..bd63edf 100644 --- a/GUIs.Monitor/Forms/frmMonitor.vb +++ b/GUIs.Monitor/Forms/frmMonitor.vb @@ -45,7 +45,7 @@ Public Class frmMonitor Private SQLResultGrids As List(Of GridControl) Private SQLResultTabs As List(Of XtraTabPage) - Private SQLResultGridIndex As Integer = 0 + 'Private SQLResultGridIndex As Integer = 0 Private ActiveSQLResultGrid As GridControl Private FileResultViewers As List(Of DocumentViewer) @@ -219,6 +219,7 @@ Public Class frmMonitor If oSearch.SQLCommand.Length > 0 Then oSQL = Patterns.ReplaceControlValues(oSearch.SQLCommand, oControls) + Logger.Debug($"SQL after replacing placeholder: [{0}]", oSQL) oTable = Await Database.GetDatatableAsync(oSQL) End If @@ -432,6 +433,7 @@ Public Class frmMonitor End Select Dim oSQL As String = Patterns.ReplaceControlValues(pChartParameters.SQLCommand, pControls) + Logger.Debug($"SQL after replacing placeholder: [{0}]", oSQL) Dim oTable As DataTable = Await Database.GetDatatableAsync(oSQL) Dim xAxisTitle As String = pChartParameters.Argument @@ -453,8 +455,9 @@ Public Class frmMonitor ' Wenn bereits ein Titel vorhanden ist, wird kein neuer ergänzt ' relevant bei mehrere Charts in einem ChartControl If pChartView.Titles.Count = 0 Then - Dim oTitle As ChartTitle = New ChartTitle() - oTitle.Text = pTitle + Dim oTitle As ChartTitle = New ChartTitle With { + .Text = pTitle + } pChartView.Titles.Add(oTitle) End If End Sub @@ -1207,9 +1210,9 @@ Public Class frmMonitor Dim splitContainer1 As SplitContainerControl = CType(ChartViewResultContainer.Panel1.Controls(0), SplitContainerControl) Dim splitContainer2 As SplitContainerControl = CType(ChartViewResultContainer.Panel2.Controls(0), SplitContainerControl) - ChartViewResultContainer.SplitterPosition = ChartViewResultContainer.Height / 2 - splitContainer1.SplitterPosition = splitContainer1.Width / 2 - splitContainer2.SplitterPosition = splitContainer2.Width / 2 + ChartViewResultContainer.SplitterPosition = CInt(ChartViewResultContainer.Height / 2) + splitContainer1.SplitterPosition = CInt(splitContainer1.Width / 2) + splitContainer2.SplitterPosition = CInt(splitContainer2.Width / 2) End If End Sub diff --git a/GUIs.Monitor/Helper/GridLoader.vb b/GUIs.Monitor/Helper/GridLoader.vb index d789581..62395ec 100644 --- a/GUIs.Monitor/Helper/GridLoader.vb +++ b/GUIs.Monitor/Helper/GridLoader.vb @@ -86,8 +86,8 @@ Public Class GridLoader Public Function InitChartViewResultContainer() As SplitContainerControl ' Vorbereiten der SplitContainer-Struktur inkl. der ChartControls Dim oChartViewResultContainer As SplitContainerControl - Dim oSplitContainer1 As SplitContainerControl - Dim oSplitContainer2 As SplitContainerControl + Dim oSplitContainerTop As SplitContainerControl + Dim oSplitContainerBottom As SplitContainerControl oChartViewResultContainer = New SplitContainerControl With { .Name = "ChartViewResultContainer", @@ -97,44 +97,44 @@ Public Class GridLoader .IsSplitterFixed = True } - oSplitContainer1 = New SplitContainerControl With { - .Name = "SplitContainer1", + oSplitContainerTop = New SplitContainerControl With { + .Name = "SplitContainerTop", .Dock = DockStyle.Fill, .Horizontal = True, .IsSplitterFixed = True } - oSplitContainer2 = New SplitContainerControl With { - .Name = "SplitContainer2", + oSplitContainerBottom = New SplitContainerControl With { + .Name = "SplitContainerBottom", .Dock = DockStyle.Fill, .Horizontal = True, .IsSplitterFixed = True } - oChartViewResultContainer.Panel1.AddControl(oSplitContainer1) - oChartViewResultContainer.Panel2.AddControl(oSplitContainer2) + oChartViewResultContainer.Panel1.AddControl(oSplitContainerTop) + oChartViewResultContainer.Panel2.AddControl(oSplitContainerBottom) - Dim oChartControl11 As ChartControl = New ChartControl With { - .Name = "ChartControl11", + Dim oChartControlTopLeft As ChartControl = New ChartControl With { + .Name = "ChartControlTopLeft", .Dock = DockStyle.Fill } - Dim oChartControl12 As ChartControl = New ChartControl With { - .Name = "ChartControl12", + Dim oChartControlTopRight As ChartControl = New ChartControl With { + .Name = "ChartControlTopRight", .Dock = DockStyle.Fill } - Dim oChartControl21 As ChartControl = New ChartControl With { - .Name = "ChartControl21", + Dim oChartControlBottomLeft As ChartControl = New ChartControl With { + .Name = "ChartControlBottomLeft", .Dock = DockStyle.Fill } - Dim oChartControl22 As ChartControl = New ChartControl With { - .Name = "ChartControl22", + Dim oChartControlBottomRight As ChartControl = New ChartControl With { + .Name = "ChartControlBottomRight", .Dock = DockStyle.Fill } - oSplitContainer1.Panel1.AddControl(oChartControl11) - oSplitContainer1.Panel2.AddControl(oChartControl12) - oSplitContainer2.Panel1.AddControl(oChartControl21) - oSplitContainer2.Panel2.AddControl(oChartControl22) + oSplitContainerTop.Panel1.AddControl(oChartControlTopLeft) + oSplitContainerTop.Panel2.AddControl(oChartControlTopRight) + oSplitContainerBottom.Panel1.AddControl(oChartControlBottomLeft) + oSplitContainerBottom.Panel2.AddControl(oChartControlBottomRight) Return oChartViewResultContainer End Function