Conflict resolution

Bui-lab · Feb 1, 2024 · d61c942 · d61c942
1 parent 01c4a76
commit d61c942
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/SiliFish.UI/Controls/Display/ModelOutputControl.cs b/SiliFish.UI/Controls/Display/ModelOutputControl.cs
@@ -668,8 +668,8 @@ private void GetPlotSubset()
 
             tPlotStart = (int)ePlotStart.Value;
             tPlotEnd = (int)ePlotEnd.Value;
-            if (tPlotEnd > model.RunParam.MaxTime)
-                tPlotEnd = model.RunParam.MaxTime;
+            if (tPlotEnd > model.MaxTime)
+                tPlotEnd = model.MaxTime;
         }
         private void linkExportPlotData_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
@@ -810,7 +810,7 @@ private void listPlotHistory_ItemsImport(object sender, EventArgs e)
                 Selection = plotSelection
             };
             PlotGenerator PG = new();
-            (string Title, Charts) = PG.GetPlotData(lastPlot, simulation.Model, Cells, Pools, tPlotStart, tPlotEnd);
+            (string Title, Charts) = PG.GetPlotData(lastPlot, simulation, Cells, Pools, tPlotStart, tPlotEnd);
             errorMessage = PG.errorMessage;
             return (Title, Charts);
         }
@@ -1191,7 +1191,7 @@ private void Animate()
             try
             {
                 if (simulation == null || !simulation.SimulationRun) return;
-                htmlAnimation = AnimationGenerator.GenerateAnimation(simulation.Model, tAnimStart, tAnimEnd, (double)tAnimdt, out lastAnimationSpineCoordinates);
+                htmlAnimation = AnimationGenerator.GenerateAnimation(simulation, tAnimStart, tAnimEnd, (double)tAnimdt, out lastAnimationSpineCoordinates);
                 Invoke(CompleteAnimation);
             }
             catch { Invoke(CancelAnimation); }

diff --git a/SiliFish.UI/Resources/BuildDate.txt b/SiliFish.UI/Resources/BuildDate.txt
diff --git a/SiliFish/Resources/BuildDate.txt b/SiliFish/Resources/BuildDate.txt