merge resolved

particle-track-and-trace/src/CartographicTransformation.cpp

@@ -26,10 +26,10 @@ vtkSmartPointer<vtkTransformFilter> createCartographicTransformFilter(const std:
   auto geoTransform = vtkSmartPointer<vtkGeoTransform>::New();
   geoTransform->SetDestinationProjection(proj);
 
-  const double XMin = uvGrid->lons.front();
+  const double XMin = uvGrid->lonMin();
-  const double XMax = uvGrid->lons.back();
+  const double XMax = uvGrid->lonMax();
-  const double YMin = uvGrid->lats.front();
+  const double YMin = uvGrid->latMin();
-  const double YMax = uvGrid->lats.back();
+  const double YMax = uvGrid->latMax();
 
   double bottomLeft[3] = {XMin, YMin, 0};
   double topRight[3] = {XMax, YMax, 0};
@@ -61,10 +61,10 @@ vtkSmartPointer<vtkTransformFilter> createInverseCartographicTransformFilter(con
   auto geoTransform = vtkSmartPointer<vtkGeoTransform>::New();
   geoTransform->SetDestinationProjection(proj);
 
-  const double XMin = uvGrid->lons.front();
+  const double XMin = uvGrid->lonMin();
-  const double XMax = uvGrid->lons.back();
+  const double XMax = uvGrid->lonMax();
-  const double YMin = uvGrid->lats.front();
+  const double YMin = uvGrid->latMin();
-  const double YMax = uvGrid->lats.back();
+  const double YMax = uvGrid->latMax();
 
   double bottomLeft[3] = {XMin, YMin, 0};
   double topRight[3] = {XMax, YMax, 0};

particle-track-and-trace/src/advection/UVGrid.cpp

@@ -55,6 +55,22 @@ int UVGrid::timeStep() const {
   return times[1] - times[0];
 }
 
+double UVGrid::lonMin() const {
+  return this->lons.front();
+}
+
+double UVGrid::lonMax() const {
+  return this->lons.back();
+}
+
+double UVGrid::latMin() const {
+  return this->lats.front();
+}
+
+double UVGrid::latMax() const {
+  return this->lats.back();
+}
+
 void UVGrid::streamSlice(ostream &os, size_t t) {
   for (int x = 0; x < latSize; x++) {
     for (int y = 0; y < lonSize; y++) {

particle-track-and-trace/src/advection/UVGrid.h

@@ -38,6 +38,30 @@ public:
      */
     int timeStep() const;
 
+  /**
+   * Returns the lowest longitudinal value of grid.
+   * @return minimum longitude
+   */
+    double lonMin() const;
+
+  /**
+   * Returns the highest longitudinal value of grid.
+   * @return maximum longitude
+   */
+    double lonMax() const;
+
+  /**
+   * Returns the lowest latitudinal value of grid.
+   * @return minimum latitude
+   */
+    double latMin() const;
+
+  /**
+   * Returns the higehst latitudinal value of grid.
+   * @return maximum latitude
+   */
+    double latMax() const;
+
     /**
      * times, lats, lons are vector of length timeSize, latSize, lonSize respectively.
      * The maintain the following invariant:

particle-track-and-trace/src/commands/SpawnPointCallback.cpp

@@ -41,15 +41,13 @@ void SpawnPointCallback::Execute(vtkObject *caller, unsigned long evId, void *ca
     cout << "clicked on " << worldPos[1] << ", " << worldPos[0] << endl;
     inverseCartographicProjection->TransformPoint(worldPos, worldPos);
 
-    vtkIdType id = points->InsertNextPoint(worldPos[0], worldPos[1], 0);
+    points->InsertNextPoint(worldPos[0], worldPos[1], 0);
-    data->SetPoints(points);
+    this->particlesBeached->InsertNextValue(0);
 
-    vtkSmartPointer<vtkVertex> vertex = vtkSmartPointer<vtkVertex>::New();
+    // FIXME:  The below lines cause some weird interaction with our vtkTimer.
-    vertex->GetPointIds()->SetId(0, id);
+    // see github issue  https://github.com/MakeNEnjoy/interactive-track-and-trace/issues/28
-
+    this->particlesBeached->Modified();
-    vtkSmartPointer<vtkCellArray> vertices = vtkSmartPointer<vtkCellArray>::New();
+    this->points->Modified();
-    vertices->InsertNextCell(vertex);
-    data->SetVerts(vertices);
     ren->GetRenderWindow()->Render();
 }
 
@@ -79,3 +77,7 @@ void SpawnPointCallback::setUVGrid(const std::shared_ptr<UVGrid> &uvGrid) {
   this->uvGrid = uvGrid;
   inverseCartographicProjection = createInverseCartographicTransformFilter(uvGrid)->GetTransform();
 }
+
+void SpawnPointCallback::setBeached(const vtkSmartPointer<vtkIntArray> &ints) {
+  this->particlesBeached = ints;
+}

particle-track-and-trace/src/commands/SpawnPointCallback.h

@@ -23,12 +23,15 @@ public:
 
   void setRen(const vtkSmartPointer<vtkRenderer> &ren);
 
+  void setBeached(const vtkSmartPointer<vtkIntArray> &parts);
+
   void setUVGrid(const std::shared_ptr<UVGrid> &uvGrid);
 
 private:
   vtkSmartPointer<vtkPolyData> data;
   vtkSmartPointer<vtkPoints> points;
   vtkSmartPointer<vtkRenderer> ren;
+  vtkSmartPointer<vtkIntArray> particlesBeached;
   std::shared_ptr<UVGrid> uvGrid;
   vtkSmartPointer<vtkAbstractTransform> inverseCartographicProjection;
 

particle-track-and-trace/src/layers/LGlyphLayer.cpp

@@ -2,8 +2,10 @@
 #include "../commands/SpawnPointCallback.h"
 #include <vtkActor2D.h>
 #include <vtkGlyph2D.h>
+#include <vtkLookupTable.h>
 #include <vtkGlyphSource2D.h>
 #include <vtkNamedColors.h>
+#include <vtkPointData.h>
 #include <vtkPolyDataMapper2D.h>
 #include <vtkProperty.h>
 #include <vtkProperty2D.h>
@@ -20,16 +22,34 @@
 
 vtkSmartPointer<SpawnPointCallback> LGlyphLayer::createSpawnPointCallback() {
   auto newPointCallBack = vtkSmartPointer<SpawnPointCallback>::New();
-  newPointCallBack->setData(data);
+  newPointCallBack->setData(this->data);
-  newPointCallBack->setPoints(points);
+  newPointCallBack->setPoints(this->points);
-  newPointCallBack->setRen(ren);
+  newPointCallBack->setRen(this->ren);
-  newPointCallBack->setUVGrid(uvGrid);
+  newPointCallBack->setUVGrid(this->uvGrid);
+  newPointCallBack->setBeached(this->particlesBeached);
   return newPointCallBack;
 }
 
 // Further notes; current thinking is to allow tracking a particle's age by using a scalar array in the VtkPolyData. This would be incremented for every tick/updateData function call.
-// Another challenge is the concept of beaching; dead particles must not be included in the advect function call (wasted computations), but they should not be outright deleted from the vtkPoints either (we still want to display them). Working Solution: have another array of ints in the vtkPolyData, which tracks for how many calls of UpdateData a given particle has not had its position changed. If this int reaches some treshold (5? 10? 3? needs some testing), exclude the particle from the advect call.
+
-// TODO: modelling all this in vtkClasses is workable, but ideally i would want to work with a native C++ class. See if this is doable and feasible.
+/**
+ * Build and returns a vtkLookupTable for the given number of colours in grayscale.
+ * @param n : number of colours to add to the SetTableRange
+ * @return : a vtkLookupTable with grayscale colours from [1,1,1,1] to [0.5,0.5,0.5,0.5] in n steps.
+ */
+vtkSmartPointer<vtkLookupTable> buildLut(int n) {
+  vtkNew<vtkLookupTable> lut;
+  lut->SetNumberOfColors(n);
+  lut->SetTableRange(0, n-1);
+  lut->SetScaleToLinear();
+  lut->Build();
+  for (int i=0; i < n; i++) {
+    lut->SetTableValue(i, 1-(0.5*i/(n-1)), 1-(0.5*i/(n-1)), 1-(0.5*i/(n-1)),  1-(0.5*i/(n-1)));
+  }
+  // set the last value to separate fully beached particles from those that have simply not moved in a bit.
+  lut->SetTableValue(n-1, 0, 0, 0, 0.25);
+  return lut;
+}
 
 LGlyphLayer::LGlyphLayer(std::shared_ptr<UVGrid> uvGrid, std::unique_ptr<AdvectionKernel> advectionKernel) {
   this->ren = vtkSmartPointer<vtkRenderer>::New();
@@ -39,6 +59,13 @@ LGlyphLayer::LGlyphLayer(std::shared_ptr<UVGrid> uvGrid, std::unique_ptr<Advecti
   this->data = vtkSmartPointer<vtkPolyData>::New();
   this->data->SetPoints(this->points);
 
+  this->particlesBeached = vtkSmartPointer<vtkIntArray>::New();
+  this->particlesBeached->SetName("particlesBeached");
+  this->particlesBeached->SetNumberOfComponents(0);
+
+  this->data->GetPointData()->AddArray(this->particlesBeached);
+  this->data->GetPointData()->SetActiveScalars("particlesBeached");
+
   advector = std::move(advectionKernel);
   this->uvGrid = uvGrid;
 
@@ -47,17 +74,19 @@ LGlyphLayer::LGlyphLayer(std::shared_ptr<UVGrid> uvGrid, std::unique_ptr<Advecti
 
   vtkNew<vtkGlyphSource2D> circleSource;
   circleSource->SetGlyphTypeToCircle();
-  circleSource->SetScale(0.05);
+  circleSource->SetScale(0.02);
   circleSource->Update();
 
   vtkNew<vtkGlyph2D> glyph2D;
   glyph2D->SetSourceConnection(circleSource->GetOutputPort());
   glyph2D->SetInputConnection(transformFilter->GetOutputPort());
-  glyph2D->SetColorModeToColorByScalar();
+  glyph2D->SetScaleModeToDataScalingOff();
   glyph2D->Update();
 
   vtkNew<vtkPolyDataMapper> mapper;
   mapper->SetInputConnection(glyph2D->GetOutputPort());
+  mapper->SetLookupTable(buildLut(this->beachedAtNumberOfTimes));
+  mapper->SetScalarRange(0, this->beachedAtNumberOfTimes);
   mapper->Update();
   
   vtkNew<vtkActor> actor;
@@ -68,27 +97,62 @@ LGlyphLayer::LGlyphLayer(std::shared_ptr<UVGrid> uvGrid, std::unique_ptr<Advecti
 
 // creates a few points so we can test the updateData function
 void LGlyphLayer::spoofPoints() {
-  this->points->InsertNextPoint(6.532949683882039, 53.24308582564463, 0); // Coordinates of Zernike
+    // auto id =this->points->InsertNextPoint(6.532949683882039, 53.24308582564463, 0); // Coordinates of Zernike
-  this->points->InsertNextPoint(5.315307819255385, 60.40001057122271, 0); // Coordinates of Bergen
+    // this->particlesBeached->SetValue(id, 0);
-  this->points->InsertNextPoint(6.646210231365825, 46.52346296009023, 0); // Coordinates of Lausanne
+    // id = this->points->InsertNextPoint(5.315307819255385, 60.40001057122271, 0); // Coordinates of Bergen
-  this->points->InsertNextPoint(-6.553894313570932, 62.39522131195857,
+    // this->particlesBeached->SetValue(id, 0);
-                                0); // Coordinates of the top of the Faroe islands
+    // id = this->points->InsertNextPoint( 6.646210231365825, 46.52346296009023, 0); // Coordinates of Lausanne
+    // this->particlesBeached->SetValue(id, 0);
+    // id = this->points->InsertNextPoint(-6.553894313570932, 62.39522131195857, 0); // Coordinates of the top of the Faroe islands
+    // this->particlesBeached->SetValue(id, 0);
+
+  for (int i=0; i < 330; i+=5) {
+    for (int j=0; j < 330; j+=5) {
+      this->points->InsertNextPoint(-15.875+(12.875+15.875)/330*j, 46.125+(62.625-46.125)/330*i, 0);
+      this->particlesBeached->InsertNextValue(0);
+    }
+  }
 
   this->points->Modified();
 }
 
 void LGlyphLayer::updateData(int t) {
   const int SUPERSAMPLINGRATE = 4;
-  double point[3];
+  double point[3], oldX, oldY;
+  bool modifiedData = false;
+
+  // iterate over every point.
   for (vtkIdType n=0; n < this->points->GetNumberOfPoints(); n++) {
+    int beachedFor = this->particlesBeached->GetValue(n);
+    // first check: only update non-beached particles.
+    if (beachedFor < this->beachedAtNumberOfTimes) {
       this->points->GetPoint(n, point);
+      // second check: only update points within our grid's boundary.
+      if (point[0] <= this->uvGrid->lonMin() or point[0] >= this->uvGrid->lonMax() or point[1] <= this->uvGrid->latMin() or point[1] >= this->uvGrid->latMax()) {
+        // sets any particle out of bounds to be beached - so it gets assigned the right colour in the lookup table.
+        this->particlesBeached->SetValue(n, this->beachedAtNumberOfTimes);
+        continue;
+      }
+
+      oldX = point[0]; oldY = point[1];
+
+      // supersampling
       for (int i=0; i < SUPERSAMPLINGRATE; i++) {
-      std::tie(point[1], point[0]) = advector->advect(t, point[1], point[0], (t - lastT) / SUPERSAMPLINGRATE);
+        std::tie(point[1], point[0]) = advector->advect(t, point[1], point[0], (t-this->lastT)/SUPERSAMPLINGRATE);
       }
-    this->points->SetPoint(n, point[0], point[1], 0);
+
+      // if the particle's location remains unchanged, increase beachedFor number. Else, decrease it and update point position.
+      if (oldX == point[0] and oldY == point[1]) {
+        this->particlesBeached->SetValue(n, beachedFor+1);
+      } else {
+        this->particlesBeached->SetValue(n, std::max(beachedFor-1, 0));
+        this->points->SetPoint(n, point);
+        modifiedData = true;
       }
-  lastT = t;
+    }
-  this->points->Modified();
+  }
+  if (modifiedData) this->points->Modified();
+  this->lastT = t;
 }
 
 void LGlyphLayer::addObservers(vtkSmartPointer<vtkRenderWindowInteractor> interactor) {

particle-track-and-trace/src/layers/LGlyphLayer.h

@@ -14,9 +14,11 @@ class LGlyphLayer : public Layer {
 private:
   vtkSmartPointer<vtkPoints> points;
   vtkSmartPointer<vtkPolyData> data;
+  vtkSmartPointer<vtkIntArray> particlesBeached;
   std::unique_ptr<AdvectionKernel> advector;
   std::shared_ptr<UVGrid> uvGrid;
   int lastT = 1000;
+  int beachedAtNumberOfTimes = 20;
 
 public:
   /** Constructor.