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

Fixes

This commit is contained in:
Maxime Gimeno 2018-10-22 16:11:51 +02:00
parent 87e31f5fbe
commit c4cc0a0ca0
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1855,12 +1855,12 @@ void MainWindow::on_actionPreferences_triggered()
viewer, SLOT(setFastDrawing(bool)));
prefdiag.max_itemsSpinBox->setValue(viewer->textRenderer()->getMax_textItems());
connect(prefdiag.max_itemsSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
connect(prefdiag.max_itemsSpinBox,static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
this, [this](int i){
setMaxTextItemsDisplayed(i);
});
prefdiag.transpSpinBox->setValue(viewer->total_pass());
connect(prefdiag.transpSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
connect(prefdiag.transpSpinBox, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
this, [this](int i)
{
setTransparencyPasses(i);
@ -1877,14 +1877,14 @@ void MainWindow::on_actionPreferences_triggered()
prefdiag.surface_meshComboBox->setCurrentText(CGAL::Three::Three::modeName(
CGAL::Three::Three::s_defaultSMRM));
connect(prefdiag.surface_meshComboBox, &QComboBox::currentTextChanged,
this, [](const QString& text){
this, [this](const QString& text){
CGAL::Three::Three::s_defaultSMRM = CGAL::Three::Three::modeFromName(text);
});
prefdiag.point_setComboBox->setCurrentText(CGAL::Three::Three::modeName(
CGAL::Three::Three::s_defaultPSRM));
connect(prefdiag.point_setComboBox, &QComboBox::currentTextChanged,
this, [](const QString& text){
this, [this](const QString& text){
CGAL::Three::Three::s_defaultPSRM = CGAL::Three::Three::modeFromName(text);
});
std::vector<QTreeWidgetItem*> items;

1
Polyhedron/demo/Polyhedron/Plugins/Display/Display_property_plugin.cpp
View File

@ -7,6 +7,7 @@
#include <QColorDialog>
#include <QPalette>
#include <QColor>
#include <QMessageBox>
#include "Messages_interface.h"
#include "Scene_surface_mesh_item.h"
#include "Color_ramp.h"

2
Polyhedron/demo/Polyhedron/Plugins/PMP/Scene_facegraph_item_k_ring_selection_config.h
View File

@ -1,7 +1,7 @@
#ifndef SCENE_FACEGRAPH_ITEM_K_RING_SELECTION_CONFIG_H
#define SCENE_FACEGRAPH_ITEM_K_RING_SELECTION_CONFIG_H
#if defined(scene_poly_item_k_ring_selection_EXPORTS) || (scene_sm_item_k_ring_selection_EXPORTS)
#if defined(scene_k_ring_selection_EXPORTS)
# define SCENE_FACEGRAPH_ITEM_K_RING_SELECTION_EXPORT Q_DECL_EXPORT
#else
# define SCENE_FACEGRAPH_ITEM_K_RING_SELECTION_EXPORT Q_DECL_IMPORT

4
Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt
View File

@ -1,10 +1,6 @@
include( polyhedron_demo_macros )
if(EIGEN3_FOUND)
find_package(CGAL COMPONENTS Core)
include(${CGAL_USE_FILE})
qt5_wrap_ui(parameterizationUI_FILES Parameterization_widget.ui OTE_dialog.ui)
polyhedron_demo_plugin(parameterization_plugin Parameterization_plugin ${parameterizationUI_FILES})
target_link_libraries(parameterization_plugin PUBLIC scene_surface_mesh_item scene_textured_item scene_selection_item)

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

@ -2,7 +2,7 @@
#define SCENE_POLYHEDRON_ITEM_DECORATOR_CONFIG_H
#if defined(scene_polyhedron_item_decorator_EXPORTS) || defined(scene_surface_mesh_item_decorator_EXPORTS)
#if defined(scene_item_decorator_EXPORTS)
# define SCENE_POLYHEDRON_ITEM_DECORATOR_EXPORT Q_DECL_EXPORT
#else
# define SCENE_POLYHEDRON_ITEM_DECORATOR_EXPORT Q_DECL_IMPORT