diff --git a/app/DD-Record-Organiser/ClassLayout.vb b/app/DD-Record-Organiser/ClassLayout.vb index f379ebf..0ab6b66 100644 --- a/app/DD-Record-Organiser/ClassLayout.vb +++ b/app/DD-Record-Organiser/ClassLayout.vb @@ -160,7 +160,7 @@ Public Class ClassLayout End Sub Public Function Load() As System.Collections.Generic.List(Of ClassSetting) - Dim Result As System.Collections.Generic.List(Of ClassSetting) = New System.Collections.Generic.List(Of ClassSetting)() + Dim Result As List(Of ClassSetting) = New List(Of ClassSetting)() If Not File.Exists(_filename) Then Return Result diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index efa0fb4..222bc86 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -1294,6 +1294,7 @@ + @@ -1387,6 +1388,7 @@ + diff --git a/app/DD-Record-Organiser/My Project/Resources.Designer.vb b/app/DD-Record-Organiser/My Project/Resources.Designer.vb index 0fcfd98..6a2298f 100644 --- a/app/DD-Record-Organiser/My Project/Resources.Designer.vb +++ b/app/DD-Record-Organiser/My Project/Resources.Designer.vb @@ -370,6 +370,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property asset_pie_series_chart_on_12X12() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("asset_pie-series-chart_on_12X12", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1580,6 +1590,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Reports_collapsed_12995_32x() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Reports-collapsed_12995_32x", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/app/DD-Record-Organiser/My Project/Resources.resx b/app/DD-Record-Organiser/My Project/Resources.resx index d22d6cd..57248fc 100644 --- a/app/DD-Record-Organiser/My Project/Resources.resx +++ b/app/DD-Record-Organiser/My Project/Resources.resx @@ -169,6 +169,9 @@ ..\Resources\Files_7954.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\asset_pie-series-chart_on_12X12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Men3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -535,6 +538,9 @@ ..\Resources\bricks.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\asset_pie-series-chart_on_24X24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\database_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -661,7 +667,7 @@ ..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\asset_pie-series-chart_on_24X24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Reports-collapsed_12995_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/app/DD-Record-Organiser/Resources/Reports-collapsed_12995_32x.png b/app/DD-Record-Organiser/Resources/Reports-collapsed_12995_32x.png new file mode 100644 index 0000000..d494f85 Binary files /dev/null and b/app/DD-Record-Organiser/Resources/Reports-collapsed_12995_32x.png differ diff --git a/app/DD-Record-Organiser/Resources/asset_pie-series-chart_on_12X12.png b/app/DD-Record-Organiser/Resources/asset_pie-series-chart_on_12X12.png new file mode 100644 index 0000000..fa63c3b Binary files /dev/null and b/app/DD-Record-Organiser/Resources/asset_pie-series-chart_on_12X12.png differ diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index 6c4d6ee..28ba57c 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb @@ -271,7 +271,7 @@ Partial Class frmConstructor_Main ' 'AuswertungAnzeigenToolStripMenuItem ' - Me.AuswertungAnzeigenToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.asset_pie_series_chart_on_24X24 + Me.AuswertungAnzeigenToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.Reports_collapsed_12995_32x Me.AuswertungAnzeigenToolStripMenuItem.Name = "AuswertungAnzeigenToolStripMenuItem" resources.ApplyResources(Me.AuswertungAnzeigenToolStripMenuItem, "AuswertungAnzeigenToolStripMenuItem") ' diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index 5c66344..8f2c49b 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -165,7 +165,7 @@ Auswertung anzeigen - 195, 114 + 195, 136 CMSEntity diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index 9a1ac01..257aa6c 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -5174,7 +5174,8 @@ Public Class frmConstructor_Main End If End Sub Private Sub grvwGrid_MouseDown(sender As Object, e As MouseEventArgs) Handles grvwGrid.MouseDown, grvwTiles.MouseDown, grvwCarousel.MouseDown - Dim view As GridView = CType(sender, GridView) + Dim view As BaseView = CType(sender, BaseView) + If e.Button = Windows.Forms.MouseButtons.Right Then GRIDRightMouse_Clicked = True Else @@ -5186,7 +5187,7 @@ Public Class frmConstructor_Main End If End Sub Private Sub grvwGrid_MouseMove(sender As Object, e As MouseEventArgs) Handles grvwGrid.MouseMove, grvwTiles.MouseMove, grvwCarousel.MouseMove - Dim view As GridView = CType(sender, GridView) + Dim view As BaseView = CType(sender, BaseView) If e.Button = MouseButtons.Left And Not GRIDdownHitInfo Is Nothing Then Dim dragSize As Size = SystemInformation.DragSize diff --git a/app/DD-Record-Organiser/frmDiagrams.Designer.vb b/app/DD-Record-Organiser/frmDiagrams.Designer.vb index 05b8f6e..7fb2ecd 100644 --- a/app/DD-Record-Organiser/frmDiagrams.Designer.vb +++ b/app/DD-Record-Organiser/frmDiagrams.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmDiagrams 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDiagrams)) Me.SplitContainerMain = New System.Windows.Forms.SplitContainer() Me.SplitContainerTop = New System.Windows.Forms.SplitContainer() Me.ChartTopLeft = New DevExpress.XtraCharts.ChartControl() @@ -141,8 +142,9 @@ Partial Class frmDiagrams Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1160, 671) Me.Controls.Add(Me.SplitContainerMain) + Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "frmDiagrams" - Me.Text = "frmDiagrams" + Me.Text = "Auswertung" Me.SplitContainerMain.Panel1.ResumeLayout(False) Me.SplitContainerMain.Panel2.ResumeLayout(False) CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/app/DD-Record-Organiser/frmDiagrams.resx b/app/DD-Record-Organiser/frmDiagrams.resx index 1af7de1..fa68ea4 100644 --- a/app/DD-Record-Organiser/frmDiagrams.resx +++ b/app/DD-Record-Organiser/frmDiagrams.resx @@ -117,4 +117,178 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + AAABAAYAICAQAAEABADoAgAAZgAAABAQEAABAAQAKAEAAE4DAAAgIAAAAQAIAKgIAAB2BAAAEBAAAAEA + CABoBQAAHg0AACAgAAABACAAqBAAAIYSAAAQEAAAAQAgAGgEAAAuIwAAKAAAACAAAABAAAAAAQAEAAAA + AAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA + /wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAA//////////////////8AAP//////////////////AAD/ + d3d3d3d3d3d3d3d3/wAA/3d3d3d3d3d3d3d3d/8AAP93/////////////3f/AAD/d/////////////93 + /wAA/3f/d3f/d3f/d3f/d/8AAP93/3d3/3d3/3d3/3f/AAD/d/93d/93d/93d/93/wAA/3f/d3f/d3f/ + d3f/d/8AAP93/////3d3/3d3/3f/AAD/d/////93d/93d/93/wAA/3f/////d3f/d3f/d/8AAP93//// + /3d3/3d3/3f/AAD/d/////////93d/93/wAA/3f/////////d3f/d/8AAP93/3d//////3d3/3f/AAD/ + d/93f/////93d/93/wAA/3f/////////////d/8AAP93/////////////3f/AAD/d/93d3d3//////93 + /wAA/3f/d3d3d///////d/8AAP93/////////////3f/AAD/d/////////////93/wAA/3f/d3d3d3d3 + d///d/8AAP93/3d3d3d3d3f//3f/AAD/d/////////////93/wAA/3f/////////////d/8AAP93d3d3 + d3d3d3d3d3f/AAD/d3d3d3d3d3d3d3d3/wAA//////////////////8AAP//////////////////AMAA + AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA + AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA + AAPAAAADKAAAABAAAAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACA + gACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAP////////8A93 + d3d3d3fwD3//////9/APf3f3f3f38A9/d/d/d/fwD3//93939/APf//3f3f38A9/////d/fwD393//93 + 9/APf//////38A9/d3f///fwD3//////9/APf3d3d3/38A9///////fwD3d3d3d3d/AP////////8IAB + AACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIAB + AAAoAAAAIAAAAEAAAAABAAgAAAAAAAAEAAAAAAAAAAAAAAABAAAAAQAAAAAAAEJCQgDx7/AA9vb2AAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAAAAwMDAwMDAwMDAwMD + AwMDAwMDAwMDAwMDAwMDAwAAAAADAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAAAAAAMDAQEBAQEB + AQEBAQEBAQEBAQEBAQEBAQEBAwMAAAAAAwMBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEDAwAAAAADAwEB + AgICAgICAgICAgICAgICAgICAgIBAQMDAAAAAAMDAQECAgICAgICAgICAgICAgICAgICAgEBAwMAAAAA + AwMBAQICAQEBAQICAQEBAQICAQEBAQICAQEDAwAAAAADAwEBAgIBAQEBAgIBAQEBAgIBAQEBAgIBAQMD + AAAAAAMDAQECAgEBAQECAgEBAQECAgEBAQECAgEBAwMAAAAAAwMBAQICAQEBAQICAQEBAQICAQEBAQIC + AQEDAwAAAAADAwEBAgICAgICAgIBAQEBAgIBAQEBAgIBAQMDAAAAAAMDAQECAgICAgICAgEBAQECAgEB + AQECAgEBAwMAAAAAAwMBAQICAgICAgICAQEBAQICAQEBAQICAQEDAwAAAAADAwEBAgICAgICAgIBAQEB + AgIBAQEBAgIBAQMDAAAAAAMDAQECAgICAgICAgICAgICAgEBAQECAgEBAwMAAAAAAwMBAQICAgICAgIC + AgICAgICAQEBAQICAQEDAwAAAAADAwEBAgIBAQECAgICAgICAgIBAQEBAgIBAQMDAAAAAAMDAQECAgEB + AQICAgICAgICAgEBAQECAgEBAwMAAAAAAwMBAQICAgICAgICAgICAgICAgICAgICAQEDAwAAAAADAwEB + AgICAgICAgICAgICAgICAgICAgIBAQMDAAAAAAMDAQECAgEBAQEBAQEBAgICAgICAgICAgEBAwMAAAAA + AwMBAQICAQEBAQEBAQECAgICAgICAgICAQEDAwAAAAADAwEBAgICAgICAgICAgICAgICAgICAgIBAQMD + AAAAAAMDAQECAgICAgICAgICAgICAgICAgICAgEBAwMAAAAAAwMBAQICAQEBAQEBAQEBAQEBAQECAgIC + AQEDAwAAAAADAwEBAgIBAQEBAQEBAQEBAQEBAQICAgIBAQMDAAAAAAMDAQECAgICAgICAgICAgICAgIC + AgICAgEBAwMAAAAAAwMBAQICAgICAgICAgICAgICAgICAgICAQEDAwAAAAADAwEBAQEBAQEBAQEBAQEB + AQEBAQEBAQEBAQMDAAAAAAMDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAwMAAAAAAwMDAwMDAwMDAwMD + AwMDAwMDAwMDAwMDAwMDAwAAAAADAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAADAAAADwAAAA8AA + AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA + AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAAygA + AAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAAAAQkJCAPHv8AD29vYAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AAAMDAwMDAwMDAwMDAwMDAAAD + AQEBAQEBAQEBAQEBAwAAAwECAgICAgICAgICAQMAAAMBAgEBAgEBAgEBAgEDAAADAQIBAQIBAQIBAQIB + AwAAAwECAgICAQECAQECAQMAAAMBAgICAgEBAgEBAgEDAAADAQICAgICAgIBAQIBAwAAAwECAQECAgIC + AQECAQMAAAMBAgICAgICAgICAgEDAAADAQIBAQEBAgICAgIBAwAAAwECAgICAgICAgICAQMAAAMBAgEB + AQEBAQECAgEDAAADAQICAgICAgICAgIBAwAAAwEBAQEBAQEBAQEBAQMAAAMDAwMDAwMDAwMDAwMDAIAB + AACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIAB + AAAoAAAAIAAAAEAAAAABACAAAAAAAIAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/9vb2//b2 + 9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2 + 9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb2 + 9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2 + 9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v8AAAAAAAAAAAAA + AAAAAAAA9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC + Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAA + AAAAAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC + Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2 + 9v/29vb/AAAAAAAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JC + Qv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv + 8P9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC/0JC + Qv9CQkL/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JC + Qv/x7/D/8e/w/0JCQv9CQkL/QkJC/0JCQv/x7/D/8e/w/0JCQv9CQkL/QkJC/0JCQv/x7/D/8e/w/0JC + Qv9CQkL/QkJC/0JCQv/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb2//b2 + 9v9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC//Hv + 8P/x7/D/QkJC/0JCQv9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAAAA + AAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC/0JC + Qv9CQkL/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAA + AAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JC + Qv9CQkL/QkJC/0JCQv/x7/D/8e/w/0JCQv9CQkL/QkJC/0JCQv/x7/D/8e/w/0JCQv9CQkL/9vb2//b2 + 9v8AAAAAAAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/QkJC/0JCQv9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC//Hv8P/x7/D/QkJC/0JC + Qv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv + 8P9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv + 8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/QkJC/0JCQv/x7/D/8e/w/0JCQv9CQkL/QkJC/0JC + Qv/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv + 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JC + Qv9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JC + Qv9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv + 8P9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb2 + 9v/29vb/QkJC/0JCQv/x7/D/8e/w/0JCQv9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/8e/w/0JCQv9CQkL/QkJC/0JCQv/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAA + AAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAA + AAAAAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC//b2 + 9v/29vb/AAAAAAAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JC + Qv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/QkJC/0JC + Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv + 8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JC + Qv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb2//b2 + 9v9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAAAA + AAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC + Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAA + AAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC + Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b2 + 9v8AAAAAAAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JC + Qv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv + 8P9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JC + Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC + Qv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC/0JC + Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC + Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAD29vb/9vb2//b2 + 9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2 + 9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb2 + 9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2 + 9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v8AAAAAAAAAAMAA + AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA + AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA + AAPAAAADKAAAABAAAAAgAAAAAQAgAAAAAABABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/9vb2//b2 + 9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2/wAAAAAAAAAA9vb2/0JC + Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v8AAAAAAAAAAPb2 + 9v9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv/29vb/AAAAAAAA + AAD29vb/QkJC//Hv8P9CQkL/QkJC//Hv8P9CQkL/QkJC//Hv8P9CQkL/QkJC//Hv8P9CQkL/9vb2/wAA + AAAAAAAA9vb2/0JCQv/x7/D/QkJC/0JCQv/x7/D/QkJC/0JCQv/x7/D/QkJC/0JCQv/x7/D/QkJC//b2 + 9v8AAAAAAAAAAPb29v9CQkL/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/8e/w/0JCQv9CQkL/8e/w/0JC + Qv/29vb/AAAAAAAAAAD29vb/QkJC//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC//Hv8P9CQkL/QkJC//Hv + 8P9CQkL/9vb2/wAAAAAAAAAA9vb2/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JC + Qv/x7/D/QkJC//b29v8AAAAAAAAAAPb29v9CQkL/8e/w/0JCQv9CQkL/8e/w//Hv8P/x7/D/8e/w/0JC + Qv9CQkL/8e/w/0JCQv/29vb/AAAAAAAAAAD29vb/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/8e/w//Hv8P9CQkL/9vb2/wAAAAAAAAAA9vb2/0JCQv/x7/D/QkJC/0JCQv9CQkL/QkJC//Hv + 8P/x7/D/8e/w//Hv8P/x7/D/QkJC//b29v8AAAAAAAAAAPb29v9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv + 8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv/29vb/AAAAAAAAAAD29vb/QkJC//Hv8P9CQkL/QkJC/0JC + Qv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/9vb2/wAAAAAAAAAA9vb2/0JCQv/x7/D/8e/w//Hv + 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC//b29v8AAAAAAAAAAPb29v9CQkL/QkJC/0JC + Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/AAAAAAAAAAD29vb/9vb2//b2 + 9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2/wAAAACAAQAAgAEAAIAB + AACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAA + + \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmDiagrams.vb b/app/DD-Record-Organiser/frmDiagrams.vb index 205c324..063210d 100644 --- a/app/DD-Record-Organiser/frmDiagrams.vb +++ b/app/DD-Record-Organiser/frmDiagrams.vb @@ -2,47 +2,188 @@ Public Class frmDiagrams - Private Sub frmDiagrams_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Private Function Get_Splitter_Layout_Filename() As String + Dim Filename As String = String.Format("{0}-Diagram-SplitterLayout.xml", CURRENT_FORM_ID) + Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename) + End Function + + Private Function Get_Settings(settings As List(Of ClassSetting)) As List(Of ClassSetting) + settings.Add(New ClassSetting("SplitterMainDistance", SplitContainerMain.SplitterDistance)) + settings.Add(New ClassSetting("SplitterTopDistance", SplitContainerTop.SplitterDistance)) + settings.Add(New ClassSetting("SplitterBottomDistance", SplitContainerBottom.SplitterDistance)) + + Return settings + End Function + + Private Sub Load_Settings() Try - Dim CHART_ENTITY_SQL As String = "SELECT * FROM TBPMO_CHART_ENTITY WHERE ENTITY_ID = " & CURRENT_FORM_ID - Dim CHART_ENTITY_DT As DataTable = ClassDatabase.Return_Datatable(CHART_ENTITY_SQL) + ' Load Splitter Settings + Dim XMLPath As String = Get_Splitter_Layout_Filename() + Dim layout As New ClassLayout(XMLPath) + Dim settings As List(Of ClassSetting) + settings = layout.Load() - ' Check if Bottom Chart containers are needed - Select Case CHART_ENTITY_DT.Rows.Count - Case 0 - MsgBox("No Diagrams found") - Case 1 - ' Show only ChartTopLeft - SplitContainerTop.Panel2Collapsed = True - ' Collapse SplitContainerBottom - SplitContainerMain.Panel2Collapsed = True - Case 2 - ' Collapse SplitContainerBottom - SplitContainerMain.Panel2Collapsed = True - Case 3 - ' Collapse ChartBottomRight - SplitContainerBottom.Panel2Collapsed = True - ' Show SplitContainerBottom - SplitContainerMain.Panel2Collapsed = False - Case 4 - ' Show SplitContainerBottom - SplitContainerMain.Panel2Collapsed = False - End Select + ' No Settings found, save current values + If settings.Count = 0 Then + 'Adjust Width and Height of containers + Dim containerW = Me.Width / 2 + Dim containerH = Me.Height / 2 + SplitContainerTop.SplitterDistance = containerW + SplitContainerBottom.SplitterDistance = containerW + SplitContainerMain.SplitterDistance = containerH - 'Adjust With and Height of containers - Dim containerW = Me.Width / 2 - SplitContainerTop.SplitterDistance = containerW - SplitContainerBottom.SplitterDistance = containerW + settings = Get_Settings(settings) + layout.Save(settings) + End If - Dim containerH = Me.Height / 2 - SplitContainerMain.SplitterDistance = containerH + 'Apply Settings + For Each setting As ClassSetting In settings + If setting._name = "SplitterMainDistance" Then + SplitContainerMain.SplitterDistance = setting._value + End If - ' Create Charts - For Each row As DataRow In CHART_ENTITY_DT.Rows - Dim series As Series + If setting._name = "SplitterTopDistance" Then + SplitContainerTop.SplitterDistance = setting._value + End If + + If setting._name = "SplitterBottomDistance" Then + SplitContainerBottom.SplitterDistance = setting._value + End If + Next + Catch ex As Exception + MsgBox("Error while loading Settings for frmDiagrams: " & vbNewLine & ex.Message) + End Try + End Sub + + Private Sub Configure_Split_Containers(VisibleContainers As Integer) + Select Case VisibleContainers + Case 0 + MsgBox("No Diagrams found") + Case 1 + ' Show only ChartTopLeft + SplitContainerTop.Panel2Collapsed = True + ' Collapse SplitContainerBottom + SplitContainerMain.Panel2Collapsed = True + Case 2 + ' Collapse SplitContainerBottom + SplitContainerMain.Panel2Collapsed = True + Case 3 + ' Collapse ChartBottomRight + SplitContainerBottom.Panel2Collapsed = True + ' Show SplitContainerBottom + SplitContainerMain.Panel2Collapsed = False + Case 4 + ' Show SplitContainerBottom + SplitContainerMain.Panel2Collapsed = False + End Select + End Sub + + Private Sub frmDiagrams_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing + Dim XMLPath As String = Get_Splitter_Layout_Filename() + Dim layout As New ClassLayout(XMLPath) + Dim settings As New List(Of ClassSetting) + + settings = Get_Settings(settings) + layout.Save(settings) + End Sub + + Private Function Create_Series(title As String, type As String) As Series + Dim series As Series + + Select Case type + Case "BAR" + series = New Series(title, ViewType.Bar) + Case "LINE" + series = New Series(title, ViewType.Line) + Case "AREA" + series = New Series(title, ViewType.Area) + Case "PIE" + series = New Series(title, ViewType.Pie) + series.Label.TextPattern = "{A}: {VP:p0}" + Dim view As PieSeriesView = DirectCast(series.View, PieSeriesView) + view.Titles.Add(New SeriesTitle()) + view.Titles(0).Text = title + Case Else + series = New Series(title, ViewType.Bar) + End Select + + Return series + End Function + + Private Function Select_Chart(index As Integer) + Select Case index + Case 0 + Return ChartTopLeft + Case 1 + Return ChartTopRight + Case 2 + Return ChartBottomLeft + Case Else + Return ChartBottomRight + End Select + End Function + + Private Sub frmDiagrams_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Dim CHART_ENTITY_SQL, CHART_GROUPS_SQL As String + Dim CHART_ENTITY_DT, CHART_GROUPS_DT As DataTable + + CHART_ENTITY_SQL = String.Format("SELECT * FROM TBPMO_CHART_ENTITY WHERE ENTITY_ID = {0}", CURRENT_FORM_ID) + CHART_GROUPS_SQL = String.Format("SELECT DISTINCT GROUP_ID FROM TBPMO_CHART_ENTITY WHERE ENTITY_ID = {0} ORDER BY GROUP_ID", CURRENT_FORM_ID) + CHART_ENTITY_DT = ClassDatabase.Return_Datatable(CHART_ENTITY_SQL) + CHART_GROUPS_DT = ClassDatabase.Return_Datatable(CHART_GROUPS_SQL) + + Dim Groups As DataRowCollection = CHART_GROUPS_DT.Rows + Dim GroupCount As Integer = Groups.Count + + Load_Settings() + Configure_Split_Containers(GroupCount) + + If GroupCount > 1 Then + For Each gRow As DataRow In Groups + Dim groupIndex As Integer = Groups.IndexOf(gRow) + Dim groupName As String = gRow.Item("GROUP_ID") + + Dim groupCharts = CHART_ENTITY_DT.Select(String.Format("GROUP_ID = '{0}'", groupName)) Dim chart As ChartControl - Dim i As Integer = CHART_ENTITY_DT.Rows.IndexOf(row) + For Each cRow As DataRow In groupCharts + + Dim type = cRow.Item("TYPE_CHART") + Dim title = cRow.Item("TITLE") + Dim guid = cRow.Item("GUID") + Dim value = cRow.Item("VALUE") + Dim argument = cRow.Item("ARGUMENT") + Dim sql = cRow.Item("SQL_COMMAND") + + Dim DATA_DT As DataTable = ClassDatabase.Return_Datatable(sql) + + Dim series As Series = Create_Series(title, type) + + ' Select Current Chart + chart = Select_Chart(groupIndex) + + ' Set DataSource + chart.DataSource = DATA_DT + + ' Set shown Columns for Chart + series.ArgumentDataMember = argument + series.ValueDataMembers.AddRange(New String() {value}) + + 'set some options + chart.Legend.Visibility = DevExpress.Utils.DefaultBoolean.True + + ' Show Data + chart.Series.Add(series) + + Next ' End Charts + Next 'End Groups + Else + ' Create Charts + For Each row As DataRow In CHART_ENTITY_DT.Rows + + Dim chart As ChartControl + + Dim chartIndex As Integer = CHART_ENTITY_DT.Rows.IndexOf(row) Dim type = row.Item("TYPE_CHART") Dim title = row.Item("TITLE") @@ -53,29 +194,11 @@ Public Class frmDiagrams Dim DATA_DT As DataTable = ClassDatabase.Return_Datatable(sql) - ' Create series based on type - Select Case type - Case "BAR" - series = New Series(title, ViewType.Bar) - Case "LINE" - series = New Series(title, ViewType.Line) - Case "AREA" - series = New Series(title, ViewType.Area) - Case Else - Throw New Exception("Unknown Chart type for id " & title) - End Select + ' Create Series based on type + Dim series As Series = Create_Series(title, type) ' Select Current Chart - Select Case i - Case 0 - chart = ChartTopLeft - Case 1 - chart = ChartTopRight - Case 2 - chart = ChartBottomLeft - Case Else - chart = ChartBottomRight - End Select + chart = Select_Chart(chartIndex) ' Set DataSource chart.DataSource = DATA_DT @@ -84,12 +207,13 @@ Public Class frmDiagrams series.ArgumentDataMember = argument series.ValueDataMembers.AddRange(New String() {value}) + 'set some options + chart.Legend.Visibility = DevExpress.Utils.DefaultBoolean.True + ' Show Data chart.Series.Add(series) Next - - Catch ex As Exception - MsgBox("Error While loading Diagram Data: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End Try + End If + End Sub End Class \ No newline at end of file