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

cleanup

This commit is contained in:
Djairo Hougee 2024-05-19 22:13:33 +02:00
parent dc4973c0c7
commit 25d347cf35
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
particle-track-and-trace/src/layers/LGlyphLayer.cpp
View File

@ -57,15 +57,15 @@ LGlyphLayer::LGlyphLayer(std::shared_ptr<UVGrid> uvGrid, std::unique_ptr<Advecti
this->ren->SetLayer(2); this->ren->SetLayer(2);
this->points = vtkSmartPointer<vtkPoints>::New(); this->points = vtkSmartPointer<vtkPoints>::New();
this->data = vtkSmartPointer<vtkPolyData>::New(); vtkNew<vtkPolyData> data;
this->data->SetPoints(this->points); data->SetPoints(this->points);
this->particlesBeached = vtkSmartPointer<vtkIntArray>::New(); this->particlesBeached = vtkSmartPointer<vtkIntArray>::New();
this->particlesBeached->SetName("particlesBeached"); this->particlesBeached->SetName("particlesBeached");
this->particlesBeached->SetNumberOfComponents(0); this->particlesBeached->SetNumberOfComponents(0);
this->data->GetPointData()->AddArray(this->particlesBeached); data->GetPointData()->AddArray(this->particlesBeached);
this->data->GetPointData()->SetActiveScalars("particlesBeached"); data->GetPointData()->SetActiveScalars("particlesBeached");
advector = std::move(advectionKernel); advector = std::move(advectionKernel);
this->uvGrid = uvGrid; this->uvGrid = uvGrid;
@ -96,24 +96,13 @@ LGlyphLayer::LGlyphLayer(std::shared_ptr<UVGrid> uvGrid, std::unique_ptr<Advecti
this->ren->AddActor(actor); this->ren->AddActor(actor);
} }
// creates a few points so we can test the updateData function
void LGlyphLayer::spoofPoints() { void LGlyphLayer::spoofPoints() {
// auto id =this->points->InsertNextPoint(6.532949683882039, 53.24308582564463, 0); // Coordinates of Zernike
// this->particlesBeached->SetValue(id, 0);
// id = this->points->InsertNextPoint(5.315307819255385, 60.40001057122271, 0); // Coordinates of Bergen
// this->particlesBeached->SetValue(id, 0);
// 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 i=0; i < 330; i+=5) {
for (int j=0; j < 330; j+=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->points->InsertNextPoint(-15.875+(12.875+15.875)/330*j, 46.125+(62.625-46.125)/330*i, 0);
this->particlesBeached->InsertNextValue(0); this->particlesBeached->InsertNextValue(0);
} }
} }
this->points->Modified(); this->points->Modified();
} }
@ -134,7 +123,6 @@ void LGlyphLayer::updateData(int t) {
this->particlesBeached->SetValue(n, this->beachedAtNumberOfTimes+1); this->particlesBeached->SetValue(n, this->beachedAtNumberOfTimes+1);
continue; continue;
} }
oldX = point[0]; oldY = point[1]; oldX = point[0]; oldY = point[1];
// supersampling // supersampling

1
particle-track-and-trace/src/layers/LGlyphLayer.h
View File

@ -13,7 +13,6 @@
class LGlyphLayer : public Layer { class LGlyphLayer : public Layer {
private: private:
vtkSmartPointer<vtkPoints> points; vtkSmartPointer<vtkPoints> points;
vtkSmartPointer<vtkPolyData> data;
vtkSmartPointer<vtkIntArray> particlesBeached; vtkSmartPointer<vtkIntArray> particlesBeached;
std::unique_ptr<AdvectionKernel> advector; std::unique_ptr<AdvectionKernel> advector;
std::shared_ptr<UVGrid> uvGrid; std::shared_ptr<UVGrid> uvGrid;