From 9c3faed5c5ee1d2dba5b1d634e8aa444f7bd90d6 Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Mon, 26 Nov 2018 22:06:13 +0100 Subject: [PATCH] Bug fixes; nyf --- GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h | 2 +- .../demo/Linear_cell_complex/MainWindow.cpp | 2 +- .../demo/Linear_cell_complex/Viewer.cpp | 12 ++++++------ .../demo/Linear_cell_complex/Viewer.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h b/GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h index de17e0d32f5..f3079abcda5 100644 --- a/GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h +++ b/GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h @@ -966,7 +966,7 @@ protected: return text; } -private: +protected: bool m_draw_vertices; bool m_draw_edges; bool m_draw_faces; diff --git a/Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp b/Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp index 113baed1ae6..86f1c351576 100644 --- a/Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp +++ b/Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp @@ -78,7 +78,7 @@ MainWindow::MainWindow (QWidget * parent) : CGAL::Qt::DemosMainWindow (parent), QObject::connect(&dialogmesh, SIGNAL(accepted()), this, SLOT(onCreateMeshOk())); - // this->viewer->setScene(&scene); + this->viewer->setScene(&scene); connect_actions (); this->addAboutDemo (":/cgal/help/about_Linear_cell_complex_3.html"); diff --git a/Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp b/Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp index b45fc2a8945..cd5db7c9130 100644 --- a/Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp +++ b/Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp @@ -47,12 +47,12 @@ Viewer::~Viewer() void Viewer::sceneChanged() { Base::compute_elements(); - this->camera()->setSceneBoundingBox(CGAL::qglviewer::Vec(bb.xmin(), - bb.ymin(), - bb.zmin()), - CGAL::qglviewer::Vec(bb.xmax(), - bb.ymax(), - bb.zmax())); + this->camera()->setSceneBoundingBox(CGAL::qglviewer::Vec(m_bounding_box.xmin(), + m_bounding_box.ymin(), + m_bounding_box.zmin()), + CGAL::qglviewer::Vec(m_bounding_box.xmax(), + m_bounding_box.ymax(), + m_bounding_box.zmax())); if (m_previous_scene_empty) this->showEntireScene(); else diff --git a/Linear_cell_complex/demo/Linear_cell_complex/Viewer.h b/Linear_cell_complex/demo/Linear_cell_complex/Viewer.h index f52f21d20d8..4d600cf0f05 100644 --- a/Linear_cell_complex/demo/Linear_cell_complex/Viewer.h +++ b/Linear_cell_complex/demo/Linear_cell_complex/Viewer.h @@ -60,7 +60,7 @@ public: public: // void draw(); - // virtual void init(); + // virtual void init(); void keyPressEvent(QKeyEvent *e); @@ -118,7 +118,7 @@ private: // QOpenGLShaderProgram rendering_program; // QOpenGLShaderProgram rendering_program_p_l; - CGAL::Bbox_3 bb; + // CGAL::Bbox_3 bb; }; #endif