diff --git a/vtk/src/helperClasses/Program.cpp b/vtk/src/helperClasses/Program.cpp index 6d411a8..3be950b 100644 --- a/vtk/src/helperClasses/Program.cpp +++ b/vtk/src/helperClasses/Program.cpp @@ -49,17 +49,6 @@ Program::Program() { setupTimer(); } -// Program::Program(Layer *bg, Layer *e, Layer *l) : background(bg), euler(e), lagrange(l), win(), interact() { -// this->win = vtkSmartPointer::New(); -// this->interact = vtkSmartPointer::New(); -// -// this->win->SetNumberOfLayers(3); -// this->win->AddRenderer(bg->getLayer()); -// this->win->AddRenderer(e->getLayer()); -// this->win->AddRenderer(l->getLayer()); -// setWinProperties(); -// setupTimer(); -// } void Program::addLayer(Layer* layer) { this->layers.push_back(layer); @@ -78,31 +67,11 @@ void Program::removeLayer(Layer *layer) { } -// void Program::setBackground(Layer *bg) { -// this->win->RemoveRenderer(this->background->getLayer()); -// this->background = bg; -// this->win->AddRenderer(bg->getLayer()); -// -// } -// -// -// void Program::setEuler(Layer *e) { -// this->win->RemoveRenderer(this->euler->getLayer()); -// this->euler = e; -// this->win->AddRenderer(e->getLayer()); -// } -// -// -// void Program::setLagrange(Layer *l) { -// this->win->RemoveRenderer(this->lagrange->getLayer()); -// this->lagrange = l; -// this->win->AddRenderer(l->getLayer()); -// // } void Program::setLagrangeInteractor(SpawnPointCallback *cb){ - interact->AddObserver(vtkCommand::LeftButtonPressEvent, cb); - interact->AddObserver(vtkCommand::LeftButtonReleaseEvent, cb); - interact->AddObserver(vtkCommand::MouseMoveEvent, cb); + this->interact->AddObserver(vtkCommand::LeftButtonPressEvent, cb); + this->interact->AddObserver(vtkCommand::LeftButtonReleaseEvent, cb); + this->interact->AddObserver(vtkCommand::MouseMoveEvent, cb); } @@ -112,8 +81,6 @@ void Program::updateData(int t) { for (Layer *l : layers) { l->updateData(t); } - // this->lagrange->updateData(t); - // this->euler->updateData(t); } diff --git a/vtk/src/helperClasses/Program.h b/vtk/src/helperClasses/Program.h index 96939fe..46f26e9 100644 --- a/vtk/src/helperClasses/Program.h +++ b/vtk/src/helperClasses/Program.h @@ -10,10 +10,6 @@ class Program { private: - // Layer *background; - // Layer *euler; - // Layer *lagrange; - std::vector layers; vtkSmartPointer win; vtkSmartPointer interact; @@ -23,17 +19,12 @@ private: public: Program(); - // Program(Layer *bg, Layer *e, Layer *l); void addLayer(Layer *layer); void removeLayer(Layer *layer); - // void setBackground(Layer *bg); - // void setEuler(Layer *e); - // void setLagrange(Layer *l); void setLagrangeInteractor(SpawnPointCallback *cb); - // void addInteractionStyle(vtkInteractorStyle style); void updateData(int t); void render();