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

Merge branch 'releases/CGAL-4.14-branch'

This commit is contained in:
Laurent Rineau 2019-06-05 10:58:12 +02:00
parent 7fc36ad2a5 31dd4f11fb
commit adaed61c20
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Polyhedron/demo/Polyhedron/CMakeLists.txt
View File

@ -131,9 +131,6 @@ endif()
if(CGAL_Qt5_FOUND AND Qt5_FOUND AND OPENGL_FOUND ) if(CGAL_Qt5_FOUND AND Qt5_FOUND AND OPENGL_FOUND )
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})
set(Boost_USE_MULTITHREADED ON)
find_package(Boost COMPONENTS thread system filesystem)
qt5_wrap_ui( MainWindowUI_files MainWindow.ui) qt5_wrap_ui( MainWindowUI_files MainWindow.ui)
qt5_wrap_ui( SubViewerUI_files SubViewer.ui) qt5_wrap_ui( SubViewerUI_files SubViewer.ui)
qt5_wrap_ui( statisticsUI_FILES Statistics_on_item_dialog.ui) qt5_wrap_ui( statisticsUI_FILES Statistics_on_item_dialog.ui)
@ -233,7 +230,7 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND AND OPENGL_FOUND )
macro(add_item item_name) macro(add_item item_name)
add_library(${item_name} SHARED ${ARGN}) add_library(${item_name} SHARED ${ARGN})
target_link_libraries(${item_name} target_link_libraries(${item_name}
PUBLIC demo_framework ${CGAL_LIBRARIES} ${Boost_LIBRARIES} PUBLIC demo_framework ${CGAL_LIBRARIES}
Qt5::OpenGL Qt5::Gui Qt5::Script Qt5::Widgets) Qt5::OpenGL Qt5::Gui Qt5::Script Qt5::Widgets)
cgal_add_compilation_test(${item_name}) cgal_add_compilation_test(${item_name})
endmacro(add_item) endmacro(add_item)

1
Polyhedron/demo/Polyhedron/MainWindow.cpp
View File

@ -341,6 +341,7 @@ MainWindow::MainWindow(const QStringList &keywords, bool verbose, QWidget* paren
connect(&operationSearchBar, &QLineEdit::textChanged, connect(&operationSearchBar, &QLineEdit::textChanged,
this, &MainWindow::filterOperations); this, &MainWindow::filterOperations);
loadPlugins(); loadPlugins();
accepted_keywords.clear();
// Setup the submenu of the View menu that can toggle the dockwidgets // Setup the submenu of the View menu that can toggle the dockwidgets
Q_FOREACH(QDockWidget* widget, findChildren<QDockWidget*>()) { Q_FOREACH(QDockWidget* widget, findChildren<QDockWidget*>()) {

2
Polyhedron/demo/Polyhedron/MainWindow.h
View File

@ -456,7 +456,7 @@ private:
bool bbox_need_update; bool bbox_need_update;
QMap<QString, QPair<QStringList, QString> >plugin_metadata_map; QMap<QString, QPair<QStringList, QString> >plugin_metadata_map;
QMap<QString, bool> ignored_map; QMap<QString, bool> ignored_map;
const QStringList& accepted_keywords; QStringList accepted_keywords;
private Q_SLOTS: private Q_SLOTS:
void on_actionAdd_Viewer_triggered(); void on_actionAdd_Viewer_triggered();

10
Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
View File

@ -29,11 +29,17 @@ if (VTK_FOUND)
else() else()
message(STATUS "NOTICE : the DICOM files (.dcm) need VTK libraries to be open and will not be able to.") message(STATUS "NOTICE : the DICOM files (.dcm) need VTK libraries to be open and will not be able to.")
endif() endif()
find_package(Boost QUIET OPTIONAL_COMPONENTS filesystem)
if(Boost_FILESYSTEM_FOUND) if(Boost_FILESYSTEM_FOUND)
qt5_wrap_ui( imgUI_FILES Image_res_dialog.ui raw_image.ui) qt5_wrap_ui( imgUI_FILES Image_res_dialog.ui raw_image.ui)
polyhedron_demo_plugin(io_image_plugin Io_image_plugin Volume_plane_intersection.cpp Raw_image_dialog.cpp ${imgUI_FILES} ${VOLUME_MOC_OUTFILES} KEYWORDS IO Mesh_3) polyhedron_demo_plugin(io_image_plugin Io_image_plugin Volume_plane_intersection.cpp Raw_image_dialog.cpp ${imgUI_FILES} ${VOLUME_MOC_OUTFILES} KEYWORDS IO Mesh_3)
target_link_libraries(io_image_plugin PUBLIC scene_image_item ${VTK_LIBS} ) target_link_libraries(io_image_plugin PUBLIC scene_image_item ${VTK_LIBS} CGAL::CGAL_ImageIO)
target_link_libraries(io_image_plugin PUBLIC CGAL::CGAL_ImageIO) if(TARGET Boost::filesystem)
target_link_libraries(io_image_plugin PUBLIC Boost::filesystem)
else()
target_link_libraries(io_image_plugin PUBLIC ${Boost_LIBRARIES})
endif()
else() else()
message( STATUS "NOTICE : the Io_image_plugin needs boost-filesystem to work and will not be compiled") message( STATUS "NOTICE : the Io_image_plugin needs boost-filesystem to work and will not be compiled")
endif() endif()

12
Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
View File

@ -2125,8 +2125,9 @@ private: //------------------------------------------------------- private data
reindex.resize(sm.num_vertices()); reindex.resize(sm.num_vertices());
int n = 0; int n = 0;
for(Vertex_index v : sm.vertices()){ for(Vertex_index v : sm.vertices()){
os << get(vpm, v); P p = get(vpm, v);
os << p.x() << " " << p.y() << " " << p.z();
if(has_vcolors) if(has_vcolors)
{ {
CGAL::Color color = vcolors[v]; CGAL::Color color = vcolors[v];
@ -2407,7 +2408,7 @@ private: //------------------------------------------------------- private data
} }
sm.reserve(sm.num_vertices()+n, sm.num_edges()+e, sm.num_faces()+f); sm.reserve(sm.num_vertices()+n, sm.num_edges()+e, sm.num_faces()+f);
std::vector<Vertex_index> vertexmap(n); std::vector<Vertex_index> vertexmap(n);
P p;
Vector_3 v; Vector_3 v;
typename Mesh::template Property_map<Vertex_index,CGAL::Color> vcolor; typename Mesh::template Property_map<Vertex_index,CGAL::Color> vcolor;
typename Mesh::template Property_map<Vertex_index,Vector_3> vnormal; typename Mesh::template Property_map<Vertex_index,Vector_3> vnormal;
@ -2422,10 +2423,11 @@ private: //------------------------------------------------------- private data
for(int i=0; i < n; i++){ for(int i=0; i < n; i++){
is >> sm_skip_comments; is >> sm_skip_comments;
is >> p; double x, y, z;
is >> iformat(x) >> iformat(y) >> iformat(z);
Vertex_index vi = sm.add_vertex(); Vertex_index vi = sm.add_vertex();
put(vpm, vi, p); put(vpm, vi, P(x, y, z));
vertexmap[i] = vi; vertexmap[i] = vi;