Fixes #2331 Rename tabs for pk analysis on population simulations (#2337

)

* Fixes #2331 Rename tabs for pk analysis on population simulations

* Fixes #2331 Rename tabs for pk analysis on population simulations

* Fixes #2331 Rename tabs for pk analysis on population simulations

* Some additional objects that still used 'OnCurves' and 'OnIndividual' terminology

Co-authored-by: Robert McIntosh <rob.mcintosh@boschrexroth.ca>

src/PKSim.Assets/PKSimConstants.cs

@@ -2632,10 +2632,10 @@ public static class PKAnalysis
          public static readonly string Unit = UI.Unit;
          public static readonly string Description = "Description";
          public static readonly string Warning = "Warning";
-         public static readonly string OnCurves = "On Curves";
-         public static readonly string OnCurvesTooltip = "PK parameter values are calculated for the aggregated curves as shown in the chart";
-         public static readonly string OnIndividuals = "On Individuals";
-         public static readonly string OnIndividualsTooltip = "PK parameter values are aggregated from individual values";
+         public static readonly string AggregatedPKValues = "Aggregated PK Values";
+         public static readonly string AggregatedPKValuesTooltip = "PK parameter values are calculated for the aggregated curves as shown in the chart";
+         public static readonly string IndividualPKValues = "Individual PK Values";
+         public static readonly string IndivdualPKValuesTooltip = "PK parameter values are aggregated from individual values";
       }
 
       public static class Comparison

src/PKSim.Presentation/DTO/Simulations/PKAnalysisDTO.cs

@@ -27,7 +27,7 @@ private set
 
    public class IntegratedPKAnalysisDTO
    {
-      public PKAnalysisDTO OnIndividuals { get; set; }
-      public PKAnalysisDTO OnCurves { get; set; }
+      public PKAnalysisDTO IndividualPKValues { get; set; }
+      public PKAnalysisDTO AggregatedPKValues { get; set; }
    }
 }

src/PKSim.Presentation/Presenters/Simulations/PopulationPKAnalysisPresenter.cs

@@ -25,8 +25,8 @@ public class PopulationPKAnalysisPresenter : PKAnalysisPresenter<IPopulationPKAn
    {
       private readonly IPKAnalysesTask _pkAnalysesTask;
       private readonly IPKAnalysisExportTask _exportTask;
-      private readonly List<PopulationPKAnalysis> _allPKAnalysesOnCurves = new List<PopulationPKAnalysis>();
-      private readonly List<PopulationPKAnalysis> _allPKAnalysesOnIndividuals = new List<PopulationPKAnalysis>();
+      private readonly List<PopulationPKAnalysis> _allPKAnalysesAggregatedPKValues = new List<PopulationPKAnalysis>();
+      private readonly List<PopulationPKAnalysis> _allPKAnalysesIndividualPKValues = new List<PopulationPKAnalysis>();
       private IPopulationDataCollector _populationDataCollector;
       private readonly IPopulationPKAnalysisToPKAnalysisDTOMapper _populationPKAnalysisToDTOMapper;
       private readonly IGlobalPKAnalysisPresenter _globalPKAnalysisPresenter;
@@ -48,15 +48,15 @@ public PopulationPKAnalysisPresenter(IPopulationPKAnalysisView view, IPKAnalyses
       public void CalculatePKAnalyses(IPopulationDataCollector populationDataCollector, ChartData<TimeProfileXValue, TimeProfileYValue> timeProfileChartData, PopulationStatisticalAnalysis populationAnalysis)
       {
          _populationDataCollector = populationDataCollector;
-         _allPKAnalysesOnCurves.Clear();
-         _allPKAnalysesOnIndividuals.Clear();
-         var supportsPKAnalysisOnIndividual = _populationDataCollector.SupportsMultipleAggregations;
-         View.ShowPKAnalysisOnIndividuals(supportsPKAnalysisOnIndividual);
+         _allPKAnalysesAggregatedPKValues.Clear();
+         _allPKAnalysesIndividualPKValues.Clear();
+         var supportsPKAnalysisIndividualPKValues = _populationDataCollector.SupportsMultipleAggregations;
+         View.ShowPKAnalysisIndividualPKValues(supportsPKAnalysisIndividualPKValues);
 
          //Calculate based on curves
-         _allPKAnalysesOnCurves.AddRange(_pkAnalysesTask.CalculateFor(populationDataCollector, timeProfileChartData));
+         _allPKAnalysesAggregatedPKValues.AddRange(_pkAnalysesTask.CalculateFor(populationDataCollector, timeProfileChartData));
 
-         if (!supportsPKAnalysisOnIndividual)
+         if (!supportsPKAnalysisIndividualPKValues)
          {
             updateView();
             return;
@@ -75,7 +75,7 @@ public void CalculatePKAnalyses(IPopulationDataCollector populationDataCollector
          var captionPrefix = populationAnalysis.AllFieldNamesOn(PivotArea.DataArea);
 
          var pkAnalyses = _pkAnalysesTask.AggregatePKAnalysis(simulation, pkParameters, populationAnalysis.SelectedStatistics, captionPrefix[0]);
-         _allPKAnalysesOnIndividuals.AddRange(pkAnalyses);
+         _allPKAnalysesIndividualPKValues.AddRange(pkAnalyses);
 
          updateView();
       }
@@ -105,12 +105,12 @@ protected override void BindToPKAnalysis()
       {
          _view.BindTo(new IntegratedPKAnalysisDTO
          {
-            OnCurves = _populationPKAnalysisToDTOMapper.MapFrom(_allPKAnalysesOnCurves),
-            OnIndividuals = _populationPKAnalysisToDTOMapper.MapFrom(_allPKAnalysesOnIndividuals)
+            AggregatedPKValues = _populationPKAnalysisToDTOMapper.MapFrom(_allPKAnalysesAggregatedPKValues),
+            IndividualPKValues = _populationPKAnalysisToDTOMapper.MapFrom(_allPKAnalysesIndividualPKValues)
          });
       }
 
-      protected override IEnumerable<PKAnalysis> AllPKAnalyses => (View.IsOnCurvesSelected ? _allPKAnalysesOnCurves : _allPKAnalysesOnIndividuals).Select(x => x.PKAnalysis);
+      protected override IEnumerable<PKAnalysis> AllPKAnalyses => (View.IsAggregatedPKValuesSelected ? _allPKAnalysesAggregatedPKValues : _allPKAnalysesIndividualPKValues).Select(x => x.PKAnalysis);
 
       public override void ExportToExcel()
       {

src/PKSim.Presentation/Views/Simulations/IPopulationPKAnalysisView.cs

@@ -10,7 +10,7 @@ public interface IPopulationPKAnalysisView : IView<IPopulationPKAnalysisPresente
       void BindTo(IntegratedPKAnalysisDTO pkAnalysisDTO);
       DataTable GetSummaryData();
       void AddGlobalPKAnalysisView(IGlobalPKAnalysisView view);
-      bool IsOnCurvesSelected { get; }
-      void ShowPKAnalysisOnIndividuals(bool visible);
+      bool IsAggregatedPKValuesSelected { get; }
+      void ShowPKAnalysisIndividualPKValues(bool visible);
    }
 }