Bereinigungen

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()
+            Dim oTitle As ChartTitle = New ChartTitle With {
-            oTitle.Text = pTitle
+                .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
+            ChartViewResultContainer.SplitterPosition = CInt(ChartViewResultContainer.Height / 2)
-            splitContainer1.SplitterPosition = splitContainer1.Width / 2
+            splitContainer1.SplitterPosition = CInt(splitContainer1.Width / 2)
-            splitContainer2.SplitterPosition = splitContainer2.Width / 2
+            splitContainer2.SplitterPosition = CInt(splitContainer2.Width / 2)
         End If
     End Sub
 

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 oSplitContainerTop As SplitContainerControl
-        Dim oSplitContainer2 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 {
+        oSplitContainerTop = New SplitContainerControl With {
-            .Name = "SplitContainer1",
+            .Name = "SplitContainerTop",
             .Dock = DockStyle.Fill,
             .Horizontal = True,
             .IsSplitterFixed = True
         }
 
-        oSplitContainer2 = New SplitContainerControl With {
+        oSplitContainerBottom = New SplitContainerControl With {
-            .Name = "SplitContainer2",
+            .Name = "SplitContainerBottom",
             .Dock = DockStyle.Fill,
             .Horizontal = True,
             .IsSplitterFixed = True
         }
 
-        oChartViewResultContainer.Panel1.AddControl(oSplitContainer1)
+        oChartViewResultContainer.Panel1.AddControl(oSplitContainerTop)
-        oChartViewResultContainer.Panel2.AddControl(oSplitContainer2)
+        oChartViewResultContainer.Panel2.AddControl(oSplitContainerBottom)
 
-        Dim oChartControl11 As ChartControl = New ChartControl With {
+        Dim oChartControlTopLeft As ChartControl = New ChartControl With {
-            .Name = "ChartControl11",
+            .Name = "ChartControlTopLeft",
             .Dock = DockStyle.Fill
         }
-        Dim oChartControl12 As ChartControl = New ChartControl With {
+        Dim oChartControlTopRight As ChartControl = New ChartControl With {
-            .Name = "ChartControl12",
+            .Name = "ChartControlTopRight",
             .Dock = DockStyle.Fill
         }
-        Dim oChartControl21 As ChartControl = New ChartControl With {
+        Dim oChartControlBottomLeft As ChartControl = New ChartControl With {
-            .Name = "ChartControl21",
+            .Name = "ChartControlBottomLeft",
             .Dock = DockStyle.Fill
         }
-        Dim oChartControl22 As ChartControl = New ChartControl With {
+        Dim oChartControlBottomRight As ChartControl = New ChartControl With {
-            .Name = "ChartControl22",
+            .Name = "ChartControlBottomRight",
             .Dock = DockStyle.Fill
         }
 
-        oSplitContainer1.Panel1.AddControl(oChartControl11)
+        oSplitContainerTop.Panel1.AddControl(oChartControlTopLeft)
-        oSplitContainer1.Panel2.AddControl(oChartControl12)
+        oSplitContainerTop.Panel2.AddControl(oChartControlTopRight)
-        oSplitContainer2.Panel1.AddControl(oChartControl21)
+        oSplitContainerBottom.Panel1.AddControl(oChartControlBottomLeft)
-        oSplitContainer2.Panel2.AddControl(oChartControl22)
+        oSplitContainerBottom.Panel2.AddControl(oChartControlBottomRight)
 
         Return oChartViewResultContainer
     End Function