songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Classification Plugin

This commit is contained in:
Maxime Gimeno 2018-05-18 10:15:00 +02:00
parent cc61059cc8
commit e97d45d07d
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Polyhedron/demo/Polyhedron/Plugins/Classification/Classification_plugin.cpp
View File

@ -1,8 +1,8 @@
#include <QtCore/qglobal.h>
#include <QFileDialog>
#include <QColorDialog>
#include <QGLViewer/manipulatedCameraFrame.h>
#include <QGLViewer/manipulatedFrame.h>
#include <CGAL/Qt/manipulatedCameraFrame.h>
#include <CGAL/Qt/manipulatedFrame.h>
#include <fstream>
#include "opengl_tools.h"
@ -1018,29 +1018,18 @@ public Q_SLOTS:
classif->select_random_region();
item_changed(classif->item());
QGLViewer* viewer = *QGLViewer::QGLViewerPool().begin();
CGAL::QGLViewer* viewer = *CGAL::QGLViewer::QGLViewerPool().begin();
CGAL::Bbox_3 bbox = classif->bbox();
const qglviewer::Vec offset = static_cast<CGAL::Three::Viewer_interface*>(viewer)->offset();
const CGAL::qglviewer::Vec offset = static_cast<CGAL::Three::Viewer_interface*>(viewer)->offset();
viewer->camera()->fitBoundingBox(qglviewer::Vec (bbox.xmin(), bbox.ymin(), bbox.zmin()) + offset,
qglviewer::Vec (bbox.xmax(), bbox.ymax(), bbox.zmax()) + offset);
viewer->camera()->fitBoundingBox(CGAL::qglviewer::Vec (bbox.xmin(), bbox.ymin(), bbox.zmin()) + offset,
CGAL::qglviewer::Vec (bbox.xmax(), bbox.ymax(), bbox.zmax()) + offset);
// viewer->camera()->showEntireScene();
// bbox = scene->bbox();
// viewer->setSceneBoundingBox(qglviewer::Vec (bbox.xmin(), bbox.ymin(), bbox.zmin()),
// qglviewer::Vec (bbox.xmax(), bbox.ymax(), bbox.zmax()));
#if QGLVIEWER_VERSION >= 0x020502
viewer->camera()->setPivotPoint (qglviewer::Vec ((bbox.xmin() + bbox.xmax()) / 2.,
viewer->camera()->setPivotPoint (CGAL::qglviewer::Vec ((bbox.xmin() + bbox.xmax()) / 2.,
(bbox.ymin() + bbox.ymax()) / 2.,
(bbox.zmin() + bbox.zmax()) / 2.) + offset);
#else
viewer->camera()->setRevolveAroundPoint (qglviewer::Vec ((bbox.xmin() + bbox.xmax()) / 2.,
(bbox.ymin() + bbox.ymax()) / 2.,
(bbox.zmin() + bbox.zmax()) / 2.) + offset);
#endif
}
void on_train_clicked()