- reduce item creation time.

- spheres rendering done

Author: maxGimeno

GraphicsView/include/CGAL/Qt/DemosMainWindow.h

@@ -28,6 +28,7 @@
 #include <iostream>
 #include <QVector>
 #include <QMainWindow>
+#include <QSettings>
 #include <QDragEnterEvent>
 #include <QDropEvent>
 
@@ -124,6 +125,7 @@ protected Q_SLOTS:
   QAction* recentFilesSeparator;
   unsigned int maxNumRecentFiles;
   QVector<QAction*> recentFileActs;
+  QSettings *settings;
 }; // end class DemosMainWindow
 
 } // namespace Qt

GraphicsView/include/CGAL/Qt/DemosMainWindow_impl.h

@@ -90,6 +90,7 @@ DemosMainWindow::DemosMainWindow(QWidget * parent, ::Qt::WindowFlags flags)
   actionAbout = new QAction(this);
   actionAbout->setObjectName("actionAbout");
   actionAbout->setText(tr("&About..."));
+  settings = new QSettings();
 
   setAcceptDrops(true);
 }
@@ -378,15 +379,13 @@ CGAL_INLINE_FUNCTION
 void 
 DemosMainWindow::addToRecentFiles(QString fileName)
 {
-  QSettings settings;
-  QStringList files = settings.value("recentFileList").toStringList();
+  QStringList files = settings->value("recentFileList").toStringList();
   files.removeAll(fileName);
   files.prepend(fileName);
   while (files.size() > (int)maxNumberOfRecentFiles())
     files.removeLast();
 
-  settings.setValue("recentFileList", files);
-
+  settings->setValue("recentFileList", files);
   updateRecentFileActions();
 }
 
@@ -422,11 +421,9 @@ CGAL_INLINE_FUNCTION
 void 
 DemosMainWindow::updateRecentFileActions()
 {
-  QSettings settings;
-  QStringList files = settings.value("recentFileList").toStringList();
+  QStringList files = settings->value("recentFileList").toStringList();
 
   int numRecentFiles = qMin(files.size(), (int)this->maxNumberOfRecentFiles());
-  
   for (int i = 0; i < numRecentFiles; ++i) {
     QString strippedName = QFileInfo(files[i]).fileName();
     QString text = tr("&%1 %2").arg(i).arg(strippedName);
@@ -436,40 +433,37 @@ DemosMainWindow::updateRecentFileActions()
   }
   for (unsigned int j = numRecentFiles; j < maxNumberOfRecentFiles(); ++j)
     recentFileActs[j]->setVisible(false);
-  
+
   recentFilesSeparator->setVisible(numRecentFiles > 0);
 }
 
 CGAL_INLINE_FUNCTION
 void DemosMainWindow::writeState(QString groupname)
 {
-  QSettings settings;
 
-  settings.beginGroup(groupname);
-  settings.setValue("size", size());
-  settings.setValue("pos", pos());
-  settings.setValue("state", saveState());
-  settings.endGroup();
+  settings->beginGroup(groupname);
+  settings->setValue("size", size());
+  settings->setValue("pos", pos());
+  settings->setValue("state", saveState());
+  settings->endGroup();
 }
 
 CGAL_INLINE_FUNCTION
 void DemosMainWindow::readState(QString groupname, Options /*what_to_save*/)
-{
-  QSettings settings;
-  
-  settings.beginGroup(groupname);
-  resize(settings.value("size", this->size()).toSize());
+{  
+  settings->beginGroup(groupname);
+  resize(settings->value("size", this->size()).toSize());
 
   QDesktopWidget* desktop = qApp->desktop();
-  QPoint pos = settings.value("pos", this->pos()).toPoint();
+  QPoint pos = settings->value("pos", this->pos()).toPoint();
   if(desktop->availableGeometry(pos).contains(pos)) {
     move(pos);
   }
-  QByteArray mainWindowState = settings.value("state").toByteArray();
+  QByteArray mainWindowState = settings->value("state").toByteArray();
   if(!mainWindowState.isNull()) {
     this->restoreState(mainWindowState);
   }
-  settings.endGroup();
+  settings->endGroup();
 }
 
 

Polyhedron/demo/Polyhedron/Edge_container.cpp

@@ -106,9 +106,6 @@ void Edge_container::initGL(Viewer_interface *viewer)
       getVao(viewer)->addVbo(getVbo(Normals));
       getVao(viewer)->addVbo(getVbo(Radius));
       getVao(viewer)->addVbo(getVbo(Barycenters));
-      viewer->glVertexAttribDivisor(getVao(viewer)->program->attributeLocation("barycenter"), 1);
-      viewer->glVertexAttribDivisor(getVao(viewer)->program->attributeLocation("radius"), 1);
-      viewer->glVertexAttribDivisor(getVao(viewer)->program->attributeLocation("colors"), 1);
     }
       break;
     default:
@@ -117,6 +114,21 @@ void Edge_container::initGL(Viewer_interface *viewer)
   }
   setGLInit(viewer, true);
 }
+
+void Edge_container::initializeBuffers(Viewer_interface *viewer)
+{
+  Primitive_container::initializeBuffers(viewer);
+  if(getProgram() == VI::PROGRAM_SPHERES
+     || getProgram() == VI::PROGRAM_CUTPLANE_SPHERES)
+  {
+    getVao(viewer)->bind();
+    viewer->glVertexAttribDivisor(getVao(viewer)->program->attributeLocation("barycenter"), 1);
+    viewer->glVertexAttribDivisor(getVao(viewer)->program->attributeLocation("radius"), 1);
+    viewer->glVertexAttribDivisor(getVao(viewer)->program->attributeLocation("colors"), 1);
+    getVao(viewer)->release();
+  }
+}
+
 void Edge_container::draw(Viewer_interface *viewer,
                           bool is_color_uniform, QOpenGLFramebufferObject *)
 

Polyhedron/demo/Polyhedron/MainWindow.cpp

@@ -176,7 +176,7 @@ MainWindow::MainWindow(QWidget* parent)
   // setup connections
   connect(scene, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex & )),
           this, SLOT(updateInfo()));
-  
+
   connect(scene, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex & )),
           this, SLOT(updateDisplayInfo()));
 
@@ -203,7 +203,7 @@ MainWindow::MainWindow(QWidget* parent)
           SIGNAL(selectionChanged ( const QItemSelection & , const QItemSelection & ) ),
           this, SLOT(updateDisplayInfo()));
 
-  connect(sceneView->selectionModel(), 
+  connect(sceneView->selectionModel(),
           SIGNAL(selectionChanged ( const QItemSelection & , const QItemSelection & ) ),
           this, SLOT(selectionChanged()));
 
@@ -362,6 +362,7 @@ MainWindow::MainWindow(QWidget* parent)
 
   // setup menu filtering
   connect(ui->menuOperations, SIGNAL(aboutToShow()), this, SLOT(filterOperations()));
+
 }
 
 //Recursive function that do a pass over a menu and its sub-menus(etc.) and hide them when they are empty
@@ -1032,9 +1033,10 @@ Scene_item* MainWindow::loadItem(QFileInfo fileinfo, CGAL::Three::Polyhedron_dem
 
   item->setProperty("source filename", fileinfo.absoluteFilePath());
   item->setProperty("loader_name", loader->name());
+
   if(!reloading)
   {
-    this->addToRecentFiles(fileinfo.absoluteFilePath());
+    addToRecentFiles(fileinfo.absoluteFilePath());
   }
   item->moveToThread(QApplication::instance()->thread());
   return item;
@@ -1447,7 +1449,6 @@ void MainWindow::on_actionLoad_triggered()
   if(it != filterPluginMap.end()) {
     selectedPlugin = it.value();
   }
-
   QList<InfoLoader> list;
   if(selectedPlugin) {
     Q_FOREACH(const QString& filename, dialog.selectedFiles()) {
@@ -1781,7 +1782,7 @@ void MainWindow::makeNewGroup()
 {
         Scene_group_item * group =
             new Scene_group_item(QString("New group"), scene);
-    scene->addItem(group);
+    scene->addItem(group, false);
 }
 
 void MainWindow::on_upButton_pressed()
@@ -2061,7 +2062,7 @@ void ReloadingController::handleResults(CT::Scene_item* item)
     finish(false);
     return;
   }
-  item->setName(QString("%1 reloaded").arg(original->name()));
+  item->setName(original->name());
   item->setColor(original->color());
   item->setRenderingMode(original->renderingMode());
   item->setVisible(original->visible());
@@ -2077,7 +2078,7 @@ void ReloadingController::handleResults(CT::Scene_item* item)
 void ReloadingController::process()
 {
   original->reading();
-  workerThread->start();
+  QThreadPool::globalInstance()->start(workerThread);
 }
 
 LoadingController::LoadingController(const QList<InfoLoader>& input,
@@ -2091,7 +2092,6 @@ LoadingController::LoadingController(const QList<InfoLoader>& input,
   workerThread = new LoadingThread(input, mw, false);
   connect(workerThread, SIGNAL(resultReady(CT::Scene_item*)),
           this, SLOT(handleResults(CT::Scene_item*)));
-  connect(workerThread, SIGNAL(finished()), workerThread, SLOT(deleteLater()));
   colors_.reserve(input.size());
   compute_color_map(CT::Scene_item::defaultColor(),
                     static_cast<unsigned>(input.size()),
@@ -2102,7 +2102,7 @@ LoadingController::LoadingController(const QList<InfoLoader>& input,
 
 void LoadingController::handleResults(CT::Scene_item* item)
 {
-  counter++;
+  ++counter;
   if(!item)
   {
     error();
@@ -2113,14 +2113,20 @@ void LoadingController::handleResults(CT::Scene_item* item)
   if(!group
      || group->getChildrenIds().size() == 0)
     item->setColor(colors_[counter-1]);
-  mw->selectSceneItem(scene->item_id(item));
 
-  scene->addItem(item);
+  scene->addItem(item,
+                 counter == input.size());
 
-  if(group)
+  if(group
+     && group->getChildrenIds().size() > 0)
+  {
     scene->redraw_model();
+  }
   if(counter == input.size())
+  {
+    mw->selectSceneItem(scene->item_id(item));
     finished();
+  }
 }
 
 void StatisticsController::handleResults(QString res)

Polyhedron/demo/Polyhedron/MainWindow.h

@@ -458,7 +458,7 @@ private Q_SLOTS:
 typedef std::pair<QFileInfo,
 CT::Polyhedron_demo_io_plugin_interface*> InfoLoader;
 
-class LoadingThread : public QThread
+class LoadingThread : public QObject, public QRunnable
 {
   Q_OBJECT
   QList<InfoLoader> input;
@@ -503,7 +503,7 @@ class LoadingController : public QObject
                     MainWindow* mw, Scene *scene);
   void process()
   {
-    workerThread->start();
+    QThreadPool::globalInstance()->start(workerThread);
   }
 
 public Q_SLOTS:
@@ -537,7 +537,6 @@ class ReloadingController : public QObject
     workerThread = new LoadingThread(list, mw, true);
     connect(workerThread, SIGNAL(resultReady(CT::Scene_item*)),
             this, SLOT(handleResults(CT::Scene_item*)));
-    connect(workerThread, SIGNAL(finished()), workerThread, SLOT(deleteLater()));
     connect(this, &ReloadingController::finish,
             this, &ReloadingController::deleteLater);
   }

Polyhedron/demo/Polyhedron/Plugins/IO/Polylines_io_plugin.cpp

@@ -92,7 +92,6 @@ bool Polyhedron_demo_polylines_io_plugin::canLoad() const {
 
 CGAL::Three::Scene_item*
 Polyhedron_demo_polylines_io_plugin::load(QFileInfo fileinfo, Scene_interface *scene, QMainWindow *) {
-
   // Open file
   std::ifstream ifs(fileinfo.filePath().toUtf8());
   if(!ifs) {
@@ -136,8 +135,7 @@ Polyhedron_demo_polylines_io_plugin::load(QFileInfo fileinfo, Scene_interface *s
   item->setName(fileinfo.baseName());
   item->setColor(Qt::black);
   item->setProperty("polylines metadata", polylines_metadata);
-  std::cerr << "Number of polylines in item: " << item->polylines.size() << std::endl;
-  item->invalidateOpenGLBuffers();
+  item->invalidate(Scene_item::GEOMETRY|Scene_item::COLORS|Scene_item::NORMALS);
   return item;
 }