djairoh
/
interactive-track-and-trace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: workaround to EGlyphs no longer appearing

This commit is contained in:
Djairo Hougee 2024-05-08 16:00:00 +02:00
parent 16d3423eb9
commit af1fc0afc0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
particle-track-and-trace/src/layers/EGlyphLayer.cpp
View File

@ -45,6 +45,9 @@ void EGlyphLayer::readCoordinates() {
points->Allocate(numLats * numLons); points->Allocate(numLats * numLons);
auto transform = createCartographicTransformFilter(uvGrid)->GetTransform();
double *out = (double *)malloc(3*sizeof(double));
int i = 0; int i = 0;
int latIndex = 0; int latIndex = 0;
for (double lat: uvGrid->lats) { for (double lat: uvGrid->lats) {
@ -52,18 +55,20 @@ void EGlyphLayer::readCoordinates() {
for (double lon: uvGrid->lons) { for (double lon: uvGrid->lons) {
auto [u, v] = (*uvGrid)[0, latIndex, lonIndex]; auto [u, v] = (*uvGrid)[0, latIndex, lonIndex];
direction->SetTuple3(i, 5*u, 5*v, 0); direction->SetTuple3(i, 5*u, 5*v, 0);
points->InsertPoint(i++, lon, lat, 0); // pre-transform the points, so we don't have to include the cartographic transform while running the program.
out = transform->TransformPoint(lon, lat, 0);
points->InsertPoint(i++, out[0], out[1], 0);
lonIndex++; lonIndex++;
} }
latIndex++; latIndex++;
} }
// free(out); //FIXME: causes a segfault for some reason?
this->data->SetPoints(points); this->data->SetPoints(points);
this->data->GetPointData()->AddArray(this->direction); this->data->GetPointData()->AddArray(this->direction);
this->data->GetPointData()->SetActiveVectors("direction"); this->data->GetPointData()->SetActiveVectors("direction");
vtkSmartPointer<vtkTransformFilter> transformFilter = createCartographicTransformFilter(uvGrid); // transformFilter->SetInputData(data);
transformFilter->SetInputData(data);
vtkNew<vtkGlyphSource2D> arrowSource; vtkNew<vtkGlyphSource2D> arrowSource;
arrowSource->SetGlyphTypeToArrow(); arrowSource->SetGlyphTypeToArrow();
@ -72,7 +77,7 @@ void EGlyphLayer::readCoordinates() {
vtkNew<vtkGlyph2D> glyph2D; vtkNew<vtkGlyph2D> glyph2D;
glyph2D->SetSourceConnection(arrowSource->GetOutputPort()); glyph2D->SetSourceConnection(arrowSource->GetOutputPort());
glyph2D->SetInputConnection(transformFilter->GetOutputPort()); glyph2D->SetInputData(data);
glyph2D->OrientOn(); glyph2D->OrientOn();
glyph2D->ClampingOn(); glyph2D->ClampingOn();
glyph2D->SetScaleModeToScaleByVector(); glyph2D->SetScaleModeToScaleByVector();
@ -98,8 +103,8 @@ void EGlyphLayer::updateData(int t) {
for (int lat = 0; lat < uvGrid->latSize; lat++) { for (int lat = 0; lat < uvGrid->latSize; lat++) {
for (int lon = 0; lon < uvGrid->lonSize; lon++) { for (int lon = 0; lon < uvGrid->lonSize; lon++) {
auto [u, v] = (*uvGrid)[t/3600, lat, lon]; auto [u, v] = (*uvGrid)[t/3600, lat, lon];
// TODO: 5*v scaling stuff should really be a filter transform // TODO: might want to multiple the u,v by some factor.
this->direction->SetTuple3(i, 5*u, 5*v, 0); this->direction->SetTuple3(i, u, v, 0);
i++; i++;
} }
} }