From c90f3d2ef6746769e6b9ea7c1c0855234030e3be Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 7 Sep 2022 14:39:55 -0400 Subject: [PATCH] Fixes #2318 tab empty (#2319) --- .../EditTimeProfileAnalysisChartView.cs | 1 - .../PopulationPKAnalysisView.Designer.cs | 177 ++++++++---------- .../Simulations/PopulationPKAnalysisView.cs | 6 +- 3 files changed, 80 insertions(+), 104 deletions(-) diff --git a/src/PKSim.UI/Views/Charts/EditTimeProfileAnalysisChartView.cs b/src/PKSim.UI/Views/Charts/EditTimeProfileAnalysisChartView.cs index f3bef4931..828e1d483 100644 --- a/src/PKSim.UI/Views/Charts/EditTimeProfileAnalysisChartView.cs +++ b/src/PKSim.UI/Views/Charts/EditTimeProfileAnalysisChartView.cs @@ -2,7 +2,6 @@ using OSPSuite.Utility.Extensions; using PKSim.Presentation.Presenters.Charts; using PKSim.Presentation.Views.Charts; -using OSPSuite.Presentation; namespace PKSim.UI.Views.Charts { diff --git a/src/PKSim.UI/Views/Simulations/PopulationPKAnalysisView.Designer.cs b/src/PKSim.UI/Views/Simulations/PopulationPKAnalysisView.Designer.cs index d20484904..58b03fd91 100644 --- a/src/PKSim.UI/Views/Simulations/PopulationPKAnalysisView.Designer.cs +++ b/src/PKSim.UI/Views/Simulations/PopulationPKAnalysisView.Designer.cs @@ -32,45 +32,57 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { + this.layoutControl = new OSPSuite.UI.Controls.UxLayoutControl(); this.labelControlGlobalPKAnalysisDescription = new DevExpress.XtraEditors.LabelControl(); - this.populationPKAnalysisXtraTabControl = new DevExpress.XtraTab.XtraTabControl(); + this.populationPKAnalysisTabControl = new DevExpress.XtraTab.XtraTabControl(); this.pageOnCurves = new DevExpress.XtraTab.XtraTabPage(); this.populationPKAnalysisPanelOnCurve = new DevExpress.XtraEditors.PanelControl(); this.pageOnIndividuals = new DevExpress.XtraTab.XtraTabPage(); this.populationPKAnalysisPanelOnIndividuals = new DevExpress.XtraEditors.PanelControl(); - this.layoutControl = new DevExpress.XtraLayout.LayoutControl(); - this.globalPKParametersPanelControl = new OSPSuite.UI.Controls.UxPanelControl(); - this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.btnExportToExcel = new DevExpress.XtraEditors.SimpleButton(); this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutItemExportToExcel = new DevExpress.XtraLayout.LayoutControlItem(); this.emptySpaceItem = new DevExpress.XtraLayout.EmptySpaceItem(); - this.layoutControlItemGlobalPKAnalysis = new DevExpress.XtraLayout.LayoutControlItem(); this.splitter = new DevExpress.XtraLayout.SplitterItem(); - this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutItemPopulationPKAnalysisTab = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItemGlobalPKAnalysisDescription = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItemGlobalPKAnalysis = new DevExpress.XtraLayout.LayoutControlItem(); + this.globalPKParametersPanelControl = new OSPSuite.UI.Controls.UxPanelControl(); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.populationPKAnalysisXtraTabControl)).BeginInit(); - this.populationPKAnalysisXtraTabControl.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).BeginInit(); + this.layoutControl.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.populationPKAnalysisTabControl)).BeginInit(); + this.populationPKAnalysisTabControl.SuspendLayout(); this.pageOnCurves.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.populationPKAnalysisPanelOnCurve)).BeginInit(); this.pageOnIndividuals.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.populationPKAnalysisPanelOnIndividuals)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).BeginInit(); - this.layoutControl.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.globalPKParametersPanelControl)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemExportToExcel)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemGlobalPKAnalysis)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitter)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutItemPopulationPKAnalysisTab)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemGlobalPKAnalysisDescription)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemGlobalPKAnalysis)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.globalPKParametersPanelControl)).BeginInit(); this.SuspendLayout(); // + // layoutControl + // + this.layoutControl.AllowCustomization = false; + this.layoutControl.Controls.Add(this.globalPKParametersPanelControl); + this.layoutControl.Controls.Add(this.labelControlGlobalPKAnalysisDescription); + this.layoutControl.Controls.Add(this.populationPKAnalysisTabControl); + this.layoutControl.Controls.Add(this.btnExportToExcel); + this.layoutControl.Dock = System.Windows.Forms.DockStyle.Fill; + this.layoutControl.Location = new System.Drawing.Point(0, 0); + this.layoutControl.Name = "layoutControl"; + this.layoutControl.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(3693, -142, 812, 500); + this.layoutControl.Root = this.layoutControlGroup1; + this.layoutControl.Size = new System.Drawing.Size(555, 476); + this.layoutControl.TabIndex = 0; + this.layoutControl.Text = "layoutControl1"; + // // labelControlGlobalPKAnalysisDescription // this.labelControlGlobalPKAnalysisDescription.Location = new System.Drawing.Point(2, 28); @@ -81,15 +93,15 @@ private void InitializeComponent() this.labelControlGlobalPKAnalysisDescription.TabIndex = 8; this.labelControlGlobalPKAnalysisDescription.Text = "labelControlGlobalPKAnalysisDescription"; // - // populationPKAnalysisXtraTabControl + // populationPKAnalysisTabControl // - this.populationPKAnalysisXtraTabControl.Location = new System.Drawing.Point(2, 177); - this.populationPKAnalysisXtraTabControl.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.populationPKAnalysisXtraTabControl.Name = "populationPKAnalysisXtraTabControl"; - this.populationPKAnalysisXtraTabControl.SelectedTabPage = this.pageOnCurves; - this.populationPKAnalysisXtraTabControl.Size = new System.Drawing.Size(551, 297); - this.populationPKAnalysisXtraTabControl.TabIndex = 0; - this.populationPKAnalysisXtraTabControl.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.populationPKAnalysisTabControl.Location = new System.Drawing.Point(2, 177); + this.populationPKAnalysisTabControl.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.populationPKAnalysisTabControl.Name = "populationPKAnalysisTabControl"; + this.populationPKAnalysisTabControl.SelectedTabPage = this.pageOnCurves; + this.populationPKAnalysisTabControl.Size = new System.Drawing.Size(551, 297); + this.populationPKAnalysisTabControl.TabIndex = 0; + this.populationPKAnalysisTabControl.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.pageOnCurves, this.pageOnIndividuals}); // @@ -129,46 +141,6 @@ private void InitializeComponent() this.populationPKAnalysisPanelOnIndividuals.Size = new System.Drawing.Size(549, 272); this.populationPKAnalysisPanelOnIndividuals.TabIndex = 8; // - // layoutControl1 - // - this.layoutControl.Controls.Add(this.globalPKParametersPanelControl); - this.layoutControl.Location = new System.Drawing.Point(177, 43); - this.layoutControl.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.layoutControl.Name = "layoutControl"; - this.layoutControl.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(874, 0, 812, 500); - this.layoutControl.Root = this.Root; - this.layoutControl.Size = new System.Drawing.Size(378, 122); - this.layoutControl.TabIndex = 7; - this.layoutControl.Text = "layoutControl1"; - // - // globalPKParametersPanelControl - // - this.globalPKParametersPanelControl.Location = new System.Drawing.Point(2, 2); - this.globalPKParametersPanelControl.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.globalPKParametersPanelControl.Name = "globalPKParametersPanelControl"; - this.globalPKParametersPanelControl.Size = new System.Drawing.Size(374, 118); - this.globalPKParametersPanelControl.TabIndex = 4; - // - // Root - // - this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; - this.Root.GroupBordersVisible = false; - this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem2}); - this.Root.Name = "Root"; - this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.Root.Size = new System.Drawing.Size(378, 122); - this.Root.TextVisible = false; - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.globalPKParametersPanelControl; - this.layoutControlItem2.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(378, 122); - this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem2.TextVisible = false; - // // btnExportToExcel // this.btnExportToExcel.Location = new System.Drawing.Point(279, 2); @@ -186,10 +158,10 @@ private void InitializeComponent() this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutItemExportToExcel, this.emptySpaceItem, - this.layoutControlItemGlobalPKAnalysis, this.splitter, - this.layoutControlItem1, - this.layoutControlItemGlobalPKAnalysisDescription}); + this.layoutItemPopulationPKAnalysisTab, + this.layoutControlItemGlobalPKAnalysisDescription, + this.layoutControlItemGlobalPKAnalysis}); this.layoutControlGroup1.Name = "Root"; this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); this.layoutControlGroup1.Size = new System.Drawing.Size(555, 476); @@ -215,15 +187,6 @@ private void InitializeComponent() this.emptySpaceItem.Size = new System.Drawing.Size(277, 26); this.emptySpaceItem.TextSize = new System.Drawing.Size(0, 0); // - // layoutControlItemGlobalPKAnalysis - // - this.layoutControlItemGlobalPKAnalysis.Control = this.layoutControl; - this.layoutControlItemGlobalPKAnalysis.Location = new System.Drawing.Point(0, 43); - this.layoutControlItemGlobalPKAnalysis.Name = "layoutControlItemGlobalPKAnalysis"; - this.layoutControlItemGlobalPKAnalysis.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlItemGlobalPKAnalysis.Size = new System.Drawing.Size(555, 122); - this.layoutControlItemGlobalPKAnalysis.TextSize = new System.Drawing.Size(167, 13); - // // splitter // this.splitter.AllowHotTrack = true; @@ -231,14 +194,14 @@ private void InitializeComponent() this.splitter.Name = "splitter"; this.splitter.Size = new System.Drawing.Size(555, 10); // - // layoutControlItem1 + // layoutItemPopulationPKAnalysisTab // - this.layoutControlItem1.Control = this.populationPKAnalysisXtraTabControl; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 175); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(555, 301); - this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem1.TextVisible = false; + this.layoutItemPopulationPKAnalysisTab.Control = this.populationPKAnalysisTabControl; + this.layoutItemPopulationPKAnalysisTab.Location = new System.Drawing.Point(0, 175); + this.layoutItemPopulationPKAnalysisTab.Name = "layoutItemPopulationPKAnalysisTab"; + this.layoutItemPopulationPKAnalysisTab.Size = new System.Drawing.Size(555, 301); + this.layoutItemPopulationPKAnalysisTab.TextSize = new System.Drawing.Size(0, 0); + this.layoutItemPopulationPKAnalysisTab.TextVisible = false; // // layoutControlItemGlobalPKAnalysisDescription // @@ -249,57 +212,71 @@ private void InitializeComponent() this.layoutControlItemGlobalPKAnalysisDescription.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItemGlobalPKAnalysisDescription.TextVisible = false; // + // layoutControlItemGlobalPKAnalysis + // + this.layoutControlItemGlobalPKAnalysis.Control = this.globalPKParametersPanelControl; + this.layoutControlItemGlobalPKAnalysis.Location = new System.Drawing.Point(0, 43); + this.layoutControlItemGlobalPKAnalysis.Name = "layoutControlItemGlobalPKAnalysis"; + this.layoutControlItemGlobalPKAnalysis.Size = new System.Drawing.Size(555, 122); + this.layoutControlItemGlobalPKAnalysis.TextSize = new System.Drawing.Size(167, 13); + // + // globalPKParametersPanelControl + // + this.globalPKParametersPanelControl.Location = new System.Drawing.Point(181, 45); + this.globalPKParametersPanelControl.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.globalPKParametersPanelControl.Name = "globalPKParametersPanelControl"; + this.globalPKParametersPanelControl.Size = new System.Drawing.Size(372, 118); + this.globalPKParametersPanelControl.TabIndex = 4; + // // PopulationPKAnalysisView // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.layoutControl); this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "PopulationPKAnalysisView"; this.Size = new System.Drawing.Size(555, 476); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.populationPKAnalysisXtraTabControl)).EndInit(); - this.populationPKAnalysisXtraTabControl.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).EndInit(); + this.layoutControl.ResumeLayout(false); + this.layoutControl.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.populationPKAnalysisTabControl)).EndInit(); + this.populationPKAnalysisTabControl.ResumeLayout(false); this.pageOnCurves.ResumeLayout(false); this.pageOnCurves.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.populationPKAnalysisPanelOnCurve)).EndInit(); this.pageOnIndividuals.ResumeLayout(false); this.pageOnIndividuals.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.populationPKAnalysisPanelOnIndividuals)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).EndInit(); - this.layoutControl.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.globalPKParametersPanelControl)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemExportToExcel)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemGlobalPKAnalysis)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.splitter)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutItemPopulationPKAnalysisTab)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemGlobalPKAnalysisDescription)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemGlobalPKAnalysis)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.globalPKParametersPanelControl)).EndInit(); this.ResumeLayout(false); } #endregion + private OSPSuite.UI.Controls.UxLayoutControl layoutControl; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; private DevExpress.XtraEditors.SimpleButton btnExportToExcel; private DevExpress.XtraLayout.LayoutControlItem layoutItemExportToExcel; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem; private DevExpress.XtraEditors.PanelControl populationPKAnalysisPanelOnCurve; private DevExpress.XtraEditors.PanelControl populationPKAnalysisPanelOnIndividuals; - private DevExpress.XtraLayout.LayoutControl layoutControl; - private DevExpress.XtraLayout.LayoutControlGroup Root; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItemGlobalPKAnalysis; private DevExpress.XtraLayout.SplitterItem splitter; - private OSPSuite.UI.Controls.UxPanelControl globalPKParametersPanelControl; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; - private DevExpress.XtraTab.XtraTabControl populationPKAnalysisXtraTabControl; + private DevExpress.XtraTab.XtraTabControl populationPKAnalysisTabControl; private DevExpress.XtraTab.XtraTabPage pageOnCurves; private DevExpress.XtraTab.XtraTabPage pageOnIndividuals; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutItemPopulationPKAnalysisTab; private DevExpress.XtraEditors.LabelControl labelControlGlobalPKAnalysisDescription; private DevExpress.XtraLayout.LayoutControlItem layoutControlItemGlobalPKAnalysisDescription; + private OSPSuite.UI.Controls.UxPanelControl globalPKParametersPanelControl; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItemGlobalPKAnalysis; } -} +} \ No newline at end of file diff --git a/src/PKSim.UI/Views/Simulations/PopulationPKAnalysisView.cs b/src/PKSim.UI/Views/Simulations/PopulationPKAnalysisView.cs index ac8159f11..3fbd23698 100644 --- a/src/PKSim.UI/Views/Simulations/PopulationPKAnalysisView.cs +++ b/src/PKSim.UI/Views/Simulations/PopulationPKAnalysisView.cs @@ -49,7 +49,7 @@ public void BindTo(IntegratedPKAnalysisDTO pkAnalysisDTO) _populationAnalysisPivotViewOnIndividuals.BindTo(pkAnalysisDTO.OnIndividuals.DataTable); } - public bool IsOnCurvesSelected => populationPKAnalysisXtraTabControl.SelectedTabPage == pageOnCurves; + public bool IsOnCurvesSelected => populationPKAnalysisTabControl.SelectedTabPage == pageOnCurves; public void ShowPKAnalysisOnIndividuals(bool visible) { @@ -84,7 +84,7 @@ public override void InitializeBinding() public override void InitializeResources() { base.InitializeResources(); - populationPKAnalysisXtraTabControl.Images = _imageListRetriever.AllImages16x16; + populationPKAnalysisTabControl.Images = _imageListRetriever.AllImages16x16; pageOnIndividuals.ImageIndex = _imageListRetriever.ImageIndex(ApplicationIcons.Population); pageOnIndividuals.Text = PKSimConstants.PKAnalysis.OnIndividuals; @@ -97,7 +97,7 @@ public override void InitializeResources() btnExportToExcel.InitWithImage(ApplicationIcons.Excel, text: PKSimConstants.UI.ExportPKAnalysesToExcel); layoutItemExportToExcel.AdjustLargeButtonSize(layoutControl); layoutControlItemGlobalPKAnalysis.TextVisible = false; - populationPKAnalysisXtraTabControl.SelectedPageChanged += (o, e) => OnEvent(_presenter.HandleTabChanged); + populationPKAnalysisTabControl.SelectedPageChanged += (o, e) => OnEvent(_presenter.HandleTabChanged); labelControlGlobalPKAnalysisDescription.Text = PKSimConstants.UI.GlobalPKAnalysisDescription.FormatForLabel(); } }