Change API after review

Author: maxGimeno

Polyhedron/demo/Polyhedron/MainWindow.cpp

@@ -398,7 +398,7 @@ void MainWindow::evaluate_script(QString script,
                                  const bool quiet) {
   QScriptContext* context = script_engine->currentContext();
   QScriptValue object = context->activationObject();
-  QScriptValue former_current_filename = object.property("current_filename");;
+  QScriptValue former_current_filename = object.property("current_filename");
   object.setProperty("current_filename", filename);
 
   QScriptValue value = script_engine->evaluate(script, filename);
@@ -821,8 +821,8 @@ void MainWindow::updateViewersBboxes(bool recenter)
 }
 void MainWindow::computeViewerBBox(qglviewer::Vec& min, qglviewer::Vec& max)
 {
-  const Scene::Bbox bbox = scene->bbox();
-  const Scene::Bbox all_bbox = scene->bbox(true);
+  const Scene::Bbox bbox = scene->visibleBbox();
+  const Scene::Bbox all_bbox = scene->bbox();
   const double xmin = bbox.xmin();
   const double ymin = bbox.ymin();
   const double zmin = bbox.zmin();
@@ -841,20 +841,19 @@ void MainWindow::computeViewerBBox(qglviewer::Vec& min, qglviewer::Vec& max)
 
   min = qglviewer::Vec(xmin, ymin, zmin);
   max= qglviewer::Vec(xmax, ymax, zmax);
-qglviewer::Vec amin(axmin, aymin, azmin),
-    amax(axmax, aymax, azmax);
-  qglviewer::Vec bbox_center((xmin+xmax)/2, (ymin+ymax)/2, (zmin+zmax)/2),
-  abbox_center((axmin+axmax)/2, (aymin+aymax)/2, (azmin+azmax)/2);
+
+  qglviewer::Vec abbox_center((axmin+axmax)/2, (aymin+aymax)/2, (azmin+azmax)/2),
+      bbox_center((xmin+xmax)/2, (ymin+ymax)/2, (zmin+zmax)/2);
 
   qglviewer::Vec offset(0,0,0);
 
-  double l_dist = (std::max)((std::abs)(abbox_center.x - viewer->offset().x),
-                             (std::max)((std::abs)(abbox_center.y - viewer->offset().y),
-                                        (std::abs)(abbox_center.z - viewer->offset().z)));
+  double l_dist = (std::max)((std::abs)(bbox_center.x - viewer->offset().x),
+                             (std::max)((std::abs)(bbox_center.y - viewer->offset().y),
+                                        (std::abs)(bbox_center.z - viewer->offset().z)));
   if((std::log2)(l_dist) > 13.0 )
     for(int i=0; i<3; ++i)
     {
-      offset[i] = -abbox_center[i];
+      offset[i] = -bbox_center[i];
 
     }
   if(offset != viewer->offset())
@@ -916,7 +915,7 @@ CGAL::Three::Polyhedron_demo_io_plugin_interface* MainWindow::findLoader(const Q
                               .arg(loader_name).toStdString()) ;
 }
 
-bool MainWindow::file_matches_filter(const QString& filters,
+bool MainWindow::file_matches_filter(const QStringList& filters,
                                      const QString& filename )
 {
   QFileInfo fileinfo(filename);
@@ -925,8 +924,7 @@ bool MainWindow::file_matches_filter(const QString& filters,
   //match all filters between ()
   QRegExp all_filters_rx("\\((.*)\\)");
 
-  QStringList split_filters = filters.split(";;");
-  Q_FOREACH(const QString& filter, split_filters) {
+  Q_FOREACH(const QString& filter, filters) {
     //extract filters
     if ( all_filters_rx.indexIn(filter)!=-1 ){
       Q_FOREACH(const QString& pattern,all_filters_rx.cap(1).split(' ')){
@@ -1350,7 +1348,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
 {
     for(int i=0; i<plugins.size(); i++)
     {
-      plugins[i].first->closure();
+      plugins[i].first->shutdown();
     }
   writeSettings();
   event->accept();
@@ -1421,7 +1419,7 @@ void MainWindow::on_actionLoad_triggered()
   FilterPluginMap filterPluginMap;
 
   Q_FOREACH(CGAL::Three::Polyhedron_demo_io_plugin_interface* plugin, io_plugins) {
-    QStringList split_filters = plugin->loadNameFilters().split(";;");
+    QStringList split_filters = plugin->loadNameFilters();
     Q_FOREACH(const QString& filter, split_filters) {
       FilterPluginMap::iterator it = filterPluginMap.find(filter);
       if(it != filterPluginMap.end()) {
@@ -1496,14 +1494,14 @@ void MainWindow::on_actionSaveAs_triggered()
   Q_FOREACH(CGAL::Three::Polyhedron_demo_io_plugin_interface* plugin, io_plugins) {
     if(plugin->canSave(item)) {
       canSavePlugins << plugin;
-      filters += plugin->saveNameFilters();
+      filters.append(plugin->saveNameFilters());
     }
   }
   QString ext;
   if(!filters.isEmpty())
   {
     QRegExp extensions("\\(\\*\\..+\\)");
-    extensions.indexIn(filters.first().split(";;").first());
+    extensions.indexIn(filters.first());
     ext = extensions.cap();
     filters << tr("All files (*)");
   }
@@ -1590,17 +1588,6 @@ void MainWindow::on_actionShowHide_triggered()
   }
 }
 
-void MainWindow::on_actionSetPolyhedronA_triggered()
-{
-  int i = getSelectedSceneItemIndex();
-  scene->setItemA(i);
-}
-
-void MainWindow::on_actionSetPolyhedronB_triggered()
-{
-  int i = getSelectedSceneItemIndex();
-  scene->setItemB(i);
-}
 void MainWindow::on_actionPreferences_triggered()
 {
   QDialog dialog(this);
@@ -1725,6 +1712,8 @@ void MainWindow::setAddKeyFrameKeyboardModifiers(::Qt::KeyboardModifiers m)
 
 void MainWindow::on_actionRecenterScene_triggered()
 {
+  scene->computeBbox();
+  scene->computeVisibleBbox();
   qglviewer::Vec min, max;
   computeViewerBBox(min, max);
   Q_FOREACH(QGLViewer* v, QGLViewer::QGLViewerPool())
@@ -1784,7 +1773,7 @@ void MainWindow::makeNewGroup()
 {
         Scene_group_item * group =
             new Scene_group_item(QString("New group"), scene);
-    scene->addItem(group, false);
+    scene->addItem(group);
 }
 
 void MainWindow::on_upButton_pressed()
@@ -1935,18 +1924,15 @@ void MainWindow::on_actionMaxTextItemsDisplayed_triggered()
 void MainWindow::resetHeader()
 {
   sceneView->header()->setStretchLastSection(false);
-  scene->invisibleRootItem()->setColumnCount(6);
+  scene->invisibleRootItem()->setColumnCount(5);
   sceneView->header()->resizeSection(Scene::LockColumn,
                                      sceneView->header()->fontMetrics().width(QString("_State_")));
   sceneView->header()->setSectionResizeMode(Scene::NameColumn, QHeaderView::Stretch);
   sceneView->header()->setSectionResizeMode(Scene::ColorColumn, QHeaderView::Fixed);
   sceneView->header()->setSectionResizeMode(Scene::RenderingModeColumn, QHeaderView::ResizeToContents);
-  sceneView->header()->setSectionResizeMode(Scene::ABColumn, QHeaderView::Fixed);
   sceneView->header()->setSectionResizeMode(Scene::VisibleColumn, QHeaderView::Fixed);
   sceneView->header()->resizeSection(Scene::ColorColumn, sceneView->header()->fontMetrics().width("_#_"));
   sceneView->resizeColumnToContents(Scene::RenderingModeColumn);
-  sceneView->header()->resizeSection(Scene::ABColumn,
-                                     sceneView->header()->fontMetrics().width(QString("_AB_")));
   sceneView->header()->resizeSection(Scene::VisibleColumn,
                                      sceneView->header()->fontMetrics().width(QString("_View_")));
 }
@@ -2072,7 +2058,7 @@ void ReloadingController::handleResults(CT::Scene_item* item)
   if(property_item)
     property_item->copyProperties(original);
   original->doneReading();
-  scene->replaceItem(scene->item_id(original), item, true);
+  scene->replaceItem(scene->itemId(original), item);
   original->deleteLater();
   finish(true);
 }
@@ -2116,8 +2102,7 @@ void LoadingController::handleResults(CT::Scene_item* item)
      || group->getChildrenIds().size() == 0)
     item->setColor(colors_[counter-1]);
 
-  scene->addItem(item,
-                 counter == input.size());
+  scene->addItem(item);
 
   if(group
      && group->getChildrenIds().size() > 0)
@@ -2126,7 +2111,7 @@ void LoadingController::handleResults(CT::Scene_item* item)
   }
   if(counter == input.size())
   {
-    mw->selectSceneItem(scene->item_id(item));
+    mw->selectSceneItem(scene->itemId(item));
     finished();
   }
 }
@@ -2329,11 +2314,14 @@ void MainWindow::on_actionAdd_Viewer_triggered()
 
 void MainWindow::recenterViewer()
 {
+  scene->computeBbox();
+  scene->computeVisibleBbox();
   qglviewer::Vec min, max;
   computeViewerBBox(min, max);
   Viewer* target = qobject_cast<Viewer*>(childAt(cursor().pos()));
   if(target)
   {
+    scene->computeBbox();
     updateViewerBbox(target, true, min, max);
     target->camera()->interpolateToFitScene();
   }

Polyhedron/demo/Polyhedron/MainWindow.h

@@ -131,7 +131,7 @@ public Q_SLOTS:
   //! Collapses a group.
   void setCollapsed(QModelIndex);
   //! checks if a file matches `filters`
-  bool file_matches_filter(const QString& filters, const QString& filename);
+  bool file_matches_filter(const QStringList &filters, const QString& filename);
   void reset_default_loaders();
   //!Prints a dialog containing statistics on the selected polyhedrons.
   void statisticsOnItem();
@@ -334,11 +334,6 @@ protected Q_SLOTS:
   void on_actionShowHide_triggered();
   //!Pops a dialog to change the max TextItems
   void on_actionMaxTextItemsDisplayed_triggered();
-  // Select A/B
-  //!Sets the selected item as item_A.
-  void on_actionSetPolyhedronA_triggered();
-  //!Sets the selected item as Item_B.
-  void on_actionSetPolyhedronB_triggered();
 
   //Preferences edition
   //!Opens the Preferences dialog.

Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Cut_plugin.cpp

@@ -1116,9 +1116,9 @@ public Q_SLOTS:
       if(facet_trees.empty())
       {
         if(plane_item)
-          scene->erase(scene->item_id(plane_item));
+          scene->erase(scene->itemId(plane_item));
         if(edges_item)
-          scene->erase(scene->item_id(edges_item));
+          scene->erase(scene->itemId(edges_item));
       }
       else
       {
@@ -1144,9 +1144,9 @@ public Q_SLOTS:
       if(facet_sm_trees.empty())
       {
         if(plane_item)
-          scene->erase(scene->item_id(plane_item));
+          scene->erase(scene->itemId(plane_item));
         if(edges_item)
-          scene->erase(scene->item_id(edges_item));
+          scene->erase(scene->itemId(edges_item));
       }
       else
       {
@@ -1314,7 +1314,7 @@ void Polyhedron_demo_cut_plugin::createCutPlane() {
   if(updating)
   {
     type = plane_item->cutPlaneType();
-    plane_id = scene->item_id(plane_item);
+    plane_id = scene->itemId(plane_item);
   }
 
   plane_item = new Scene_aabb_plane_item(scene);
@@ -1397,7 +1397,7 @@ void Polyhedron_demo_cut_plugin::SignedFacets() {
   plane_item->invalidateOpenGLBuffers();
   if(edges_item)
   {
-    scene->erase(scene->item_id(edges_item));
+    scene->erase(scene->itemId(edges_item));
     edges_item = NULL;
   }
   QApplication::restoreOverrideCursor();
@@ -1411,7 +1411,7 @@ void Polyhedron_demo_cut_plugin::UnsignedFacets() {
   plane_item->invalidateOpenGLBuffers();
   if(edges_item)
   {
-    scene->erase(scene->item_id(edges_item));
+    scene->erase(scene->itemId(edges_item));
     edges_item = NULL;
   }
   QApplication::restoreOverrideCursor();
@@ -1424,7 +1424,7 @@ void Polyhedron_demo_cut_plugin::UnsignedEdges() {
   plane_item->invalidateOpenGLBuffers();
   if(edges_item)
   {
-    scene->erase(scene->item_id(edges_item));
+    scene->erase(scene->itemId(edges_item));
     edges_item = NULL;
   }
   QApplication::restoreOverrideCursor();

Polyhedron/demo/Polyhedron/Plugins/Classification/Classification_plugin.cpp

@@ -217,7 +217,7 @@ class Polyhedron_demo_classification_plugin :
               SLOT(update_plugin(int)));
     }
   }
-  virtual void closure()
+  virtual void shutdown()
   {
     dock_widget->hide();
     close_classification();