diff --git a/src/PKSim.Presentation/Presenters/PopulationAnalyses/CreateTimeProfileAnalysisPresenter.cs b/src/PKSim.Presentation/Presenters/PopulationAnalyses/CreateTimeProfileAnalysisPresenter.cs index 904fe8939..56f71e970 100644 --- a/src/PKSim.Presentation/Presenters/PopulationAnalyses/CreateTimeProfileAnalysisPresenter.cs +++ b/src/PKSim.Presentation/Presenters/PopulationAnalyses/CreateTimeProfileAnalysisPresenter.cs @@ -18,8 +18,15 @@ public class CreateTimeProfileAnalysisPresenter : CreatePopulationAnalysisPresen { private readonly ILazyLoadTask _lazyLoadTask; - public CreateTimeProfileAnalysisPresenter(ICreatePopulationAnalysisView view, ISubPresenterItemManager subPresenterItemManager, - IDialogCreator dialogCreator, IPopulationAnalysisTemplateTask populationAnalysisTemplateTask, IPopulationAnalysisChartFactory populationAnalysisChartFactory, ILazyLoadTask lazyLoadTask, IPopulationAnalysisTask populationAnalysisTask, IPopulationAnalysisFieldFactory populationAnalysisFieldFactory) + public CreateTimeProfileAnalysisPresenter( + ICreatePopulationAnalysisView view, + ISubPresenterItemManager subPresenterItemManager, + IDialogCreator dialogCreator, + IPopulationAnalysisTemplateTask populationAnalysisTemplateTask, + IPopulationAnalysisChartFactory populationAnalysisChartFactory, + ILazyLoadTask lazyLoadTask, + IPopulationAnalysisTask populationAnalysisTask, + IPopulationAnalysisFieldFactory populationAnalysisFieldFactory) : base(view, subPresenterItemManager, TimeProfileItems.All, dialogCreator, populationAnalysisTemplateTask, populationAnalysisChartFactory, populationAnalysisTask, populationAnalysisFieldFactory) { _lazyLoadTask = lazyLoadTask; diff --git a/src/PKSim.Presentation/Presenters/PopulationAnalyses/PopulationAnalysisPKParameterSelectionPresenter.cs b/src/PKSim.Presentation/Presenters/PopulationAnalyses/PopulationAnalysisPKParameterSelectionPresenter.cs index 941ab1f4d..eb4d4e816 100644 --- a/src/PKSim.Presentation/Presenters/PopulationAnalyses/PopulationAnalysisPKParameterSelectionPresenter.cs +++ b/src/PKSim.Presentation/Presenters/PopulationAnalyses/PopulationAnalysisPKParameterSelectionPresenter.cs @@ -1,11 +1,11 @@ -using OSPSuite.Utility.Events; +using OSPSuite.Core.Domain; +using OSPSuite.Utility.Events; using OSPSuite.Utility.Extensions; using PKSim.Core.Events; using PKSim.Core.Model; using PKSim.Core.Model.PopulationAnalyses; using PKSim.Presentation.Presenters.Populations; using PKSim.Presentation.Views.PopulationAnalyses; -using OSPSuite.Core.Domain; namespace PKSim.Presentation.Presenters.PopulationAnalyses { @@ -24,8 +24,10 @@ public class PopulationAnalysisPKParameterSelectionPresenter : PopulationAnalysi private readonly IPopulationAnalysisAvailablePKParametersPresenter _allPKParametersPresenter; private readonly IPopulationAnalysisPKParameterFieldsPresenter _selectedPKParameterFieldsPresenter; - public PopulationAnalysisPKParameterSelectionPresenter(IPopulationAnalysisPKParameterSelectionView view, - IPopulationAnalysisAvailablePKParametersPresenter allPKParametersPresenter, IPopulationAnalysisPKParameterFieldsPresenter selectedPKParameterFieldsPresenter, + public PopulationAnalysisPKParameterSelectionPresenter( + IPopulationAnalysisPKParameterSelectionView view, + IPopulationAnalysisAvailablePKParametersPresenter allPKParametersPresenter, + IPopulationAnalysisPKParameterFieldsPresenter selectedPKParameterFieldsPresenter, IPopulationAnalysisFieldDistributionPresenter populationAnalysisFieldDistributionPresenter) : base(view, populationAnalysisFieldDistributionPresenter) { @@ -43,10 +45,7 @@ public PopulationAnalysisPKParameterSelectionPresenter(IPopulationAnalysisPKPara AddSubPresenters(_allPKParametersPresenter, _selectedPKParameterFieldsPresenter); } - private void drawDistributionFor(PKParameterFieldSelectedEventArgs e) - { - drawDistributionFor(e.PKParameter, e.PKParameterField); - } + private void drawDistributionFor(PKParameterFieldSelectedEventArgs e) => drawDistributionFor(e.PKParameter, e.PKParameterField); private void drawDistributionFor(QuantityPKParameter pkParameter, PopulationAnalysisPKParameterField populationAnalysisPKParameterField) { @@ -78,8 +77,8 @@ public void RemovePKParameters() public bool ScalingVisible { - set { _selectedPKParameterFieldsPresenter.ScalingVisible = value; } - get { return _selectedPKParameterFieldsPresenter.ScalingVisible; } + set => _selectedPKParameterFieldsPresenter.ScalingVisible = value; + get => _selectedPKParameterFieldsPresenter.ScalingVisible; } protected override void RedrawDistribution(PopulationAnalysisFieldEvent eventToHandle) diff --git a/src/PKSim.Presentation/Presenters/PopulationAnalyses/PopulationAnalysisParameterSelectionPresenter.cs b/src/PKSim.Presentation/Presenters/PopulationAnalyses/PopulationAnalysisParameterSelectionPresenter.cs index 363f9c57c..79226896a 100644 --- a/src/PKSim.Presentation/Presenters/PopulationAnalyses/PopulationAnalysisParameterSelectionPresenter.cs +++ b/src/PKSim.Presentation/Presenters/PopulationAnalyses/PopulationAnalysisParameterSelectionPresenter.cs @@ -28,7 +28,12 @@ public class PopulationAnalysisParameterSelectionPresenter : PopulationAnalysisS private readonly IPopulationAnalysisParameterFieldsPresenter _selectedPopulationParametersPresenter; private readonly IEntityPathResolver _entityPathResolver; - public PopulationAnalysisParameterSelectionPresenter(IPopulationAnalysisParameterSelectionView view, IPopulationParameterGroupsPresenter allPopulationParametersPresenter, IPopulationAnalysisParameterFieldsPresenter selectedPopulationParametersPresenter, IEntityPathResolver entityPathResolver, IPopulationAnalysisFieldDistributionPresenter populationAnalysisFieldDistributionPresenter) + public PopulationAnalysisParameterSelectionPresenter( + IPopulationAnalysisParameterSelectionView view, + IPopulationParameterGroupsPresenter allPopulationParametersPresenter, + IPopulationAnalysisParameterFieldsPresenter selectedPopulationParametersPresenter, + IEntityPathResolver entityPathResolver, + IPopulationAnalysisFieldDistributionPresenter populationAnalysisFieldDistributionPresenter) : base(view, populationAnalysisFieldDistributionPresenter) { _allPopulationParametersPresenter = allPopulationParametersPresenter; diff --git a/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisPKParameterSelectionView.Designer.cs b/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisPKParameterSelectionView.Designer.cs index 16d39f757..a6ac7edf0 100644 --- a/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisPKParameterSelectionView.Designer.cs +++ b/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisPKParameterSelectionView.Designer.cs @@ -28,7 +28,6 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.splitContainerControl = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutControl = new OSPSuite.UI.Controls.UxLayoutControl(); this.btnRemove = new DevExpress.XtraEditors.SimpleButton(); this.btnAdd = new DevExpress.XtraEditors.SimpleButton(); @@ -41,11 +40,10 @@ private void InitializeComponent() this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem(); this.layoutItemButtonAdd = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutItemButtonRemove = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.panelDistributionView = new DevExpress.XtraEditors.PanelControl(); + this.layoutItemDistributionView = new DevExpress.XtraLayout.LayoutControlItem(); + this.splitter = new DevExpress.XtraLayout.SplitterItem(); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl)).BeginInit(); - this.splitContainerControl.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).BeginInit(); this.layoutControl.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.panelSelectedPKParameters)).BeginInit(); @@ -57,26 +55,15 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemButtonAdd)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemButtonRemove)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.panelDistributionView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutItemDistributionView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitter)).BeginInit(); this.SuspendLayout(); // - // splitContainerControl - // - this.splitContainerControl.Horizontal = false; - this.splitContainerControl.Location = new System.Drawing.Point(2, 2); - this.splitContainerControl.Name = "splitContainerControl"; - this.splitContainerControl.Panel1.Controls.Add(this.layoutControl); - this.splitContainerControl.Panel1.Text = "Panel1"; - this.splitContainerControl.Panel2.Text = "Panel2"; - this.splitContainerControl.Size = new System.Drawing.Size(773, 489); - this.splitContainerControl.SplitterPosition = 265; - this.splitContainerControl.TabIndex = 4; - this.splitContainerControl.Text = "splitContainerControl1"; - // // layoutControl1 // this.layoutControl.AllowCustomization = false; + this.layoutControl.Controls.Add(this.panelDistributionView); this.layoutControl.Controls.Add(this.btnRemove); this.layoutControl.Controls.Add(this.btnAdd); this.layoutControl.Controls.Add(this.panelSelectedPKParameters); @@ -85,33 +72,33 @@ private void InitializeComponent() this.layoutControl.Location = new System.Drawing.Point(0, 0); this.layoutControl.Name = "layoutControl"; this.layoutControl.Root = this.layoutControlGroup2; - this.layoutControl.Size = new System.Drawing.Size(773, 265); - this.layoutControl.TabIndex = 0; + this.layoutControl.Size = new System.Drawing.Size(1253, 702); + this.layoutControl.TabIndex = 1; this.layoutControl.Text = "layoutControl1"; // // btnRemove // - this.btnRemove.Location = new System.Drawing.Point(341, 138); + this.btnRemove.Location = new System.Drawing.Point(551, 200); this.btnRemove.Name = "btnRemove"; - this.btnRemove.Size = new System.Drawing.Size(94, 22); + this.btnRemove.Size = new System.Drawing.Size(155, 22); this.btnRemove.StyleController = this.layoutControl; this.btnRemove.TabIndex = 7; this.btnRemove.Text = "btnRemove"; // // btnAdd // - this.btnAdd.Location = new System.Drawing.Point(341, 112); + this.btnAdd.Location = new System.Drawing.Point(551, 174); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(94, 22); + this.btnAdd.Size = new System.Drawing.Size(155, 22); this.btnAdd.StyleController = this.layoutControl; this.btnAdd.TabIndex = 6; this.btnAdd.Text = "btnAdd"; // // panelSelectedPKParameters // - this.panelSelectedPKParameters.Location = new System.Drawing.Point(439, 2); + this.panelSelectedPKParameters.Location = new System.Drawing.Point(710, 2); this.panelSelectedPKParameters.Name = "panelSelectedPKParameters"; - this.panelSelectedPKParameters.Size = new System.Drawing.Size(332, 261); + this.panelSelectedPKParameters.Size = new System.Drawing.Size(541, 406); this.panelSelectedPKParameters.TabIndex = 5; // // panelAvailablePKParameters @@ -119,7 +106,7 @@ private void InitializeComponent() this.panelAvailablePKParameters.Location = new System.Drawing.Point(2, 2); this.panelAvailablePKParameters.Name = "panelAvailablePKParameters"; this.panelAvailablePKParameters.Padding = new System.Windows.Forms.Padding(10); - this.panelAvailablePKParameters.Size = new System.Drawing.Size(335, 261); + this.panelAvailablePKParameters.Size = new System.Drawing.Size(545, 406); this.panelAvailablePKParameters.TabIndex = 4; // // layoutControlGroup2 @@ -133,12 +120,12 @@ private void InitializeComponent() this.emptySpaceItem1, this.emptySpaceItem2, this.layoutItemButtonAdd, - this.layoutItemButtonRemove}); - this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0); - this.layoutControlGroup2.Name = "layoutControlGroup2"; + this.layoutItemButtonRemove, + this.layoutItemDistributionView, + this.splitter}); + this.layoutControlGroup2.Name = "Root"; this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlGroup2.Size = new System.Drawing.Size(773, 265); - this.layoutControlGroup2.Text = "layoutControlGroup2"; + this.layoutControlGroup2.Size = new System.Drawing.Size(1253, 702); this.layoutControlGroup2.TextVisible = false; // // layoutControlItem2 @@ -147,104 +134,90 @@ private void InitializeComponent() this.layoutControlItem2.CustomizationFormText = "layoutControlItem2"; this.layoutControlItem2.Location = new System.Drawing.Point(0, 0); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(339, 265); - this.layoutControlItem2.Text = "layoutControlItem2"; + this.layoutControlItem2.Size = new System.Drawing.Size(549, 410); this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem2.TextToControlDistance = 0; this.layoutControlItem2.TextVisible = false; // // layoutControlItem3 // this.layoutControlItem3.Control = this.panelSelectedPKParameters; this.layoutControlItem3.CustomizationFormText = "layoutControlItem3"; - this.layoutControlItem3.Location = new System.Drawing.Point(437, 0); + this.layoutControlItem3.Location = new System.Drawing.Point(708, 0); this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Size = new System.Drawing.Size(336, 265); - this.layoutControlItem3.Text = "layoutControlItem3"; + this.layoutControlItem3.Size = new System.Drawing.Size(545, 410); this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem3.TextToControlDistance = 0; this.layoutControlItem3.TextVisible = false; // // emptySpaceItem1 // this.emptySpaceItem1.AllowHotTrack = false; this.emptySpaceItem1.CustomizationFormText = "emptySpaceItem1"; - this.emptySpaceItem1.Location = new System.Drawing.Point(339, 0); + this.emptySpaceItem1.Location = new System.Drawing.Point(549, 0); this.emptySpaceItem1.Name = "emptySpaceItem1"; - this.emptySpaceItem1.Size = new System.Drawing.Size(98, 110); - this.emptySpaceItem1.Text = "emptySpaceItem1"; + this.emptySpaceItem1.Size = new System.Drawing.Size(159, 172); this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0); // // emptySpaceItem2 // this.emptySpaceItem2.AllowHotTrack = false; this.emptySpaceItem2.CustomizationFormText = "emptySpaceItem2"; - this.emptySpaceItem2.Location = new System.Drawing.Point(339, 162); + this.emptySpaceItem2.Location = new System.Drawing.Point(549, 224); this.emptySpaceItem2.Name = "emptySpaceItem2"; this.emptySpaceItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10); - this.emptySpaceItem2.Size = new System.Drawing.Size(98, 103); - this.emptySpaceItem2.Text = "emptySpaceItem2"; + this.emptySpaceItem2.Size = new System.Drawing.Size(159, 186); this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0); // // layoutItemButtonAdd // this.layoutItemButtonAdd.Control = this.btnAdd; this.layoutItemButtonAdd.CustomizationFormText = "layoutItemButtonAdd"; - this.layoutItemButtonAdd.Location = new System.Drawing.Point(339, 110); + this.layoutItemButtonAdd.Location = new System.Drawing.Point(549, 172); this.layoutItemButtonAdd.Name = "layoutItemButtonAdd"; - this.layoutItemButtonAdd.Size = new System.Drawing.Size(98, 26); - this.layoutItemButtonAdd.Text = "layoutItemButtonAdd"; + this.layoutItemButtonAdd.Size = new System.Drawing.Size(159, 26); this.layoutItemButtonAdd.TextSize = new System.Drawing.Size(0, 0); - this.layoutItemButtonAdd.TextToControlDistance = 0; this.layoutItemButtonAdd.TextVisible = false; // // layoutItemButtonRemove // this.layoutItemButtonRemove.Control = this.btnRemove; this.layoutItemButtonRemove.CustomizationFormText = "layoutItemButtonRemove"; - this.layoutItemButtonRemove.Location = new System.Drawing.Point(339, 136); + this.layoutItemButtonRemove.Location = new System.Drawing.Point(549, 198); this.layoutItemButtonRemove.Name = "layoutItemButtonRemove"; - this.layoutItemButtonRemove.Size = new System.Drawing.Size(98, 26); - this.layoutItemButtonRemove.Text = "layoutItemButtonRemove"; + this.layoutItemButtonRemove.Size = new System.Drawing.Size(159, 26); this.layoutItemButtonRemove.TextSize = new System.Drawing.Size(0, 0); - this.layoutItemButtonRemove.TextToControlDistance = 0; this.layoutItemButtonRemove.TextVisible = false; // - // layoutControlGroup1 - // - this.layoutControlGroup1.CustomizationFormText = "Root"; - this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; - this.layoutControlGroup1.GroupBordersVisible = false; - this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem1}); - this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0); - this.layoutControlGroup1.Name = "Root"; - this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlGroup1.Size = new System.Drawing.Size(777, 493); - this.layoutControlGroup1.Text = "Root"; - this.layoutControlGroup1.TextVisible = false; - // - // layoutControlItem1 - // - this.layoutControlItem1.Control = this.splitContainerControl; - this.layoutControlItem1.CustomizationFormText = "layoutControlItem1"; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(777, 493); - this.layoutControlItem1.Text = "layoutControlItem1"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem1.TextToControlDistance = 0; - this.layoutControlItem1.TextVisible = false; + // panelControl1 + // + this.panelDistributionView.Location = new System.Drawing.Point(2, 422); + this.panelDistributionView.Name = "panelDistributionView"; + this.panelDistributionView.Size = new System.Drawing.Size(1249, 278); + this.panelDistributionView.TabIndex = 8; + // + // layoutItemChart + // + this.layoutItemDistributionView.Control = this.panelDistributionView; + this.layoutItemDistributionView.Location = new System.Drawing.Point(0, 420); + this.layoutItemDistributionView.Name = "layoutItemDistributionView"; + this.layoutItemDistributionView.Size = new System.Drawing.Size(1253, 282); + this.layoutItemDistributionView.TextSize = new System.Drawing.Size(0, 0); + this.layoutItemDistributionView.TextVisible = false; + // + // splitter + // + this.splitter.AllowHotTrack = true; + this.splitter.Location = new System.Drawing.Point(0, 410); + this.splitter.Name = "splitter"; + this.splitter.Size = new System.Drawing.Size(1253, 10); // // PopulationAnalysisPKParameterSelectionView // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.layoutControl); this.Name = "PopulationAnalysisPKParameterSelectionView"; - this.Size = new System.Drawing.Size(777, 493); + this.Size = new System.Drawing.Size(1253, 702); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl)).EndInit(); - this.splitContainerControl.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).EndInit(); this.layoutControl.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.panelSelectedPKParameters)).EndInit(); @@ -256,29 +229,29 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemButtonAdd)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemButtonRemove)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.panelDistributionView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutItemDistributionView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitter)).EndInit(); this.ResumeLayout(false); } #endregion - private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; - private DevExpress.XtraEditors.SplitContainerControl splitContainerControl; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private OSPSuite.UI.Controls.UxLayoutControl layoutControl; - private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2; + private DevExpress.XtraEditors.PanelControl panelDistributionView; + private DevExpress.XtraEditors.SimpleButton btnRemove; + private DevExpress.XtraEditors.SimpleButton btnAdd; private DevExpress.XtraEditors.PanelControl panelSelectedPKParameters; private DevExpress.XtraEditors.PanelControl panelAvailablePKParameters; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1; - private DevExpress.XtraEditors.SimpleButton btnRemove; - private DevExpress.XtraEditors.SimpleButton btnAdd; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2; private DevExpress.XtraLayout.LayoutControlItem layoutItemButtonAdd; private DevExpress.XtraLayout.LayoutControlItem layoutItemButtonRemove; - + private DevExpress.XtraLayout.LayoutControlItem layoutItemDistributionView; + private DevExpress.XtraLayout.SplitterItem splitter; } } diff --git a/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisPKParameterSelectionView.cs b/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisPKParameterSelectionView.cs index 201045079..3c6240d97 100644 --- a/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisPKParameterSelectionView.cs +++ b/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisPKParameterSelectionView.cs @@ -5,7 +5,6 @@ using PKSim.Assets; using PKSim.Presentation.Presenters.PopulationAnalyses; using PKSim.Presentation.Views.PopulationAnalyses; -using PKSim.UI.Extensions; namespace PKSim.UI.Views.PopulationAnalyses { @@ -54,7 +53,7 @@ public void AddSelectedPKParametersView(IView view) public void AddDistributionView(IView view) { - splitContainerControl.Panel2.FillWith(view); + panelDistributionView.FillWith(view); } } } \ No newline at end of file diff --git a/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisParameterSelectionView.Designer.cs b/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisParameterSelectionView.Designer.cs index 475448f64..cf6614435 100644 --- a/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisParameterSelectionView.Designer.cs +++ b/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisParameterSelectionView.Designer.cs @@ -28,55 +28,42 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.splitContainerControl = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutControl = new OSPSuite.UI.Controls.UxLayoutControl(); this.btnRemove = new DevExpress.XtraEditors.SimpleButton(); this.btnAdd = new DevExpress.XtraEditors.SimpleButton(); this.panelSelectedParameters = new DevExpress.XtraEditors.PanelControl(); this.panelParameters = new DevExpress.XtraEditors.PanelControl(); - this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem(); this.layoutItemButtonAdd = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutItemButtonRemove = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlGroup = new DevExpress.XtraLayout.LayoutControlGroup(); + this.panelDistribution = new DevExpress.XtraEditors.PanelControl(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.splitter = new DevExpress.XtraLayout.SplitterItem(); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl)).BeginInit(); - this.splitContainerControl.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).BeginInit(); this.layoutControl.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.panelSelectedParameters)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.panelParameters)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemButtonAdd)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemButtonRemove)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.panelDistribution)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitter)).BeginInit(); this.SuspendLayout(); - // - // splitContainerControl - // - this.splitContainerControl.Horizontal = false; - this.splitContainerControl.Location = new System.Drawing.Point(2, 2); - this.splitContainerControl.Name = "splitContainerControl"; - this.splitContainerControl.Panel1.Controls.Add(this.layoutControl); - this.splitContainerControl.Panel1.Text = "Panel1"; - this.splitContainerControl.Panel2.Text = "Panel2"; - this.splitContainerControl.Size = new System.Drawing.Size(773, 489); - this.splitContainerControl.SplitterPosition = 265; - this.splitContainerControl.TabIndex = 4; - this.splitContainerControl.Text = "splitContainerControl1"; // // layoutControl1 // this.layoutControl.AllowCustomization = false; + this.layoutControl.Controls.Add(this.panelDistribution); this.layoutControl.Controls.Add(this.btnRemove); this.layoutControl.Controls.Add(this.btnAdd); this.layoutControl.Controls.Add(this.panelSelectedParameters); @@ -84,34 +71,35 @@ private void InitializeComponent() this.layoutControl.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutControl.Location = new System.Drawing.Point(0, 0); this.layoutControl.Name = "layoutControl"; - this.layoutControl.Root = this.layoutControlGroup1; - this.layoutControl.Size = new System.Drawing.Size(773, 265); - this.layoutControl.TabIndex = 0; + this.layoutControl.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1419, 502, 650, 400); + this.layoutControl.Root = this.Root; + this.layoutControl.Size = new System.Drawing.Size(1203, 758); + this.layoutControl.TabIndex = 1; this.layoutControl.Text = "layoutControl1"; // // btnRemove // - this.btnRemove.Location = new System.Drawing.Point(341, 138); + this.btnRemove.Location = new System.Drawing.Point(530, 228); this.btnRemove.Name = "btnRemove"; - this.btnRemove.Size = new System.Drawing.Size(93, 22); + this.btnRemove.Size = new System.Drawing.Size(147, 22); this.btnRemove.StyleController = this.layoutControl; this.btnRemove.TabIndex = 7; this.btnRemove.Text = "btnRemove"; // // btnAdd // - this.btnAdd.Location = new System.Drawing.Point(341, 112); + this.btnAdd.Location = new System.Drawing.Point(530, 202); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(93, 22); + this.btnAdd.Size = new System.Drawing.Size(147, 22); this.btnAdd.StyleController = this.layoutControl; this.btnAdd.TabIndex = 6; this.btnAdd.Text = "btnAdd"; // // panelSelectedParameters // - this.panelSelectedParameters.Location = new System.Drawing.Point(438, 2); + this.panelSelectedParameters.Location = new System.Drawing.Point(681, 2); this.panelSelectedParameters.Name = "panelSelectedParameters"; - this.panelSelectedParameters.Size = new System.Drawing.Size(333, 261); + this.panelSelectedParameters.Size = new System.Drawing.Size(520, 425); this.panelSelectedParameters.TabIndex = 5; // // panelParameters @@ -119,26 +107,27 @@ private void InitializeComponent() this.panelParameters.Location = new System.Drawing.Point(2, 2); this.panelParameters.Name = "panelParameters"; this.panelParameters.Padding = new System.Windows.Forms.Padding(10); - this.panelParameters.Size = new System.Drawing.Size(335, 261); + this.panelParameters.Size = new System.Drawing.Size(524, 425); this.panelParameters.TabIndex = 4; // - // layoutControlGroup1 + // Root // - this.layoutControlGroup1.CustomizationFormText = "layoutControlGroup1"; - this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; - this.layoutControlGroup1.GroupBordersVisible = false; - this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.Root.CustomizationFormText = "Root"; + this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.Root.GroupBordersVisible = false; + this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem2, this.layoutControlItem3, this.emptySpaceItem1, this.emptySpaceItem2, this.layoutItemButtonAdd, - this.layoutItemButtonRemove}); - this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0); - this.layoutControlGroup1.Name = "layoutControlGroup1"; - this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlGroup1.Size = new System.Drawing.Size(773, 265); - this.layoutControlGroup1.TextVisible = false; + this.layoutItemButtonRemove, + this.layoutControlItem1, + this.splitter}); + this.Root.Name = "Root"; + this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); + this.Root.Size = new System.Drawing.Size(1203, 758); + this.Root.TextVisible = false; // // layoutControlItem2 // @@ -146,7 +135,7 @@ private void InitializeComponent() this.layoutControlItem2.CustomizationFormText = "layoutControlItem2"; this.layoutControlItem2.Location = new System.Drawing.Point(0, 0); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(339, 265); + this.layoutControlItem2.Size = new System.Drawing.Size(528, 429); this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem2.TextVisible = false; // @@ -154,9 +143,9 @@ private void InitializeComponent() // this.layoutControlItem3.Control = this.panelSelectedParameters; this.layoutControlItem3.CustomizationFormText = "layoutControlItem3"; - this.layoutControlItem3.Location = new System.Drawing.Point(436, 0); + this.layoutControlItem3.Location = new System.Drawing.Point(679, 0); this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Size = new System.Drawing.Size(337, 265); + this.layoutControlItem3.Size = new System.Drawing.Size(524, 429); this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem3.TextVisible = false; // @@ -164,27 +153,27 @@ private void InitializeComponent() // this.emptySpaceItem1.AllowHotTrack = false; this.emptySpaceItem1.CustomizationFormText = "emptySpaceItem1"; - this.emptySpaceItem1.Location = new System.Drawing.Point(339, 0); + this.emptySpaceItem1.Location = new System.Drawing.Point(528, 0); this.emptySpaceItem1.Name = "emptySpaceItem1"; - this.emptySpaceItem1.Size = new System.Drawing.Size(97, 110); + this.emptySpaceItem1.Size = new System.Drawing.Size(151, 200); this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0); // // emptySpaceItem2 // this.emptySpaceItem2.AllowHotTrack = false; this.emptySpaceItem2.CustomizationFormText = "emptySpaceItem2"; - this.emptySpaceItem2.Location = new System.Drawing.Point(339, 162); + this.emptySpaceItem2.Location = new System.Drawing.Point(528, 252); this.emptySpaceItem2.Name = "emptySpaceItem2"; - this.emptySpaceItem2.Size = new System.Drawing.Size(97, 103); + this.emptySpaceItem2.Size = new System.Drawing.Size(151, 177); this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0); // // layoutItemButtonAdd // this.layoutItemButtonAdd.Control = this.btnAdd; this.layoutItemButtonAdd.CustomizationFormText = "layoutControlItem4"; - this.layoutItemButtonAdd.Location = new System.Drawing.Point(339, 110); + this.layoutItemButtonAdd.Location = new System.Drawing.Point(528, 200); this.layoutItemButtonAdd.Name = "layoutItemButtonAdd"; - this.layoutItemButtonAdd.Size = new System.Drawing.Size(97, 26); + this.layoutItemButtonAdd.Size = new System.Drawing.Size(151, 26); this.layoutItemButtonAdd.TextSize = new System.Drawing.Size(0, 0); this.layoutItemButtonAdd.TextVisible = false; // @@ -192,77 +181,77 @@ private void InitializeComponent() // this.layoutItemButtonRemove.Control = this.btnRemove; this.layoutItemButtonRemove.CustomizationFormText = "layoutControlItem5"; - this.layoutItemButtonRemove.Location = new System.Drawing.Point(339, 136); + this.layoutItemButtonRemove.Location = new System.Drawing.Point(528, 226); this.layoutItemButtonRemove.Name = "layoutItemButtonRemove"; - this.layoutItemButtonRemove.Size = new System.Drawing.Size(97, 26); + this.layoutItemButtonRemove.Size = new System.Drawing.Size(151, 26); this.layoutItemButtonRemove.TextSize = new System.Drawing.Size(0, 0); this.layoutItemButtonRemove.TextVisible = false; // - // layoutControlGroup + // panelDistribution // - this.layoutControlGroup.CustomizationFormText = "layoutControlGroup1"; - this.layoutControlGroup.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; - this.layoutControlGroup.GroupBordersVisible = false; - this.layoutControlGroup.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem1}); - this.layoutControlGroup.Location = new System.Drawing.Point(0, 0); - this.layoutControlGroup.Name = "layoutControlGroup"; - this.layoutControlGroup.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlGroup.Size = new System.Drawing.Size(777, 493); - this.layoutControlGroup.TextVisible = false; + this.panelDistribution.Location = new System.Drawing.Point(2, 441); + this.panelDistribution.Name = "panelDistribution"; + this.panelDistribution.Size = new System.Drawing.Size(1199, 315); + this.panelDistribution.TabIndex = 8; // // layoutControlItem1 // - this.layoutControlItem1.Control = this.splitContainerControl; - this.layoutControlItem1.CustomizationFormText = "layoutControlItem1"; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem1.Control = this.panelDistribution; + this.layoutControlItem1.Location = new System.Drawing.Point(0, 439); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(777, 493); + this.layoutControlItem1.Size = new System.Drawing.Size(1203, 319); this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem1.TextVisible = false; // + // splitter + // + this.splitter.AllowHotTrack = true; + this.splitter.Location = new System.Drawing.Point(0, 429); + this.splitter.Name = "splitter"; + this.splitter.Size = new System.Drawing.Size(1203, 10); + // // PopulationAnalysisParameterSelectionView // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.layoutControl); this.Name = "PopulationAnalysisParameterSelectionView"; - this.Size = new System.Drawing.Size(777, 493); + this.Size = new System.Drawing.Size(1203, 758); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl)).EndInit(); - this.splitContainerControl.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).EndInit(); this.layoutControl.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.panelSelectedParameters)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.panelParameters)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemButtonAdd)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemButtonRemove)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.panelDistribution)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitter)).EndInit(); this.ResumeLayout(false); } #endregion - private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup; - private DevExpress.XtraEditors.SplitContainerControl splitContainerControl; private OSPSuite.UI.Controls.UxLayoutControl layoutControl; private DevExpress.XtraEditors.SimpleButton btnRemove; private DevExpress.XtraEditors.SimpleButton btnAdd; private DevExpress.XtraEditors.PanelControl panelSelectedParameters; private DevExpress.XtraEditors.PanelControl panelParameters; - private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; + private DevExpress.XtraLayout.LayoutControlGroup Root; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2; private DevExpress.XtraLayout.LayoutControlItem layoutItemButtonAdd; private DevExpress.XtraLayout.LayoutControlItem layoutItemButtonRemove; + private DevExpress.XtraEditors.PanelControl panelDistribution; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.SplitterItem splitter; } -} +} \ No newline at end of file diff --git a/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisParameterSelectionView.cs b/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisParameterSelectionView.cs index b93a5966d..6574c9bf1 100644 --- a/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisParameterSelectionView.cs +++ b/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisParameterSelectionView.cs @@ -1,11 +1,10 @@ -using PKSim.Assets; -using OSPSuite.Assets; -using PKSim.Presentation.Presenters.PopulationAnalyses; -using PKSim.Presentation.Views.PopulationAnalyses; +using OSPSuite.Assets; using OSPSuite.Presentation.Views; -using OSPSuite.UI.Extensions; using OSPSuite.UI.Controls; -using PKSim.UI.Extensions; +using OSPSuite.UI.Extensions; +using PKSim.Assets; +using PKSim.Presentation.Presenters.PopulationAnalyses; +using PKSim.Presentation.Views.PopulationAnalyses; namespace PKSim.UI.Views.PopulationAnalyses { @@ -35,7 +34,7 @@ public void AddSelectedParametersView(IView view) public void AddDistributionView(IView view) { - splitContainerControl.Panel2.FillWith(view); + panelDistribution.FillWith(view); } public override void InitializeResources() diff --git a/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisParameterSelectionView.resx b/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisParameterSelectionView.resx index b38e0ff0c..307e6e0e7 100644 --- a/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisParameterSelectionView.resx +++ b/src/PKSim.UI/Views/PopulationAnalyses/PopulationAnalysisParameterSelectionView.resx @@ -120,4 +120,7 @@ 17, 17 + + 28 + \ No newline at end of file