From 731b6a5407b61856a1fdc958445a58e30790e4eb Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Mon, 8 Apr 2024 10:07:23 +0200
Subject: [PATCH] Fix broken interpolated points

Broke from moving dataset loading to initialise in 3f8bff5a625835343d23ee3ed40e3f19d77d28a5, and resulted in a crash..
---
 .../renderableinterpolatedpoints.cpp          | 47 ++++++++++---------
 .../pointcloud/renderableinterpolatedpoints.h |  3 ++
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
index 26a4aed43d..be13a0ab67 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.cpp
@@ -168,7 +168,7 @@ documentation::Documentation RenderableInterpolatedPoints::Documentation() {
 RenderableInterpolatedPoints::Interpolation::Interpolation()
     : properties::PropertyOwner({ "Interpolation", "Interpolation", "" })
     , value(InterpolationValueInfo, 0.f, 0.f, 1.f)
-    , nSteps(StepsInfo)
+    , nSteps(StepsInfo, 1)
     , goToNextStep(JumpToNextInfo)
     , goToPrevStep(JumpToPrevInfo)
     , interpolateToNextStep(InterpolateToNextInfo)
@@ -268,23 +268,6 @@ RenderableInterpolatedPoints::RenderableInterpolatedPoints(
         );
     }
 
-    unsigned int nObjects = static_cast<unsigned int>(p.numberOfObjects);
-
-    // At this point, the dataset has been loaded and the number of points computed. We
-    // need to recompute them and compute how many steps the number of points
-    // corresponded to
-
-    if (_nDataPoints % nObjects != 0) {
-        LERROR(std::format(
-            "Mismatch between provided number of data entries and the specified number "
-            "of points. Expected the number of entries in the data file '{}' to be "
-            "evenly divisible by the number of points", _dataFile
-        ));
-    }
-
-    _interpolation.nSteps = _nDataPoints / nObjects;
-    _interpolation.value.setMaxValue(static_cast<float>(_interpolation.nSteps - 1));
-
     _interpolation.value.onChange([this]() {
         bool passedAKnot =
             glm::ceil(_interpolation.value) != glm::ceil(_prevInterpolationValue);
@@ -300,10 +283,7 @@ RenderableInterpolatedPoints::RenderableInterpolatedPoints(
         _shouldReinitializeBufferdata = true;
     });
 
-    // This property is mostly for show in the UI, but also used to tell how many points
-    // should be rendered. So make sure it is updated once we know the number of
-    // interpolation steps
-    _nDataPoints = nObjects;
+    _nObjectsInDataset = static_cast<unsigned int>(p.numberOfObjects);
 
     if (_skipFirstDataPoint) {
         LWARNING(
@@ -314,6 +294,29 @@ RenderableInterpolatedPoints::RenderableInterpolatedPoints(
     }
 }
 
+void RenderableInterpolatedPoints::initialize() {
+    RenderablePointCloud::initialize();
+
+    // At this point, the dataset has been loaded and we know how many data points it
+    // contains => we can compute the number of interpolation steps
+    if (_nDataPoints % _nObjectsInDataset != 0) {
+        LERROR(std::format(
+            "Mismatch between provided number of data entries and the specified number "
+            "of points. Expected the number of entries in the data file '{}' to be "
+            "evenly divisible by the number of objects", _dataFile
+        ));
+    }
+
+    if (_nObjectsInDataset > 0) {
+        _interpolation.nSteps = _nDataPoints / _nObjectsInDataset;
+    }
+    _interpolation.value.setMaxValue(static_cast<float>(_interpolation.nSteps - 1));
+
+    // This is the property that is shown in the user interface, so update it so the user
+    // can get an idea of how many points will be rendered
+    _nDataPoints = _nObjectsInDataset;
+}
+
 void RenderableInterpolatedPoints::initializeShadersAndGlExtras() {
     _program = BaseModule::ProgramObjectManager.request(
         "RenderablePointCloud_Interpolated",
diff --git a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
index 8ead53ad92..c457729253 100644
--- a/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
+++ b/modules/base/rendering/pointcloud/renderableinterpolatedpoints.h
@@ -50,6 +50,7 @@ public:
     static documentation::Documentation Documentation();
 
 protected:
+    void initialize() override;
     void initializeShadersAndGlExtras() override;
     void deinitializeShaders() override;
     void setExtraUniforms() override;
@@ -109,6 +110,8 @@ private:
 
     float _prevInterpolationValue = 0.f;
     bool _shouldReinitializeBufferdata = false;
+
+    unsigned int _nObjectsInDataset = 0;
 };
 
 } // namespace openspace