fix: unified dt

vtk/src/layers/EGlyphLayer.cpp

@@ -50,9 +50,8 @@ void EGlyphLayer::readCoordinates() {
     int lonIndex = 0;
     for (double lon: uvGrid->lons) {
       auto [u, v] = (*uvGrid)[0, latIndex, lonIndex];
-      direction->SetTuple3(i, 2*v, 2*u, 0);
+      direction->SetTuple3(i, 5*u, 5*v, 0);
       points->InsertPoint(i++, lon, lat, 0);
-      // see also https://vtk.org/doc/nightly/html/classvtkPolyDataMapper2D.html
       lonIndex++;
     }
     latIndex++;
@@ -61,7 +60,7 @@ void EGlyphLayer::readCoordinates() {
   this->data->GetPointData()->AddArray(this->direction);
   this->data->GetPointData()->SetActiveVectors("direction");
 
-  vtkSmartPointer<vtkTransformFilter> transformFilter = createCartographicTransformFilter();
+  vtkSmartPointer<vtkTransformFilter> transformFilter = createCartographicTransformFilter(uvGrid);
   transformFilter->SetInputData(data);
 
   vtkNew<vtkGlyphSource2D> arrowSource;
@@ -101,7 +100,8 @@ void EGlyphLayer::updateData(int t) {
   for (int lat = 0; lat < uvGrid->latSize; lat++) {
     for (int lon = 0; lon < uvGrid->lonSize; lon++) {
       auto [u, v] = (*uvGrid)[t/3600, lat, lon];
-      this->direction->SetTuple3(i, 5*v, 5*u, 0); // FIXME: fetch data from file.
+      // TODO: The 5*v stuff should really be a filter transform
+      this->direction->SetTuple3(i, 5*u, 5*v, 0);
       i++;
     }
   }

vtk/src/layers/LGlyphLayer.cpp

@@ -23,6 +23,7 @@ vtkSmartPointer<SpawnPointCallback> LGlyphLayer::createSpawnPointCallback() {
     newPointCallBack->setData(data);
     newPointCallBack->setPoints(points);
     newPointCallBack->setRen(ren);
+    newPointCallBack->setUVGrid(uvGrid);
     return newPointCallBack;
 }
 
@@ -31,7 +32,7 @@ vtkSmartPointer<SpawnPointCallback> LGlyphLayer::createSpawnPointCallback() {
 //
 // 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.
 
-LGlyphLayer::LGlyphLayer(std::unique_ptr<AdvectionKernel> advectionKernel) {
+LGlyphLayer::LGlyphLayer(std::shared_ptr<UVGrid> uvGrid, std::unique_ptr<AdvectionKernel> advectionKernel) {
     this->ren = vtkSmartPointer<vtkRenderer>::New();
     this->ren->SetLayer(2);
 
@@ -40,13 +41,12 @@ LGlyphLayer::LGlyphLayer(std::unique_ptr<AdvectionKernel> advectionKernel) {
     this->data->SetPoints(this->points);
 
     advector = std::move(advectionKernel);
+    this->uvGrid = uvGrid;
 
     auto camera = createNormalisedCamera();
     ren->SetActiveCamera(camera);
 
-    auto transform = createCartographicTransformFilter();
-
-    vtkSmartPointer<vtkTransformFilter> transformFilter = createCartographicTransformFilter();
+    vtkSmartPointer<vtkTransformFilter> transformFilter = createCartographicTransformFilter(uvGrid);
     transformFilter->SetInputData(data);
 
     vtkNew<vtkGlyphSource2D> circleSource;
@@ -97,10 +97,7 @@ void LGlyphLayer::updateData(int t) {
 }
 
 void LGlyphLayer::addObservers(vtkSmartPointer<vtkRenderWindowInteractor> interactor) {
-    auto newPointCallBack = vtkSmartPointer<SpawnPointCallback>::New();
-    newPointCallBack->setData(data);
-    newPointCallBack->setPoints(points);
-    newPointCallBack->setRen(ren);
+    auto newPointCallBack = createSpawnPointCallback();
     interactor->AddObserver(vtkCommand::LeftButtonPressEvent, newPointCallBack);
     interactor->AddObserver(vtkCommand::LeftButtonReleaseEvent, newPointCallBack);
     interactor->AddObserver(vtkCommand::MouseMoveEvent, newPointCallBack);

vtk/src/layers/LGlyphLayer.h

@@ -15,13 +15,12 @@ private:
   vtkSmartPointer<vtkPoints> points;
   vtkSmartPointer<vtkPolyData> data;
   std::unique_ptr<AdvectionKernel> advector;
-
-
+  std::shared_ptr<UVGrid> uvGrid;
 
 public:
   /** Constructor.
     */
-  LGlyphLayer(std::unique_ptr<AdvectionKernel> advectionKernel);
+  LGlyphLayer(std::shared_ptr<UVGrid> uvGrid, std::unique_ptr<AdvectionKernel> advectionKernel);
 
   /** This function spoofs a few points in the dataset. Mostly used for testing.
     */