diff --git a/GUIs.Test.EDMIBenchmark/Form1.Designer.vb b/GUIs.Test.EDMIBenchmark/Form1.Designer.vb index bb6cde81..b5a6d6f6 100644 --- a/GUIs.Test.EDMIBenchmark/Form1.Designer.vb +++ b/GUIs.Test.EDMIBenchmark/Form1.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class Form1 Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,10 +20,13 @@ Partial Class Form1 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Form1)) - Me.listboxFiles = New DevExpress.XtraEditors.ListBoxControl() + Dim DockingContainer3 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() Me.ButtonSelectFiles = New DevExpress.XtraBars.BarButtonItem() Me.ButtonImportFiles = New DevExpress.XtraBars.BarButtonItem() @@ -32,51 +35,89 @@ Partial Class Form1 Me.TextboxObejctId = New DevExpress.XtraBars.BarEditItem() Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() Me.ButtonLoadFile = New DevExpress.XtraBars.BarButtonItem() + Me.BarListItem1 = New DevExpress.XtraBars.BarListItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarToggleSwitchItem1 = New DevExpress.XtraBars.BarToggleSwitchItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() + Me.DocumentManager1 = New DevExpress.XtraBars.Docking2010.DocumentManager(Me.components) + Me.TabbedView1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView(Me.components) + Me.DockManager1 = New DevExpress.XtraBars.Docking.DockManager(Me.components) + Me.hideContainerBottom = New DevExpress.XtraBars.Docking.AutoHideContainer() + Me.DockPanel3 = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel3_Container = New DevExpress.XtraBars.Docking.ControlContainer() Me.listboxLog = New DevExpress.XtraEditors.ListBoxControl() - Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() - Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() - Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() + Me.panelContainer1 = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel4 = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel4_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.BindingSource1 = New System.Windows.Forms.BindingSource(Me.components) + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.DockPanel1 = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.listboxFiles = New DevExpress.XtraEditors.ListBoxControl() + Me.DockPanel2 = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.BarListItem1 = New DevExpress.XtraBars.BarListItem() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - CType(Me.listboxFiles, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Timer1 = New System.Windows.Forms.Timer(Me.components) + Me.BarDockingMenuItem1 = New DevExpress.XtraBars.BarDockingMenuItem() + Me.BarMdiChildrenListItem1 = New DevExpress.XtraBars.BarMdiChildrenListItem() + CType(Me.DocumentGroup1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Document1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainerControl1.SuspendLayout() + CType(Me.DocumentManager1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TabbedView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.hideContainerBottom.SuspendLayout() + Me.DockPanel3.SuspendLayout() + Me.DockPanel3_Container.SuspendLayout() CType(Me.listboxLog, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.XtraTabControl1.SuspendLayout() - Me.XtraTabPage1.SuspendLayout() - Me.XtraTabPage2.SuspendLayout() + Me.panelContainer1.SuspendLayout() + Me.DockPanel4.SuspendLayout() + Me.DockPanel4_Container.SuspendLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.DockPanel1.SuspendLayout() + Me.DockPanel1_Container.SuspendLayout() + CType(Me.listboxFiles, System.ComponentModel.ISupportInitialize).BeginInit() + Me.DockPanel2.SuspendLayout() + Me.DockPanel2_Container.SuspendLayout() Me.SuspendLayout() ' - 'listboxFiles + 'DocumentGroup1 ' - Me.listboxFiles.Dock = System.Windows.Forms.DockStyle.Fill - Me.listboxFiles.Location = New System.Drawing.Point(0, 0) - Me.listboxFiles.Name = "listboxFiles" - Me.listboxFiles.Size = New System.Drawing.Size(536, 270) - Me.listboxFiles.TabIndex = 1 + Me.DocumentGroup1.Items.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.Document() {Me.Document1}) + ' + 'Document1 + ' + Me.Document1.Caption = "Document Viewer" + Me.Document1.ControlName = "DockPanel2" + Me.Document1.FloatLocation = New System.Drawing.Point(0, 0) + Me.Document1.FloatSize = New System.Drawing.Size(200, 200) + Me.Document1.Properties.AllowClose = DevExpress.Utils.DefaultBoolean.[False] + Me.Document1.Properties.AllowFloat = DevExpress.Utils.DefaultBoolean.[True] + Me.Document1.Properties.AllowFloatOnDoubleClick = DevExpress.Utils.DefaultBoolean.[True] ' '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.BarButtonItem1}) + 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.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 9 + Me.RibbonControl1.MaxItemId = 13 Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.PageHeaderItemLinks.Add(Me.BarDockingMenuItem1) + Me.RibbonControl1.PageHeaderItemLinks.Add(Me.BarMdiChildrenListItem1) Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1}) - Me.RibbonControl1.Size = New System.Drawing.Size(1145, 158) + Me.RibbonControl1.Size = New System.Drawing.Size(1310, 158) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'ButtonSelectFiles @@ -128,9 +169,30 @@ Partial Class Form1 Me.ButtonLoadFile.ImageOptions.SvgImage = CType(resources.GetObject("ButtonLoadFile.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.ButtonLoadFile.Name = "ButtonLoadFile" ' + 'BarListItem1 + ' + Me.BarListItem1.Caption = "Strategy" + Me.BarListItem1.Id = 7 + Me.BarListItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarListItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarListItem1.Name = "BarListItem1" + Me.BarListItem1.Strings.AddRange(New Object() {"Small Files", "Big Files", "Mixed Files"}) + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "List Files" + Me.BarButtonItem2.Id = 9 + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'BarToggleSwitchItem1 + ' + Me.BarToggleSwitchItem1.Caption = "Load File every 3 Seconds" + Me.BarToggleSwitchItem1.Id = 10 + Me.BarToggleSwitchItem1.Name = "BarToggleSwitchItem1" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup4, Me.RibbonPageGroup3, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup4, Me.RibbonPageGroup3}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Start" ' @@ -144,7 +206,9 @@ Partial Class Form1 'RibbonPageGroup4 ' Me.RibbonPageGroup4.ItemLinks.Add(Me.TextboxObejctId) + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarToggleSwitchItem1) Me.RibbonPageGroup4.ItemLinks.Add(Me.ButtonLoadFile) + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup4.Name = "RibbonPageGroup4" Me.RibbonPageGroup4.Text = "Retrieve" ' @@ -157,139 +221,306 @@ Partial Class Form1 ' 'RibbonStatusBar1 ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 453) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 640) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1145, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1310, 24) ' 'RibbonPage2 ' Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2" ' - 'SplitContainerControl1 + 'DocumentManager1 ' - Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 0) - Me.SplitContainerControl1.Name = "SplitContainerControl1" - Me.SplitContainerControl1.Panel1.Controls.Add(Me.listboxFiles) - Me.SplitContainerControl1.Panel1.Text = "Panel1" - Me.SplitContainerControl1.Panel2.Controls.Add(Me.listboxLog) - Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(1143, 270) - Me.SplitContainerControl1.SplitterPosition = 536 - Me.SplitContainerControl1.TabIndex = 4 + Me.DocumentManager1.ContainerControl = Me + Me.DocumentManager1.MenuManager = Me.RibbonControl1 + Me.DocumentManager1.View = Me.TabbedView1 + Me.DocumentManager1.ViewCollection.AddRange(New DevExpress.XtraBars.Docking2010.Views.BaseView() {Me.TabbedView1}) + ' + 'TabbedView1 + ' + 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}) + ' + 'DockManager1 + ' + Me.DockManager1.AutoHideContainers.AddRange(New DevExpress.XtraBars.Docking.AutoHideContainer() {Me.hideContainerBottom}) + Me.DockManager1.Form = Me + Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.panelContainer1, 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"}) + ' + 'hideContainerBottom + ' + Me.hideContainerBottom.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) + Me.hideContainerBottom.Controls.Add(Me.DockPanel3) + Me.hideContainerBottom.Dock = System.Windows.Forms.DockStyle.Bottom + Me.hideContainerBottom.Location = New System.Drawing.Point(0, 619) + Me.hideContainerBottom.Name = "hideContainerBottom" + Me.hideContainerBottom.Size = New System.Drawing.Size(1310, 21) + ' + 'DockPanel3 + ' + Me.DockPanel3.Controls.Add(Me.DockPanel3_Container) + Me.DockPanel3.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom + Me.DockPanel3.FloatVertical = True + Me.DockPanel3.ID = New System.Guid("b0b62b80-3cf3-4f78-a50d-4a79b9cabc39") + Me.DockPanel3.Location = New System.Drawing.Point(0, 0) + Me.DockPanel3.Name = "DockPanel3" + Me.DockPanel3.Options.ShowCloseButton = False + Me.DockPanel3.OriginalSize = New System.Drawing.Size(200, 119) + Me.DockPanel3.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Bottom + Me.DockPanel3.SavedIndex = 0 + Me.DockPanel3.Size = New System.Drawing.Size(1310, 119) + Me.DockPanel3.Text = "Log" + Me.DockPanel3.Visibility = DevExpress.XtraBars.Docking.DockVisibility.AutoHide + ' + 'DockPanel3_Container + ' + Me.DockPanel3_Container.Controls.Add(Me.listboxLog) + Me.DockPanel3_Container.Location = New System.Drawing.Point(3, 27) + Me.DockPanel3_Container.Name = "DockPanel3_Container" + Me.DockPanel3_Container.Size = New System.Drawing.Size(1304, 89) + Me.DockPanel3_Container.TabIndex = 0 ' 'listboxLog ' Me.listboxLog.Dock = System.Windows.Forms.DockStyle.Fill Me.listboxLog.Location = New System.Drawing.Point(0, 0) Me.listboxLog.Name = "listboxLog" - Me.listboxLog.Size = New System.Drawing.Size(597, 270) + Me.listboxLog.Size = New System.Drawing.Size(1304, 89) Me.listboxLog.TabIndex = 0 ' - 'XtraTabControl1 + 'panelContainer1 ' - Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.XtraTabControl1.Location = New System.Drawing.Point(0, 158) - Me.XtraTabControl1.Name = "XtraTabControl1" - Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 - Me.XtraTabControl1.Size = New System.Drawing.Size(1145, 295) - Me.XtraTabControl1.TabIndex = 7 - Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) + Me.panelContainer1.ActiveChild = Me.DockPanel4 + Me.panelContainer1.Controls.Add(Me.DockPanel4) + Me.panelContainer1.Controls.Add(Me.DockPanel1) + Me.panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left + Me.panelContainer1.ID = New System.Guid("17067a8c-1b48-4d4a-b383-b7f8d5a8be59") + Me.panelContainer1.Location = New System.Drawing.Point(0, 158) + Me.panelContainer1.Name = "panelContainer1" + Me.panelContainer1.Options.ShowCloseButton = False + Me.panelContainer1.OriginalSize = New System.Drawing.Size(451, 200) + Me.panelContainer1.Size = New System.Drawing.Size(451, 461) + Me.panelContainer1.Tabbed = True + Me.panelContainer1.Text = "panelContainer1" ' - 'XtraTabPage1 + 'DockPanel4 ' - Me.XtraTabPage1.Controls.Add(Me.SplitContainerControl1) - Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(1143, 270) - Me.XtraTabPage1.Text = "Information" + Me.DockPanel4.Controls.Add(Me.DockPanel4_Container) + Me.DockPanel4.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill + Me.DockPanel4.ID = New System.Guid("bddc849b-1066-4d2f-8fd3-9bc377a2bd74") + Me.DockPanel4.Location = New System.Drawing.Point(3, 26) + Me.DockPanel4.Name = "DockPanel4" + Me.DockPanel4.Options.ShowCloseButton = False + Me.DockPanel4.OriginalSize = New System.Drawing.Size(200, 200) + Me.DockPanel4.Size = New System.Drawing.Size(444, 406) + Me.DockPanel4.Text = "List Files" ' - 'XtraTabPage2 + 'DockPanel4_Container ' - Me.XtraTabPage2.Controls.Add(Me.DocumentViewer1) - Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(1143, 270) - Me.XtraTabPage2.Text = "DocumentViewer" + Me.DockPanel4_Container.Controls.Add(Me.GridControl1) + Me.DockPanel4_Container.Location = New System.Drawing.Point(0, 0) + Me.DockPanel4_Container.Name = "DockPanel4_Container" + Me.DockPanel4_Container.Size = New System.Drawing.Size(444, 406) + Me.DockPanel4_Container.TabIndex = 0 + ' + 'GridControl1 + ' + Me.GridControl1.DataSource = Me.BindingSource1 + 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(444, 406) + Me.GridControl1.TabIndex = 0 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'BindingSource1 + ' + ' + 'GridView1 + ' + Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn1, Me.GridColumn2}) + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + Me.GridView1.OptionsBehavior.Editable = False + Me.GridView1.OptionsBehavior.ReadOnly = True + ' + 'GridColumn1 + ' + Me.GridColumn1.Caption = "Object Id" + Me.GridColumn1.FieldName = "IDB_OBJ_ID" + Me.GridColumn1.MaxWidth = 100 + Me.GridColumn1.MinWidth = 100 + Me.GridColumn1.Name = "GridColumn1" + Me.GridColumn1.Visible = True + Me.GridColumn1.VisibleIndex = 0 + Me.GridColumn1.Width = 100 + ' + 'GridColumn2 + ' + Me.GridColumn2.Caption = "Document Name" + Me.GridColumn2.FieldName = "DocName" + Me.GridColumn2.Name = "GridColumn2" + Me.GridColumn2.Visible = True + Me.GridColumn2.VisibleIndex = 1 + Me.GridColumn2.Width = 409 + ' + 'DockPanel1 + ' + Me.DockPanel1.Controls.Add(Me.DockPanel1_Container) + Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill + Me.DockPanel1.ID = New System.Guid("12b5eead-07cc-48c6-93a4-85cd0b4b82ce") + Me.DockPanel1.Location = New System.Drawing.Point(3, 26) + Me.DockPanel1.Name = "DockPanel1" + Me.DockPanel1.Options.ShowCloseButton = False + Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200) + Me.DockPanel1.Size = New System.Drawing.Size(444, 406) + Me.DockPanel1.Text = "Files to Upload" + ' + 'DockPanel1_Container + ' + Me.DockPanel1_Container.Controls.Add(Me.listboxFiles) + Me.DockPanel1_Container.Location = New System.Drawing.Point(0, 0) + Me.DockPanel1_Container.Name = "DockPanel1_Container" + Me.DockPanel1_Container.Size = New System.Drawing.Size(444, 406) + Me.DockPanel1_Container.TabIndex = 0 + ' + 'listboxFiles + ' + Me.listboxFiles.Dock = System.Windows.Forms.DockStyle.Fill + Me.listboxFiles.Location = New System.Drawing.Point(0, 0) + Me.listboxFiles.Name = "listboxFiles" + Me.listboxFiles.Size = New System.Drawing.Size(444, 406) + Me.listboxFiles.TabIndex = 1 + ' + 'DockPanel2 + ' + Me.DockPanel2.Controls.Add(Me.DockPanel2_Container) + Me.DockPanel2.DockedAsTabbedDocument = True + Me.DockPanel2.ID = New System.Guid("e82850af-b594-49e9-ae83-36d4bf007da5") + Me.DockPanel2.Name = "DockPanel2" + Me.DockPanel2.Options.ShowCloseButton = False + Me.DockPanel2.OriginalSize = New System.Drawing.Size(200, 200) + Me.DockPanel2.Text = "Document Viewer" + ' + 'DockPanel2_Container + ' + Me.DockPanel2_Container.Controls.Add(Me.DocumentViewer1) + Me.DockPanel2_Container.Location = New System.Drawing.Point(0, 0) + Me.DockPanel2_Container.Name = "DockPanel2_Container" + Me.DockPanel2_Container.Size = New System.Drawing.Size(853, 432) + Me.DockPanel2_Container.TabIndex = 0 ' 'DocumentViewer1 ' Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Fill Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer1.Name = "DocumentViewer1" - Me.DocumentViewer1.Size = New System.Drawing.Size(1143, 270) + Me.DocumentViewer1.Size = New System.Drawing.Size(853, 432) Me.DocumentViewer1.TabIndex = 0 ' - 'RibbonPageGroup2 + 'Timer1 ' - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarListItem1) - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1) - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "Testing" + Me.Timer1.Interval = 3000 ' - 'BarListItem1 + 'BarDockingMenuItem1 ' - Me.BarListItem1.Caption = "Strategy" - Me.BarListItem1.Id = 7 - Me.BarListItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarListItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarListItem1.Name = "BarListItem1" - Me.BarListItem1.Strings.AddRange(New Object() {"Small Files", "Big Files", "Mixed Files"}) + Me.BarDockingMenuItem1.Caption = "BarDockingMenuItem1" + Me.BarDockingMenuItem1.Id = 11 + Me.BarDockingMenuItem1.Name = "BarDockingMenuItem1" ' - 'BarButtonItem1 + 'BarMdiChildrenListItem1 ' - Me.BarButtonItem1.Caption = "Start Looping Test" - Me.BarButtonItem1.Id = 8 - Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem1.Name = "BarButtonItem1" + Me.BarMdiChildrenListItem1.Caption = "BarMdiChildrenListItem1" + Me.BarMdiChildrenListItem1.Id = 12 + Me.BarMdiChildrenListItem1.Name = "BarMdiChildrenListItem1" ' 'Form1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1145, 477) - Me.Controls.Add(Me.XtraTabControl1) + Me.ClientSize = New System.Drawing.Size(1310, 664) + Me.Controls.Add(Me.panelContainer1) + Me.Controls.Add(Me.hideContainerBottom) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.Name = "Form1" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "Form1" - CType(Me.listboxFiles, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DocumentGroup1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Document1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainerControl1.ResumeLayout(False) + CType(Me.DocumentManager1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TabbedView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).EndInit() + Me.hideContainerBottom.ResumeLayout(False) + Me.DockPanel3.ResumeLayout(False) + Me.DockPanel3_Container.ResumeLayout(False) CType(Me.listboxLog, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.XtraTabControl1.ResumeLayout(False) - Me.XtraTabPage1.ResumeLayout(False) - Me.XtraTabPage2.ResumeLayout(False) + Me.panelContainer1.ResumeLayout(False) + Me.DockPanel4.ResumeLayout(False) + Me.DockPanel4_Container.ResumeLayout(False) + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + Me.DockPanel1.ResumeLayout(False) + Me.DockPanel1_Container.ResumeLayout(False) + CType(Me.listboxFiles, System.ComponentModel.ISupportInitialize).EndInit() + Me.DockPanel2.ResumeLayout(False) + Me.DockPanel2_Container.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents listboxFiles As DevExpress.XtraEditors.ListBoxControl Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents ButtonSelectFiles As DevExpress.XtraBars.BarButtonItem - Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl - Friend WithEvents listboxLog As DevExpress.XtraEditors.ListBoxControl Friend WithEvents ButtonImportFiles As DevExpress.XtraBars.BarButtonItem Friend WithEvents buttonClearLog As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents buttonClearFiles As DevExpress.XtraBars.BarButtonItem - Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl - Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage Friend WithEvents TextboxObejctId As DevExpress.XtraBars.BarEditItem Friend WithEvents RepositoryItemTextEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit Friend WithEvents ButtonLoadFile As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage - Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer Friend WithEvents BarListItem1 As DevExpress.XtraBars.BarListItem - Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents DocumentManager1 As DevExpress.XtraBars.Docking2010.DocumentManager + Friend WithEvents DockPanel1 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel1_Container As DevExpress.XtraBars.Docking.ControlContainer + Friend WithEvents listboxFiles As DevExpress.XtraEditors.ListBoxControl + Friend WithEvents listboxLog As DevExpress.XtraEditors.ListBoxControl + Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer + Friend WithEvents TabbedView1 As DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView + Friend WithEvents DockManager1 As DevExpress.XtraBars.Docking.DockManager + Friend WithEvents DockPanel3 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel3_Container As DevExpress.XtraBars.Docking.ControlContainer + Friend WithEvents DocumentGroup1 As DevExpress.XtraBars.Docking2010.Views.Tabbed.DocumentGroup + Friend WithEvents Document1 As DevExpress.XtraBars.Docking2010.Views.Tabbed.Document + Friend WithEvents DockPanel2 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel2_Container As DevExpress.XtraBars.Docking.ControlContainer + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents panelContainer1 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel4 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel4_Container As DevExpress.XtraBars.Docking.ControlContainer + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents hideContainerBottom As DevExpress.XtraBars.Docking.AutoHideContainer + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn2 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents BindingSource1 As BindingSource + Friend WithEvents BarToggleSwitchItem1 As DevExpress.XtraBars.BarToggleSwitchItem + Friend WithEvents Timer1 As Timer + Friend WithEvents BarDockingMenuItem1 As DevExpress.XtraBars.BarDockingMenuItem + Friend WithEvents BarMdiChildrenListItem1 As DevExpress.XtraBars.BarMdiChildrenListItem End Class diff --git a/GUIs.Test.EDMIBenchmark/Form1.resx b/GUIs.Test.EDMIBenchmark/Form1.resx index a2f0f8be..3d74ebd0 100644 --- a/GUIs.Test.EDMIBenchmark/Form1.resx +++ b/GUIs.Test.EDMIBenchmark/Form1.resx @@ -263,19 +263,39 @@ Cw== - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALcBAAAC77u/ + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMEDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + IHZpZXdCb3g9IjAgMCAxNiAxNiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTmV4dCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg - MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KPC9zdHls - ZT4NCiAgPHBhdGggZD0iTTguOSw0LjFDOC40LDMuOCw4LDQuMSw4LDQuNnYyMC43YzAsMC42LDAuNCww - LjgsMC45LDAuNWwxNi44LTEwLjNjMC41LTAuMywwLjUtMC44LDAtMS4xTDguOSw0LjF6IiBjbGFzcz0i - Qmx1ZSIgLz4NCjwvc3ZnPgs= + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MTYgMTYiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + V2hpdGV7ZmlsbDojRkZGRkZGO30KCS5HcmVlbntmaWxsOiMwMzlDMjM7fQoJLnN0MHtvcGFjaXR5OjAu + Njt9Cgkuc3Qxe29wYWNpdHk6MC41O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTE1LDFIMUMwLjUsMSww + LDEuNSwwLDJ2MTFjMCwwLjUsMC41LDEsMSwxaDE0YzAuNSwwLDEtMC41LDEtMVYyQzE2LDEuNSwxNS41 + LDEsMTUsMXogTTE1LDEzSDFWMmgxNFYxM3oiIGNsYXNzPSJCbGFjayIgLz4NCiAgPHBhdGggZD0iTTAs + NVYyYzAtMC41LDAuNS0xLDEtMWgxNGMwLjYsMCwxLDAuNSwxLDF2M0gweiIgY2xhc3M9IkdyZWVuIiAv + Pg0KICA8ZyBpZD0iTGF5ZXJfMiIgY2xhc3M9InN0MCI+DQogICAgPHJlY3QgeD0iMSIgeT0iMiIgd2lk + dGg9IjE0IiBoZWlnaHQ9IjIiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IldoaXRlIiAvPg0KICA8L2c+DQog + IDxyZWN0IHg9IjEiIHk9IjUiIHdpZHRoPSIxNCIgaGVpZ2h0PSI4IiByeD0iMCIgcnk9IjAiIGNsYXNz + PSJXaGl0ZSIgLz4NCiAgPGcgaWQ9IkxheWVyXzMiIGNsYXNzPSJzdDAiPg0KICAgIDxwYXRoIGQ9Ik0x + NSw4VjdoLTNWNWgtMXYySDVWNUg0djJIMXYxaDN2MkgxdjFoM3YyaDF2LTJoNnYyaDF2LTJoM3YtMWgt + M1Y4SDE1eiBNMTEsMTBINVY4aDZWMTB6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + 17, 17 + + + 181, 17 + + + 316, 17 + + + 453, 17 + \ No newline at end of file diff --git a/GUIs.Test.EDMIBenchmark/Form1.vb b/GUIs.Test.EDMIBenchmark/Form1.vb index 10e41ccf..c117e859 100644 --- a/GUIs.Test.EDMIBenchmark/Form1.vb +++ b/GUIs.Test.EDMIBenchmark/Form1.vb @@ -19,6 +19,11 @@ Public Class Form1 DocumentViewer1.Init(oLogConfig, "21182889975216572111813147150675976632") End Sub + Private Sub AddLogMessage(Message As String) + listboxLog.Items.Add(Message) + listboxLog.MakeItemVisible(listboxLog.Items.Count - 1) + End Sub + Private Sub ButtonSelectFiles_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles ButtonSelectFiles.ItemClick Dim oDialog As New OpenFileDialog() With { .Multiselect = True, @@ -44,7 +49,7 @@ Public Class Form1 Dim oFileName As String = oItem Dim oFileInfo As New FileInfo(oFileName) - listboxLog.Items.Add($"Importing {oFileInfo.Name}... ({FormatBytes(oFileInfo.Length)})") + AddLogMessage($"Importing {oFileInfo.Name}... ({FormatBytes(oFileInfo.Length)})") Dim oContents As Byte() = New Byte(oFileInfo.Length) {} @@ -54,18 +59,17 @@ Public Class Form1 Dim oResult As EDMIServiceReference.DocumentResult = Await _Channel.ImportFileAsync(oFileInfo.Name, oContents, Environment.UserName) If oResult.OK Then - listboxLog.Items.Add($"File [{oFileInfo.Name}] with Id [{oResult.Document.FileId}] imported!") + AddLogMessage($"File [{oFileInfo.Name}] with Id [{oResult.Document.FileId}] imported!") Else - listboxLog.Items.Add($"Import Error: {oResult.ErrorMessage}") + AddLogMessage($"Import Error: {oResult.ErrorMessage}") End If oSW.Stop() - listboxLog.Items.Add($"Import Time: {FormatTime(oSW.ElapsedMilliseconds)}") - listboxLog.Items.Add("") + AddLogMessage($"Import Time: {FormatTime(oSW.ElapsedMilliseconds)}") + AddLogMessage("") Next oSWTotal.Stop() - listboxLog.Items.Add($"Total Time: {FormatTime(oSWTotal.ElapsedMilliseconds)}") - listboxLog.MakeItemVisible(listboxLog.Items.Count - 1) + AddLogMessage($"Total Time: {FormatTime(oSWTotal.ElapsedMilliseconds)}") End Sub Private Sub buttonClearLog_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles buttonClearLog.ItemClick @@ -132,11 +136,84 @@ Public Class Form1 DocumentViewer1.LoadFile(oResponse.FileName, oMemoryStream) oSWTotal.Stop() - listboxLog.Items.Add($"File [{oResponse.FileName}] loaded: [{FormatTime(oSWTotal.ElapsedMilliseconds)}]") + AddLogMessage($"File [{oResponse.FileName}] loaded: [{FormatTime(oSWTotal.ElapsedMilliseconds)}]") Catch ex As FaultException MsgBox(ex.Reason.ToString, MsgBoxStyle.Critical, "Error from Service") Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical, "Uh oh!") End Try End Sub + + Private Async Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Try + Dim oResult = Await _Channel.ListFilesForUserAsync() + BindingSource1.DataSource = oResult.Datatable + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical, "Uh oh!") + End Try + End Sub + + Private Async Sub BindingSource1_CurrentChanged(sender As Object, e As EventArgs) Handles BindingSource1.CurrentChanged + Dim oRow As DataRow = GridView1.GetFocusedDataRow() + + If oRow Is Nothing Then + Exit Sub + End If + + Try + Dim oSWTotal As New Stopwatch() + oSWTotal.Start() + + Dim oObjectId As Int64 = oRow.Item("IDB_OBJ_ID") + Dim oResponse = Await _Channel.GetFileByObjectIdAsync(New EDMIServiceReference.DocumentStreamRequest() With {.ObjectId = oObjectId}) + Dim oMemoryStream As New MemoryStream() + oResponse.FileContents.CopyTo(oMemoryStream) + oMemoryStream.Position = 0 + + DocumentViewer1.LoadFile(oResponse.FileName, oMemoryStream) + + oSWTotal.Stop() + AddLogMessage($"File [{oResponse.FileName}] loaded: [{FormatTime(oSWTotal.ElapsedMilliseconds)}]") + Catch ex As FaultException + MsgBox(ex.Reason.ToString, MsgBoxStyle.Critical, "Error from Service") + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical, "Uh oh!") + End Try + End Sub + + Private Async Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick + Try + Dim oSWTotal As New Stopwatch() + oSWTotal.Start() + + Dim oObjectId As Integer = TextboxObejctId.EditValue + + Dim oResponse = Await _Channel.GetFileByObjectIdAsync(New EDMIServiceReference.DocumentStreamRequest() With {.ObjectId = oObjectId}) + Dim oMemoryStream As New MemoryStream() + oResponse.FileContents.CopyTo(oMemoryStream) + oMemoryStream.Position = 0 + + DocumentViewer1.LoadFile(oResponse.FileName, oMemoryStream) + + oSWTotal.Stop() + AddLogMessage($"File [{oResponse.FileName}] loaded: [{FormatTime(oSWTotal.ElapsedMilliseconds)}]") + Catch ex As Exception + AddLogMessage($"Error while getting file: [{ex.Message}]") + End Try + End Sub + + Private Sub BarToggleSwitchItem1_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarToggleSwitchItem1.CheckedChanged + If BarToggleSwitchItem1.Checked Then + If TextboxObejctId.EditValue = "" Then + Timer1.Stop() + MsgBox("Please set a ObjectId!", MsgBoxStyle.Critical, Text) + Else + Timer1.Start() + AddLogMessage("Timer Started!") + End If + Else + Timer1.Stop() + AddLogMessage("Timer Stopped!") + End If + End Sub End Class diff --git a/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj b/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj index f94cc8cb..c159aa05 100644 --- a/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj +++ b/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj @@ -54,9 +54,13 @@ + ..\Controls.DocumentViewer\obj\Debug\DigitalData.Controls.DocumentViewer.dll + + ..\Controls.LookupGrid\obj\Debug\DigitalData.Controls.LookupGrid.dll + D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll diff --git a/GUIs.Test.EDMIBenchmark/My Project/licenses.licx b/GUIs.Test.EDMIBenchmark/My Project/licenses.licx index e29ff0b5..e1f672e4 100644 --- a/GUIs.Test.EDMIBenchmark/My Project/licenses.licx +++ b/GUIs.Test.EDMIBenchmark/My Project/licenses.licx @@ -1,2 +1,5 @@ DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, 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 +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.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 diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse.datasource new file mode 100644 index 00000000..ba63f700 --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.Messages.xsd b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.Messages.xsd new file mode 100644 index 00000000..00e7f568 --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.Messages.xsd @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl index 554c690d..886341bc 100644 --- a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl @@ -9,6 +9,7 @@ + @@ -98,6 +99,12 @@ + + + + + + @@ -161,6 +168,10 @@ + + + + diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd index 78896d41..97097dc5 100644 --- a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd @@ -3,6 +3,7 @@ + @@ -199,10 +200,22 @@ + + + + + + + + + + + + - + @@ -212,7 +225,7 @@ - + diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.svcmap b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.svcmap index 0dd586d8..43899f29 100644 --- a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.svcmap +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.svcmap @@ -31,6 +31,7 @@ + diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb index 1df41c22..8a43f979 100644 --- a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb @@ -97,7 +97,9 @@ Namespace EDMIServiceReference System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResult.DocumentObject)), _ System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.IndexResult)), _ System.Runtime.Serialization.KnownTypeAttribute(GetType(System.DBNull)), _ - System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentObject))> _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentObject)), _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentListResponse)), _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.BaseResponse))> _ Partial Public Class ScalarResult Inherits EDMIServiceReference.BaseResult @@ -417,6 +419,96 @@ Namespace EDMIServiceReference End Sub End Class + _ + Partial Public Class DocumentListResponse + Inherits EDMIServiceReference.BaseResponse + + _ + Private DatatableField As System.Data.DataTable + + _ + Public Property Datatable() As System.Data.DataTable + Get + Return Me.DatatableField + End Get + Set + If (Object.ReferenceEquals(Me.DatatableField, value) <> true) Then + Me.DatatableField = value + Me.RaisePropertyChanged("Datatable") + End If + End Set + End Property + End Class + + _ + Partial Public Class BaseResponse + Inherits Object + Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged + + _ + Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject + + _ + Private ErrorMessageField As String + + _ + Private OKField As Boolean + + _ + Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData + Get + Return Me.extensionDataField + End Get + Set + Me.extensionDataField = value + End Set + End Property + + _ + Public Property ErrorMessage() As String + Get + Return Me.ErrorMessageField + End Get + Set + If (Object.ReferenceEquals(Me.ErrorMessageField, value) <> true) Then + Me.ErrorMessageField = value + Me.RaisePropertyChanged("ErrorMessage") + End If + End Set + End Property + + _ + Public Property OK() As Boolean + Get + Return Me.OKField + End Get + Set + If (Me.OKField.Equals(value) <> true) Then + Me.OKField = value + Me.RaisePropertyChanged("OK") + End If + End Set + End Property + + Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged + + Protected Sub RaisePropertyChanged(ByVal propertyName As String) + Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent + If (Not (propertyChanged) Is Nothing) Then + propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) + End If + End Sub + End Class + _ Public Interface IEDMIService @@ -514,6 +606,12 @@ Namespace EDMIServiceReference _ Function GetFileByObjectIdAsync(ByVal request As EDMIServiceReference.DocumentStreamRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentStreamResponse) + _ + Function ListFilesForUser() As EDMIServiceReference.DocumentListResponse + + _ + Function ListFilesForUserAsync() As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentListResponse) + _ Function NewFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As EDMIServiceReference.IndexResult @@ -722,6 +820,14 @@ Namespace EDMIServiceReference Return CType(Me,EDMIServiceReference.IEDMIService).GetFileByObjectIdAsync(inValue) End Function + Public Function ListFilesForUser() As EDMIServiceReference.DocumentListResponse Implements EDMIServiceReference.IEDMIService.ListFilesForUser + Return MyBase.Channel.ListFilesForUser + End Function + + Public Function ListFilesForUserAsync() As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentListResponse) Implements EDMIServiceReference.IEDMIService.ListFilesForUserAsync + Return MyBase.Channel.ListFilesForUserAsync + End Function + Public Function NewFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As EDMIServiceReference.IndexResult Implements EDMIServiceReference.IEDMIService.NewFileIndex Return MyBase.Channel.NewFileIndex(DocObject, Syskey, LanguageCode, Value) End Function diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/service.wsdl b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/service.wsdl index 5f35f48e..b8d866c0 100644 --- a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/service.wsdl +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/service.wsdl @@ -168,6 +168,15 @@ + + + + + + + + + diff --git a/Modules.EDMIAPI/EDMI.API.vbproj b/Modules.EDMIAPI/EDMI.API.vbproj index 62d0c483..a9808632 100644 --- a/Modules.EDMIAPI/EDMI.API.vbproj +++ b/Modules.EDMIAPI/EDMI.API.vbproj @@ -106,6 +106,9 @@ + + Reference.svcmap + Reference.svcmap @@ -130,6 +133,9 @@ Designer + + Designer + Designer diff --git a/Service.EDMIService/EDMIService.vb b/Service.EDMIService/EDMIService.vb index 05a412c1..bd0e5ea7 100644 --- a/Service.EDMIService/EDMIService.vb +++ b/Service.EDMIService/EDMIService.vb @@ -30,12 +30,24 @@ Public Class EDMIService Public Sub New() Dim oOperationContext As OperationContext = OperationContext.Current Dim oInstanceContext As InstanceContext = oOperationContext.InstanceContext - Dim oUsername = oOperationContext.ServiceSecurityContext.WindowsIdentity.Name + Dim oUsername = StripDomainFromUsername(oOperationContext.ServiceSecurityContext.WindowsIdentity.Name) _username = oUsername _logger = LogConfig.GetLogger() + + _logger.Debug("New Request by User [{0}]", _username) End Sub + Public Function StripDomainFromUsername(UserName As String) + If UserName.Contains("\") Then + Return UserName.Split("\")(1) + ElseIf UserName.Contains("@") Then + Return UserName.Split("@")(0) + Else + Return UserName + End If + End Function + #Region "Auth" Private Function TestUserAuth() As Boolean Try @@ -391,6 +403,21 @@ Public Class EDMIService End Try End Function + Public Function ListFilesForUser() As Messages.DocumentListResponse Implements IEDMIService.ListFilesForUser + Try + Dim oSQL = $"SELECT * FROM VWIDB_DOC_DATA WHERE ADDED_WHO = UPPER('{_username}')" + Dim oDatatable As DataTable = MSSQL.GetDatatable(oSQL) + oDatatable.TableName = "DocumentList" + + Return New Messages.DocumentListResponse() With { + .Datatable = oDatatable + } + Catch ex As Exception + _logger.Error(ex) + Throw New FaultException(ex.Message) + End Try + End Function + #End Region #Region "Index" diff --git a/Service.EDMIService/IEDMIService.vb b/Service.EDMIService/IEDMIService.vb index e52909c8..41a595f7 100644 --- a/Service.EDMIService/IEDMIService.vb +++ b/Service.EDMIService/IEDMIService.vb @@ -53,6 +53,9 @@ Interface IEDMIService Function GetFileByObjectId(Data As Messages.DocumentStreamRequest) As Messages.DocumentStreamResponse + + + Function ListFilesForUser() As Messages.DocumentListResponse #End Region #Region "Index" diff --git a/Service.EDMIService/Messages.vb b/Service.EDMIService/Messages.vb index 1f78722e..4ce640fa 100644 --- a/Service.EDMIService/Messages.vb +++ b/Service.EDMIService/Messages.vb @@ -1,7 +1,27 @@ Imports System.IO +Imports System.Runtime.Serialization Imports System.ServiceModel Namespace Messages + + + + Public MustInherit Class BaseResponse + + Public Property OK As Boolean + + Public Property ErrorMessage As String + + Public Sub New() + OK = True + End Sub + + Public Sub New(ErrorMessage As String) + OK = False + Me.ErrorMessage = ErrorMessage + End Sub + End Class + Public Class DocumentStreamRequest @@ -16,6 +36,13 @@ Namespace Messages Public FileContents As Stream End Class + + Public Class DocumentListResponse + Inherits BaseResponse + + Public Datatable As DataTable + End Class + End Namespace